From f6acf0f9735b7907fb039b8da92547a8c41eedd9 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Mon, 2 Sep 2019 08:35:00 +0200 Subject: record new upstream branch --- debian/.git-dpm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/.git-dpm b/debian/.git-dpm index 366ce42c2..8b80e8e80 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -2,8 +2,8 @@ d73fa697171b2a2e1dba7f1bfb519beb38625375 d73fa697171b2a2e1dba7f1bfb519beb38625375 0450ddd4f003de8aa8d8e7a54d181a992607d031 -0450ddd4f003de8aa8d8e7a54d181a992607d031 -cups_2.3~b8.orig.tar.gz -37ef96f807832dcfdd36d8fcb80771fce663547e -10371739 -signature:c852fec93034eaa9cfddaedde50a85ce25d01814:854:cups_2.3~b8.orig.tar.gz.asc +820f9bee82ab0efa5c0a58deab195190964eeb45 +cups_2.3.0.orig.tar.gz +ccdce595a90d768968b1e908684594738eba3a91 +8129049 +signature:2d6bfe0a6de5f4b6eff18726a701794cef159151:864:cups_2.3.0.orig.tar.gz.asc -- cgit v1.2.3 From 4b15ee733bb3f40197333f8fbad1eef6a1142109 Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Tue, 9 Aug 2016 18:11:04 +0200 Subject: For PWG Raster, add required IPP attributes Add required by IPP Everywhere for PWG Raster when PWG Raster as input format is supported Bug-Upstream: https://www.cups.org/str.php?L4428 Last-Update: 2015-02-10 Patch-Name: pwg-raster-attributes.patch --- scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/scheduler/printers.c b/scheduler/printers.c index 75ef4c0d2..542523760 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ cupsd_location_t *auth; /* Pointer to authentication element */ const char *auth_supported; /* Authentication supported */ ipp_t *oldattrs; /* Old printer attributes */ - ipp_attribute_t *attr; /* Attribute data */ + ipp_attribute_t *attr, *attr2; /* Attribute data */ char *name, /* Current user/group name */ *filter; /* Current filter */ + mime_type_t *type; /* @@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ add_printer_formats(p); + /* + * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input + * is supported + */ + for (type = (mime_type_t *)cupsArrayFirst(p->filetypes); + type; + type = (mime_type_t *)cupsArrayNext(p->filetypes)) + { + if (!_cups_strcasecmp(type->super, "image")) + { + if (!_cups_strcasecmp(type->type, "pwg-raster")) + { + if (p->ppd_attrs != NULL && + (attr = ippFindAttribute(p->ppd_attrs, + "printer-resolution-supported", + IPP_TAG_ZERO)) != NULL) + { + attr2 = ippAddResolutions(p->attrs, IPP_TAG_PRINTER, + "pwg-raster-document-resolution-supported", + attr->num_values, IPP_RES_PER_INCH, + NULL, NULL); + for (i = 0; i < attr->num_values; i ++) + { + attr2->values[i].resolution.xres = + attr->values[i].resolution.xres; + attr2->values[i].resolution.yres = + attr->values[i].resolution.yres; + attr2->values[i].resolution.units = IPP_RES_PER_INCH; + } + } + else + { + static const int pwg_raster_document_resolution_supported[] = + { + 300, + 600, + 1200 + }; + ippAddResolutions(p->attrs, IPP_TAG_PRINTER, + "pwg-raster-document-resolution-supported", + (int)(sizeof(pwg_raster_document_resolution_supported) / + sizeof(pwg_raster_document_resolution_supported[0])), + IPP_RES_PER_INCH, + pwg_raster_document_resolution_supported, + pwg_raster_document_resolution_supported); + } + ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, + "pwg-raster-document-sheet-back", NULL, "normal"); + static const char * const pwg_raster_document_type_supported[] = + { + "adobergb-8", + "adobergb-16", + "black-1", + "black-8", + "black-16", + "cmyk-8", + "cmyk-16", + "rgb-8", + "rgb-16", + "sgray-1", + "sgray-8", + "sgray-16", + "srgb-8", + "srgb-16" + }; + ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, + "pwg-raster-document-type-supported", + (int)(sizeof(pwg_raster_document_type_supported) / + sizeof(pwg_raster_document_type_supported[0])), NULL, + pwg_raster_document_type_supported); + } + } + } + /* * Add name-default attributes... */ -- cgit v1.2.3 From df131bf9aa20180603b678a2daa39881164b725a Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Tue, 9 Aug 2016 18:11:05 +0200 Subject: Fix hyphen-used-as-minus-sign manpage errors Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man* Also fix a missing backslash escape Origin: vendor Bug-Upstream: https://cups.org/str.php?L4299 Last-Update: 2015-02-10 Patch-Name: manpage-hyphen-minus.patch --- man/backend.7 | 4 ++-- man/client.conf.5 | 4 ++-- man/cups-files.conf.5 | 2 +- man/cups-lpd.8 | 6 +++--- man/cups-snmp.conf.5 | 2 +- man/cups.1 | 2 +- man/cupsctl.8 | 6 +++--- man/cupsd-logs.5 | 36 ++++++++++++++++++------------------ man/cupsd.conf.5 | 2 +- man/cupsfilter.8 | 2 +- man/filter.7 | 2 +- man/ippeveprinter.1 | 6 +++--- man/ippfind.1 | 6 +++--- man/ipptoolfile.5 | 8 ++++---- man/lp.1 | 12 ++++++------ man/lpadmin.8 | 6 +++--- man/lpoptions.1 | 4 ++-- man/lpr.1 | 8 ++++---- man/mime.convs.5 | 6 +++--- man/mime.types.5 | 4 ++-- man/ppdc.1 | 2 +- 21 files changed, 65 insertions(+), 65 deletions(-) diff --git a/man/backend.7 b/man/backend.7 index 5a7032650..3c426310c 100644 --- a/man/backend.7 +++ b/man/backend.7 @@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job. .TP 5 .B CUPS_BACKEND_RETRY The print file was not successfully transmitted because of a temporary issue. -The scheduler will retry the job at a future time - other jobs may print before this one. +The scheduler will retry the job at a future time \- other jobs may print before this one. .TP 5 .B CUPS_BACKEND_RETRY_CURRENT The print file was not successfully transmitted because of a temporary issue. @@ -198,7 +198,7 @@ or programs to send print jobs or .BR lpinfo (8) to query for available printers using the backend. -The one exception is the SNMP backend - see +The one exception is the SNMP backend \- see .BR cups-snmp (8) for more information. .SH NOTES diff --git a/man/client.conf.5 b/man/client.conf.5 index 8805561db..92f1d9575 100644 --- a/man/client.conf.5 +++ b/man/client.conf.5 @@ -64,7 +64,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients. The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0. The \fIDenyCBC\fR option disables all CBC cipher suites. -The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. +The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1. The \fIMinTLS\fR options set the minimum TLS version to support. The \fIMaxTLS\fR options set the maximum TLS version to support. Not all operating systems support TLS 1.3 at this time. @@ -114,7 +114,7 @@ Configuration settings can instead be viewed or changed using the command: .nf defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required -defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO +defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption .fi diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5 index b451e2f92..72494065c 100644 --- a/man/cups-files.conf.5 +++ b/man/cups-files.conf.5 @@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio \fBFileDevice No\fR Specifies whether the file pseudo-device can be used for new printer queues. The URI "file:///dev/null" is always allowed. -File devices cannot be used with "raw" print queues - a PPD file is required. +File devices cannot be used with "raw" print queues \- a PPD file is required. The specified file is overwritten for every print job. Writing to directories is not supported. .\"#FontPath diff --git a/man/cups-lpd.8 b/man/cups-lpd.8 index e8ce3251f..344d2af2b 100644 --- a/man/cups-lpd.8 +++ b/man/cups-lpd.8 @@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca [ \fB\-h \fIhostname\fR[\fB:\fIport\fR] ] [ -.B -n +.B \-n ] [ -.B -o +.B \-o .I option=value ] .SH DESCRIPTION @@ -34,7 +34,7 @@ and \fB-h \fIhostname\fR[\fB:\fIport\fR] Sets the CUPS server (and port) to use. .TP 5 -.B -n +.B \-n Disables reverse address lookups; normally .B cups-lpd will try to discover the hostname of the client via a reverse DNS lookup. diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5 index 4ca20f24f..bb77c7342 100644 --- a/man/cups-snmp.conf.5 +++ b/man/cups-snmp.conf.5 @@ -16,7 +16,7 @@ The file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory. Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character. .LP -The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend - +The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \- .BR cups-snmp (8). .SH DIRECTIVES The following directives are understood by the CUPS network backends: diff --git a/man/cups.1 b/man/cups.1 index 706620d7c..b0c51a738 100644 --- a/man/cups.1 +++ b/man/cups.1 @@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer .LP When you are asked for a username and password, enter your login username and password or the "root" username and password. .LP -After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically. +After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically. .LP Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly. .LP diff --git a/man/cupsctl.8 b/man/cupsctl.8 index 791954c19..c88eb22ec 100644 --- a/man/cupsctl.8 +++ b/man/cupsctl.8 @@ -73,19 +73,19 @@ Display the current settings: Enable debug logging: .nf - cupsctl --debug-logging + cupsctl \--debug-logging .fi Get the current debug logging state: .nf - cupsctl | grep '^_debug_logging' | awk -F= '{print $2}' + cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}' .fi Disable printer sharing: .nf - cupsctl --no-share-printers + cupsctl \--no-share-printers .fi .SH KNOWN ISSUES You cannot set the Listen or Port directives using \fBcupsctl\fR. diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5 index 2070be9a5..a912c4693 100644 --- a/man/cupsd-logs.5 +++ b/man/cupsd-logs.5 @@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by For example: .nf - 10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317 + 10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317 CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes - localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1" - 200 0 - - - localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1" + localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1" + 200 0 \- \- + localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1" 200 157 CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes - localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1" - 200 1411 CUPS-Get-Devices - - localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1" - 200 6667 - - + localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1" + 200 1411 CUPS-Get-Devices \- + localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1" + 200 6667 \- \- .fi The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine. .LP -The \fIgroup\fR field always contains "-". +The \fIgroup\fR field always contains "\-". .LP The \fIuser\fR field is the authenticated username of the requesting user. -If no username and password is supplied for the request then this field contains "-". +If no username and password is supplied for the request then this field contains "\-". .LP The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]". .LP @@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg Upgrading to TLS-encrypted connection. .TP 5 500 -Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details. +Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details. .TP 5 501 The client requested encryption but encryption support is not enabled/compiled in. @@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou The \fIbytes\fR field contains the number of bytes in the request. For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client. .LP -The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request. +The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request. .LP -The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response. +The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response. .SS ERROR LOG FILE FORMAT -The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the +The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the .BR cupsd.conf (5) file controls which messages are logged: .nf @@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo .LP The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job. .LP -The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided. +The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided. .LP The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job. .LP -The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided. +The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided. .LP -The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided. +The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided. .LP -The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided. +The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided. .SH SEE ALSO .BR cupsd (8), .BR cupsd.conf (5), diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5 index 00b1a22d6..49fdb06b1 100644 --- a/man/cupsd.conf.5 +++ b/man/cupsd.conf.5 @@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients. The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0. The \fIDenyCBC\fR option disables all CBC cipher suites. -The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. +The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1. The \fIMinTLS\fR options set the minimum TLS version to support. The \fIMaxTLS\fR options set the maximum TLS version to support. Not all operating systems support TLS 1.3 at this time. diff --git a/man/cupsfilter.8 b/man/cupsfilter.8 index c655c21c0..fe4c5a2cf 100644 --- a/man/cupsfilter.8 +++ b/man/cupsfilter.8 @@ -126,7 +126,7 @@ command use the current user and security session. This may result in different The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf": .nf - cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf + cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf .fi .SH SEE ALSO .BR cups (1), diff --git a/man/filter.7 b/man/filter.7 index dbc3150c8..8cb79bbf9 100644 --- a/man/filter.7 +++ b/man/filter.7 @@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd .TP 5 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ] .TP 5 -\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ] +\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ] Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer. .TP 5 \fBWARNING:\fI message\fR diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1 index 5753c69da..2fcda8b9f 100644 --- a/man/ippeveprinter.1 +++ b/man/ippeveprinter.1 @@ -129,8 +129,8 @@ If "command" is not an absolute path ("/path/to/command"), looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command. The .BR cups-config (1) -command can be used to discover the correct binary directory ("cups-config --serverbin"). -In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the +command can be used to discover the correct binary directory ("cups-config \--serverbin"). +In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the .BR cups (1) man page for more details. .TP 5 @@ -227,7 +227,7 @@ Logs an informational/progress message if \-v has been specified and copies the \fBSTATE: \fIkeyword[,keyword,...]\fR Sets the printer's "printer-state-reasons" attribute to the listed keywords. .TP 5 -\fBSTATE: -\fIkeyword[,keyword,...]\fR +\fBSTATE: \-\fIkeyword[,keyword,...]\fR Removes the listed keywords from the printer's "printer-state-reasons" attribute. .TP 5 \fBSTATE: +\fIkeyword[,keyword,...]\fR diff --git a/man/ippfind.1 b/man/ippfind.1 index 32f2e6f8b..d77ef75cc 100644 --- a/man/ippfind.1 +++ b/man/ippfind.1 @@ -75,7 +75,7 @@ True is the hostname matches the given regular expression. .B \-l .TP 5 .B \-\-ls -Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs. +Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs. The result is true if the URI is accessible, false otherwise. .TP 5 .B \-\-local @@ -108,7 +108,7 @@ The result is always true. .B \-q .TP 5 .B \-\-quiet -Quiet mode - just returns the exit codes below. +Quiet mode \- just returns the exit codes below. .TP 5 .B \-r .TP 5 @@ -141,7 +141,7 @@ True if the URI matches the given regular expression. .TP 5 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR Executes the specified program if the current result is true. -"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below. +"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below. .PP Expressions may also contain modifiers: .TP 5 diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5 index 700101773..576323291 100644 --- a/man/ipptoolfile.5 +++ b/man/ipptoolfile.5 @@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR: \fBATTR \fItag attribute-name value(s)\fR Adds an attribute to the test request. Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value. -Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character. -Common attributes and values are listed in the IANA IPP registry - see references below. +Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character. +Common attributes and values are listed in the IANA IPP registry \- see references below. .TP 5 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR] Adds a collection attribute to the test request. @@ -194,7 +194,7 @@ test report. \fBEXPECT ?\fIattribute-name predicate(s)\fR .TP 5 \fBEXPECT !\fIattribute-name\fR -Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension". +Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension". .TP 5 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR] .TP 5 @@ -246,7 +246,7 @@ Specifies whether will skip the current test if the previous test resulted in an error/failure. .TP 5 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ] -Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates. +Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates. .TP 5 \fBTEST\-ID "\fIidentifier\fR" Specifies an identifier string for the current test. diff --git a/man/lp.1 b/man/lp.1 index cbea3b840..839a48278 100644 --- a/man/lp.1 +++ b/man/lp.1 @@ -83,7 +83,7 @@ lp \- print files ] .SH DESCRIPTION \fBlp\fR submits files for printing or alters a pending job. -Use a filename of "-" to force printing from the standard input. +Use a filename of "\-" to force printing from the standard input. .SS THE DEFAULT DESTINATION CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first. If neither are set, the current default set using the @@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job \fB\-P \fIpage-list\fR Specifies which pages to print in the document. The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16". -The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages. +The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages. .SS COMMON JOB OPTIONS Aside from the printer-specific options reported by the .BR lpoptions (1) @@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees). \fB\-o print\-quality=4\fR .TP 5 \fB\-o print\-quality=5\fR -Specifies the output quality - draft (3), normal (4), or best (5). +Specifies the output quality \- draft (3), normal (4), or best (5). .TP 5 \fB\-o sides=one\-sided\fR Prints on one side of the paper. @@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm Print two copies of a document to the default printer: .nf - lp -n 2 filename + lp \-n 2 filename .fi Print a double-sided legal document to a printer called "foo": .nf - lp -d foo -o media=legal -o sides=two-sided-long-edge filename + lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename .fi Print a presentation document 2-up to a printer called "bar": .nf - lp -d bar -o number-up=2 filename + lp \-d bar \-o number-up=2 filename .fi .SH SEE ALSO .BR cancel (1), diff --git a/man/lpadmin.8 b/man/lpadmin.8 index 1b8c91ba4..ce6a698ff 100644 --- a/man/lpadmin.8 +++ b/man/lpadmin.8 @@ -120,7 +120,7 @@ command. .TP 5 \fB\-o \fIname\fB-default=\fIvalue\fR Sets a default server-side option for the destination. -Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2. +Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2. .TP 5 \fB\-o port\-monitor=\fIname\fR Sets the binary communications program to use when printing, "none", "bcp", or "tbcp". @@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed. Sets user-level access control on a destination. Names starting with "@" are interpreted as UNIX groups. The latter two forms turn user-level access control off. -Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'. +Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'. .TP 5 \fB\-v "\fIdevice-uri\fB"\fR Sets the \fIdevice-uri\fR attribute of the printer queue. @@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU Create an IPP Everywhere print queue: .nf - lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere + lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere .fi .SH SEE ALSO diff --git a/man/lpoptions.1 b/man/lpoptions.1 index a34fd01dc..7550d9afb 100644 --- a/man/lpoptions.1 +++ b/man/lpoptions.1 @@ -102,9 +102,9 @@ Destinations can only be removed using the .BR lpadmin (8) command. .SH FILES -\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users. +\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users. .br -\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user. +\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user. .SH CONFORMING TO The \fBlpoptions\fR command is unique to CUPS. .SH SEE ALSO diff --git a/man/lpr.1 b/man/lpr.1 index f367cd97c..635d126d6 100644 --- a/man/lpr.1 +++ b/man/lpr.1 @@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees). \fB\-o print\-quality=4\fR .TP 5 \fB\-o print\-quality=5\fR -Specifies the output quality - draft (3), normal (4), or best (5). +Specifies the output quality \- draft (3), normal (4), or best (5). .TP 5 \fB\-o sides=one\-sided\fR Prints on one side of the paper. @@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR, Print two copies of a document to the default printer: .nf - lpr -# 2 filename + lpr \-# 2 filename .fi Print a double-sided legal document to a printer called "foo": .nf - lpr -P foo -o media=legal -o sides=two-sided-long-edge filename + lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename .fi Print a presentation document 2-up to a printer called "foo": .nf - lpr -P foo -o number-up=2 filename + lpr \-P foo \-o number-up=2 filename .fi .SH SEE ALSO .BR cancel (1), diff --git a/man/mime.convs.5 b/man/mime.convs.5 index 25a6f7653..04ba39494 100644 --- a/man/mime.convs.5 +++ b/man/mime.convs.5 @@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va The \fIfilter\fR field specifies the filter program filename. Filenames are relative to the CUPS filter directory. .SH FILES -\fI/etc/cups\fR - Typical CUPS configuration directory. +\fI/etc/cups\fR \- Typical CUPS configuration directory. .br -\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory. +\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory. .br -\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS. +\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS. .SH EXAMPLES Define a filter that converts PostScript documents to CUPS Raster format: .nf diff --git a/man/mime.types.5 b/man/mime.types.5 index 7e83de16a..3572726f5 100644 --- a/man/mime.types.5 +++ b/man/mime.types.5 @@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information. .LP The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!". .SS RULES -Rules take two forms - a filename extension by itself and functions with test +Rules take two forms \- a filename extension by itself and functions with test values inside parenthesis. The following functions are available: .TP 5 @@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is alphanumerically smaller than "text/foo". However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead. .SH FILES -\fI/etc/cups\fR - Typical CUPS configuration directory. +\fI/etc/cups\fR \- Typical CUPS configuration directory. .SH EXAMPLES Define two MIME media types for raster data, with one being a subset with higher priority: .nf diff --git a/man/ppdc.1 b/man/ppdc.1 index 44e9d2448..38e266978 100644 --- a/man/ppdc.1 +++ b/man/ppdc.1 @@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files. \fB\-\-crlf\fR .TP 5 \fB\-\-lf\fR -Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone. +Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone. The default is to use the line feed character alone. .SH NOTES PPD files are deprecated and will no longer be supported in a future feature release of CUPS. -- cgit v1.2.3 From 7e6fcb571a7307a595de2e1214dbf7b474d64b3a Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 9 Aug 2016 18:11:06 +0200 Subject: Install root backends world-readable This is needed: - to comply with Debian Policy - because it is both nonsensical to not do so - it also breaks system checkers, bug reporting, etc Bug: http://www.cups.org/str.php?L2935 Bug-Debian: http://bugs.debian.org/410171 --- backend/Makefile | 4 ++-- scheduler/cups-deviced.c | 2 +- scheduler/job.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/Makefile b/backend/Makefile index e3ce49be6..b73445857 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -13,7 +13,7 @@ include ../Makedefs # Object files... # -# RBACKENDS are installed mode 0700 so cupsd will run them as root... +# RBACKENDS are installed mode 0744 so cupsd will run them as root... # # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as # an unprivileged user... @@ -118,7 +118,7 @@ install-exec: $(INSTALLXPC) echo Installing backends in $(SERVERBIN)/backend $(INSTALL_DIR) -m 755 $(SERVERBIN)/backend for file in $(RBACKENDS); do \ - $(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \ + $(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \ done for file in $(UBACKENDS); do \ $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \ diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c index 77703b983..14478fd99 100644 --- a/scheduler/cups-deviced.c +++ b/scheduler/cups-deviced.c @@ -265,7 +265,7 @@ main(int argc, /* I - Number of command-line args */ * all others run as the unprivileged user... */ - start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO))); + start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH))); } cupsDirClose(dir); diff --git a/scheduler/job.c b/scheduler/job.c index 2cfb1b03d..515fc8b5e 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */ else if (stat(command, &backinfo)) backroot = 0; else - backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO)); + backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)); argv[0] = job->printer->sanitized_device_uri; -- cgit v1.2.3 From 37869bd8f18d81325b189315c9b1949ba74253df Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 9 Aug 2016 18:11:07 +0200 Subject: Fix jobs with multiple files or multiple formats Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242 Bug: https://www.cups.org/str.php?L4348 Last-Updated: 2015-02-10 Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch --- backend/ipp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/ipp.c b/backend/ipp.c index 8226acc7b..5902dd6cb 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -1803,7 +1803,10 @@ main(int argc, /* I - Number of command-line args */ ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", (i + 1) >= num_files); - if (document_format) + if (num_files > 1) + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, + "document-format", NULL, "application/octet-stream"); + else if (document_format) ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format", NULL, document_format); -- cgit v1.2.3 From 0b429c446dee90330c2367f801f7f13c7347dcb0 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 9 Aug 2016 18:11:09 +0200 Subject: Tests: Ignore warnings from colord and Avahi These warnings change the expected number of warnings Last-Update: 2015-08-05 Patch-Name: tests-ignore-warnings.patch --- test/run-stp-tests.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index 2f9630f52..a60158156 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -1040,7 +1040,11 @@ else fi # Warning log messages -count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'` +count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \ + $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \ + $GREP -v 'org.freedesktop.ColorManager' | \ + $GREP -v -E 'Avahi client failed: -(1|26)' | \ + wc -l | awk '{print $1}'` if test $count != 8; then echo "FAIL: $count warning messages, expected 8." $GREP '^W ' $BASE/log/error_log -- cgit v1.2.3 From 5279167dfd4cbf564fe80c945d874fd53cc4b1f1 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Tue, 9 Aug 2016 18:11:10 +0200 Subject: Tests: ignore usb & dnssd backend unexpected exits Ignore the following errors: "[cups-deviced] PID * (usb) crashed on signal 11!" and "[cups-deviced] PID * (dnssd) stopped with status 1" They seem to regularly happen on Debian/Ubuntu buildds and break error lines counting. Last-Update: 2015-02-10 Patch-Name: tests-ignore-usb-crash.patch --- test/run-stp-tests.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index a60158156..8bde425d6 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -1025,7 +1025,10 @@ else fi # Error log messages -count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'` +count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \ + $GREP -v '(usb) crashed on signal 11' | \ + $GREP -v '(dnssd) stopped with status 1' | \ + wc -l | awk '{print $1}'` if test $count != 33; then echo "FAIL: $count error messages, expected 33." $GREP '^E ' $BASE/log/error_log -- cgit v1.2.3 From 77abc6f2c098f7381be9e4fa5fa9ddd4a1180b4c Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Tue, 9 Aug 2016 18:30:48 +0200 Subject: Tests: ignore loadFile failures Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes breaks the errorlines counting on kfreebsd-amd64 for some reason Origin: vendor Last-Update: 2015-02-10 Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch --- test/run-stp-tests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index 8bde425d6..f5a98dd64 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -1028,6 +1028,8 @@ fi count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \ $GREP -v '(usb) crashed on signal 11' | \ $GREP -v '(dnssd) stopped with status 1' | \ + $GREP -v 'loadFile failed: temp file: not a PDF file' | \ + $GREP -v 'Failed to connect to system bus' | \ wc -l | awk '{print $1}'` if test $count != 33; then echo "FAIL: $count error messages, expected 33." -- cgit v1.2.3 From 68d005026cb34fffc3634c9f20b358fbf9973878 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Tue, 9 Aug 2016 18:33:56 +0200 Subject: Tests: ignore errors triggered on ipv6-deprived hosts Ignore the 'Address family not supported by protocol' error that breaks the errorlines counting on buildds without a working IPv6 stack. Origin: vendor Last-Update: 2015-02-10 Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch --- test/run-stp-tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index f5a98dd64..f3a432155 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' $GREP -v '(dnssd) stopped with status 1' | \ $GREP -v 'loadFile failed: temp file: not a PDF file' | \ $GREP -v 'Failed to connect to system bus' | \ + $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \ wc -l | awk '{print $1}'` if test $count != 33; then echo "FAIL: $count error messages, expected 33." -- cgit v1.2.3 From 57e7deea1b458b94d14dc133046adf4103240488 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Tue, 9 Aug 2016 18:36:02 +0200 Subject: Tests: ignore the failure to write uncompressed data Ignore the 'Unable to write uncompressed print data: Broken pipe' error that sometimes breaks the errorlines counting on kfreebsd for some reason. Origin: vendor Last-Update: 2016-08-09 Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch --- test/run-stp-tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index f3a432155..c072ad88d 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' $GREP -v 'loadFile failed: temp file: not a PDF file' | \ $GREP -v 'Failed to connect to system bus' | \ $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \ + $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \ wc -l | awk '{print $1}'` if test $count != 33; then echo "FAIL: $count error messages, expected 33." -- cgit v1.2.3 From 69215a096afb42f03e239b2586f1efc16de0a486 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Tue, 9 Aug 2016 18:11:16 +0200 Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as glibc's iconv behavior is different than what the test expects. Bug-Debian: http://bugs.debian.org/662996 Last-Update: 2015-10-02 Patch-Name: test-i18n-nonlinux.patch --- cups/testi18n.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cups/testi18n.c b/cups/testi18n.c index 45e1cab35..449670c44 100644 --- a/cups/testi18n.c +++ b/cups/testi18n.c @@ -410,7 +410,7 @@ main(int argc, /* I - Argument Count */ puts("PASS"); } -#ifndef __linux +#if !defined(__linux__) && !defined(__GLIBC__) fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout); strlcpy(legsrc, legdest, sizeof(legsrc)); -- cgit v1.2.3 From a6a69d9950c167a62d47ec0c251c2ead3c7db441 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Tue, 9 Aug 2016 18:11:17 +0200 Subject: Tests: Make sure that all scheduled jobs are finished before running a new test. Fixes failures on slow architectures like armel and mipsel. Bug-Debian: http://bugs.debian.org/670878 Last-Update: 2015-02-10 Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch --- test/run-stp-tests.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index c072ad88d..492982005 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -776,6 +776,11 @@ echo " $date by $user on `hostname`." >>$strfile echo " 
" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From 62edc4e78c5831c3d3e35b9676cbecc9f9b0c686 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From 1e063279ac30fe50296a85f9d87b794377b823db Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Last-Update: 2016-08-05
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 492982005..3f0becde9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From 7a57b1e7f9f04d05a9e6075abd887093d5d319d3 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Last-Update: 2016-07-11
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 3f0becde9..baebdeec9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From 9dd262ab1d018195771b45af250fa01268c8433e Mon Sep 17 00:00:00 2001
From: Michael Sweet 
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream

Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index baebdeec9..001e2f61f 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From 07f2a4581effba6b7ee88cc89ca15c679d5155db Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://cups.org/str.php?L4342
Bug-Debian: http://bugs.debian.org/640124
Last-Update: 2015-02-10

Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From aaf1b2a721086ece6a680eec900ba2976000e398 Mon Sep 17 00:00:00 2001
From: Till Kamppeter 
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: http://bugs.debian.org/700961
Bug: https://cups.org/str.php?L4341
Last-Update: 2015-02-10

Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 542523760..b366bf588 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3806,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 2474a5970d84faed3cc688a6748461cb2b5c7fd4 Mon Sep 17 00:00:00 2001
From: Tim Waugh 
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://www.cups.org/str.php?L3552
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 1adcbd790f2a304c91a674520d3e50d83e9ddca8 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673

Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 776e79a91..ec6357ffe 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index 515fc8b5e..9c197efc9 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index b366bf588..10ae91234 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 3267a2ff6..2542ab148 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From e9de51045546ba63ef57979ddbe88e865c2ced26 Mon Sep 17 00:00:00 2001
From: Kenshi Muto 
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: http://www.cups.org/str.php?L2369
Origin: vendor
Author: Didier Raboud 
Last-Update: 2014-01-16

Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From c347ff881f6abdc44b7aeeb03170a16dec777aae Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From 69c18bbfd8b929d8dc3e4fd06ae672cc1073e4fb Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586

Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 1118aeef013fa7864534de69b699210598915cc2 Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Last-Update: 2015-02-10

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 7ac113c693bddb95bac40bb945eb296969781c1d Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953

Last-Update: 2015-02-10
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index cdb5437dc..d53d1401c 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include 
 #endif /* HAVE_ASL_H */
 #include 
+#include 
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From 7a56ba79974cab424dce061f8fdbabda54d11af7 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Last-Update: 2015-02-10

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From e61a3fa6794d59e1868b982ded16f37df0fbc50f Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Last-Update: 2015-02-10

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 6826016f93b9327994d050b67344fceb5736df08 Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..038bb9451 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
 .SUFFIXES:	.a .c .cxx .h .o
 
 .c.o:
-- 
cgit v1.2.3


From 9049c3015d0fe5add9d2d0de24366283f9df7ede Mon Sep 17 00:00:00 2001
From: Tim Waugh 
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Last-Update: 2015-02-10

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 
Specifies whether the scheduler calls
 fsync(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 
SystemGroup group-name [ ... group-name ]
 
Specifies the group(s) to use for @SYSTEM group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 80ca9110d73f5128b16032f5a35723bc8665313e Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job", since it is less

 confusing and a better default on most machines.
 .
 Amend documentation accordingly.
Author: Didier Raboud 
Origin: vendor
Last-Update: 2016-07-03

Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 
ErrorPolicy retry-current-job
 
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 
ErrorPolicy retry-job
-
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 
ErrorPolicy stop-printer
-
Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+
Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 
FilterLimit limit
 
Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From e592e92ab6c05bb920898e5371c6ef246ae67e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= 
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: http://bugs.debian.org/570157
Last-Update: 2015-10-02
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 4ae7f022cbd6bf3ce0db078ad847c13f876de1d5 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Last-Update: 2014-06-11
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 1fa058eaa7d4fc4127a687edcaf5ada96f76bcd1 Mon Sep 17 00:00:00 2001
From: Helmut Grohne 
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 038bb9451..291099cf2 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 7eca9e37f..2dfdbb93c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 28d60c4020cb2d40bfe203f3a25e5ea529a56c24 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François , Helge Kreutzmann 
Origin: vendor
Bug-Debian: http://bugs.debian.org/478597

Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From feb1326b9abf0ca6f140851ac3df582c96d7a47f Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Mon, 2 Sep 2019 09:14:42 +0200
Subject: git-debrebase convert-from-dgit-view: drop upstream changes from
 breakwater

Drop upstream changes, and delete debian/patches, as part of converting
to git-debrebase format.  Upstream changes will appear as commits.

[git-debrebase convert-from-dgit-view drop-patches]
---
 .gitattributes                                     |   5 +
 Makedefs.in                                        |   2 +-
 backend/Makefile                                   |   4 +-
 backend/ipp.c                                      |   5 +-
 backend/snmp.c                                     |   8 -
 cgi-bin/admin.c                                    |   6 +-
 conf/Makefile                                      |   9 +-
 conf/cups-files.conf.in                            |   2 +-
 conf/cupsd.conf.in                                 |   4 -
 conf/mime.convs.in                                 |   3 -
 conf/mime.types                                    |   3 -
 configure.ac                                       |   9 -
 cups-config.in                                     |   7 +-
 cups/testi18n.c                                    |   2 +-
 cups/testppd.c                                     |   8 -
 ...0003-Install-root-backends-world-readable.patch |  66 ---
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  48 --
 ...html-with-the-build-architecture-compiler.patch | 111 ----
 debian/patches/airprint-support.patch              |  94 ----
 debian/patches/confdirperms.patch                  |  29 --
 .../cups-set-default-error-policy-retry-job.patch  |  76 ---
 .../cupsd-set-default-for-SyncOnClose-to-Yes.patch |  67 ---
 debian/patches/debianize_cups-config.patch         |  51 --
 debian/patches/default_log_settings.patch          |  28 -
 .../patches/do-not-broadcast-with-hostnames.patch  |  27 -
 ...-with-multiple-files-and-multiple-formats.patch |  29 --
 debian/patches/logfiles_adm_readable.patch         |  63 ---
 .../man-cups-lpd-drop-dangling-references.patch    |  26 -
 debian/patches/manpage-hyphen-minus.patch          | 574 ---------------------
 debian/patches/manpage-translations.patch          | 344 ------------
 .../patches/move-cupsd-conf-default-to-share.patch |  65 ---
 debian/patches/no-conffile-timestamp.patch         |  69 ---
 debian/patches/pwg-raster-attributes.patch         | 112 ----
 debian/patches/reactivate_recommended_driver.patch |  42 --
 debian/patches/removecvstag.patch                  |  32 --
 debian/patches/rename-systemd-units.patch          |  60 ---
 debian/patches/series                              |  33 --
 debian/patches/show-compile-command-lines.patch    |  22 -
 debian/patches/test-i18n-nonlinux.patch            |  27 -
 .../tests-fix-ppdLocalize-on-unclean-env.patch     |  33 --
 ...-ignore-ipv6-address-family-not-supported.patch |  26 -
 .../tests-ignore-kfreebsd-amd64-not-a-pdf.patch    |  27 -
 ...d-unable-to-write-uncompressed-print-data.patch |  27 -
 debian/patches/tests-ignore-usb-crash.patch        |  34 --
 debian/patches/tests-ignore-warnings.patch         |  31 --
 .../tests-make-lpstat-call-reproducible.patch      |  26 -
 debian/patches/tests-no-pdftourf.patch             |  68 ---
 debian/patches/tests-use-ipv4-lo-address.patch     |  66 ---
 .../tests-wait-on-unfinished-jobs-everytime.patch  |  31 --
 doc/help/man-cups-files.conf.html                  |   2 +-
 doc/help/man-cupsd.conf.html                       |   4 +-
 man/Makefile                                       |  22 +-
 man/Makefile.l10n                                  | 235 ---------
 man/backend.7                                      |   4 +-
 man/client.conf.5                                  |   4 +-
 man/cups-files.conf.5                              |   4 +-
 man/cups-lpd.8                                     |   8 +-
 man/cups-snmp.conf.5                               |   2 +-
 man/cups.1                                         |   2 +-
 man/cupsctl.8                                      |   6 +-
 man/cupsd-logs.5                                   |  36 +-
 man/cupsd.conf.5                                   |   6 +-
 man/cupsfilter.8                                   |   2 +-
 man/de/Makefile                                    |   7 -
 man/filter.7                                       |   2 +-
 man/fr/Makefile                                    |   7 -
 man/ippeveprinter.1                                |   6 +-
 man/ippfind.1                                      |   6 +-
 man/ipptoolfile.5                                  |   8 +-
 man/lp.1                                           |  12 +-
 man/lpadmin.8                                      |   6 +-
 man/lpoptions.1                                    |   4 +-
 man/lpr.1                                          |   8 +-
 man/mantohtml.c                                    |  15 +-
 man/mime.convs.5                                   |   6 +-
 man/mime.types.5                                   |   4 +-
 man/ppdc.1                                         |   2 +-
 scheduler/classes.c                                |   2 +-
 scheduler/conf.c                                   |  14 +-
 scheduler/cups-deviced.c                           |   2 +-
 scheduler/cups-driverd.cxx                         |  10 +
 scheduler/dirsvc.c                                 |   6 -
 scheduler/job.c                                    |   4 +-
 scheduler/log.c                                    |  11 +-
 scheduler/org.cups.cups-lpd.socket                 |   2 +-
 scheduler/org.cups.cupsd.path.in                   |   2 +-
 scheduler/org.cups.cupsd.service.in                |   2 +-
 scheduler/org.cups.cupsd.socket.in                 |   2 +-
 scheduler/printers.c                               |  83 +--
 scheduler/subscriptions.c                          |   2 +-
 test/5.1-lpadmin.sh                                |   4 +-
 test/run-stp-tests.sh                              |  33 +-
 test/test.convs                                    |   1 +
 test/test.types                                    |   2 +
 94 files changed, 144 insertions(+), 3009 deletions(-)
 create mode 100644 .gitattributes
 delete mode 100644 debian/patches/0003-Install-root-backends-world-readable.patch
 delete mode 100644 debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 delete mode 100644 debian/patches/0032-Build-mantohtml-with-the-build-architecture-compiler.patch
 delete mode 100644 debian/patches/airprint-support.patch
 delete mode 100644 debian/patches/confdirperms.patch
 delete mode 100644 debian/patches/cups-set-default-error-policy-retry-job.patch
 delete mode 100644 debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
 delete mode 100644 debian/patches/debianize_cups-config.patch
 delete mode 100644 debian/patches/default_log_settings.patch
 delete mode 100644 debian/patches/do-not-broadcast-with-hostnames.patch
 delete mode 100644 debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
 delete mode 100644 debian/patches/logfiles_adm_readable.patch
 delete mode 100644 debian/patches/man-cups-lpd-drop-dangling-references.patch
 delete mode 100644 debian/patches/manpage-hyphen-minus.patch
 delete mode 100644 debian/patches/manpage-translations.patch
 delete mode 100644 debian/patches/move-cupsd-conf-default-to-share.patch
 delete mode 100644 debian/patches/no-conffile-timestamp.patch
 delete mode 100644 debian/patches/pwg-raster-attributes.patch
 delete mode 100644 debian/patches/reactivate_recommended_driver.patch
 delete mode 100644 debian/patches/removecvstag.patch
 delete mode 100644 debian/patches/rename-systemd-units.patch
 delete mode 100644 debian/patches/series
 delete mode 100644 debian/patches/show-compile-command-lines.patch
 delete mode 100644 debian/patches/test-i18n-nonlinux.patch
 delete mode 100644 debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
 delete mode 100644 debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
 delete mode 100644 debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
 delete mode 100644 debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
 delete mode 100644 debian/patches/tests-ignore-usb-crash.patch
 delete mode 100644 debian/patches/tests-ignore-warnings.patch
 delete mode 100644 debian/patches/tests-make-lpstat-call-reproducible.patch
 delete mode 100644 debian/patches/tests-no-pdftourf.patch
 delete mode 100644 debian/patches/tests-use-ipv4-lo-address.patch
 delete mode 100644 debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
 delete mode 100644 man/Makefile.l10n
 delete mode 100644 man/de/Makefile
 delete mode 100644 man/fr/Makefile
 create mode 100644 test/test.types

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..2f20357d7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+.git* export-ignore
+.mailmap export-ignore
+examples/testfile.pcl -text
+exampels/testfile.txt -text
+scripts export-ignore
diff --git a/Makedefs.in b/Makedefs.in
index 291099cf2..9ee75856d 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,7 +22,6 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
-CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
@@ -264,6 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
+.SILENT:
 .SUFFIXES:	.a .c .cxx .h .o
 
 .c.o:
diff --git a/backend/Makefile b/backend/Makefile
index b73445857..e3ce49be6 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+# RBACKENDS are installed mode 0700 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/backend/ipp.c b/backend/ipp.c
index 5902dd6cb..8226acc7b 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1803,10 +1803,7 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (num_files > 1)
-	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
-		       "document-format", NULL, "application/octet-stream");
-	else if (document_format)
+	if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
diff --git a/backend/snmp.c b/backend/snmp.c
index 9572822a8..66ac884c6 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,8 +154,6 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
-static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
-static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -971,15 +969,9 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
-	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
-		       packet.community, CUPS_ASN1_GET_REQUEST,
-		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
-	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
-		       packet.community, CUPS_ASN1_GET_REQUEST,
-		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index 6e9a64a7c..f087809f7 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,7 +1629,6 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
-    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1713,10 +1712,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
-      data_dir = CUPS_DATADIR;
-
-    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+    strlcat(filename, ".default", sizeof(filename));
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index db0060d75..e249e6069 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,12 +69,8 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
-			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
-			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
-		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
-		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -122,10 +118,9 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE); do \
+	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
-	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index a3d088da5..4a78ba615 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose Yes
+#SyncOnClose No
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index 78189e535..ab37ca68c 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,10 +8,6 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
-# Deactivate CUPS' internal logrotating, as we provide a better one, especially
-# LogLevel debug2 gets usable now
-MaxLogSize 0
-
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index e042e0129..57b459d73 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,9 +44,6 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
-# Needed for printing from iOS (AirPrint) clients
-image/urf    	      	       application/pdf			100	-
-
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index ebb05257e..fcd6b6eff 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,9 +108,6 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
-# Needed for printing from iOS (AirPrint) clients
-image/urf			urf string(0,UNIRAST<00>)
-
 ########################################################################
 #
 # Text files...
diff --git a/configure.ac b/configure.ac
index 2dfdbb93c..7eca9e37f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,15 +19,6 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
-AC_MSG_CHECKING([for build system compiler])
-if test "$cross_compiling" = yes; then
-	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
-else
-	CC_FOR_BUILD=${CC}
-fi
-AC_MSG_RESULT(${CC_FOR_BUILD})
-AC_SUBST(CC_FOR_BUILD)
-
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/cups-config.in b/cups-config.in
index b073a074a..9dd094d16 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+libdir=@libdir@
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,8 +29,7 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
-LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -44,7 +43,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
diff --git a/cups/testi18n.c b/cups/testi18n.c
index 449670c44..45e1cab35 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#if !defined(__linux__) && !defined(__GLIBC__)
+#ifndef __linux
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/cups/testppd.c b/cups/testppd.c
index a4ab7bfaa..36707f29a 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,14 +658,6 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
-   /*
-    * Enforce void localization
-    */
-    putenv("LANG=C");
-    putenv("LC_ALL=C");
-    putenv("LC_CTYPE=C");
-    putenv("LC_MESSAGES=C");
-
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/0003-Install-root-backends-world-readable.patch b/debian/patches/0003-Install-root-backends-world-readable.patch
deleted file mode 100644
index 7f52322ff..000000000
--- a/debian/patches/0003-Install-root-backends-world-readable.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 7e6fcb571a7307a595de2e1214dbf7b474d64b3a Mon Sep 17 00:00:00 2001
-From: Martin Pitt 
-Date: Tue, 9 Aug 2016 18:11:06 +0200
-Subject: Install root backends world-readable
-
-This is needed:
- - to comply with Debian Policy
- - because it is both nonsensical to not do so
- - it also breaks system checkers, bug reporting, etc
-
-Bug: http://www.cups.org/str.php?L2935
-Bug-Debian: http://bugs.debian.org/410171
----
- backend/Makefile         | 4 ++--
- scheduler/cups-deviced.c | 2 +-
- scheduler/job.c          | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/backend/Makefile b/backend/Makefile
-index e3ce49be6..b73445857 100644
---- a/backend/Makefile
-+++ b/backend/Makefile
-@@ -13,7 +13,7 @@ include ../Makedefs
- # Object files...
- #
- 
--# RBACKENDS are installed mode 0700 so cupsd will run them as root...
-+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
- #
- # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
- # an unprivileged user...
-@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
- 	echo Installing backends in $(SERVERBIN)/backend
- 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
- 	for file in $(RBACKENDS); do \
--		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
-+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
- 	done
- 	for file in $(UBACKENDS); do \
- 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
-diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
-index 77703b983..14478fd99 100644
---- a/scheduler/cups-deviced.c
-+++ b/scheduler/cups-deviced.c
-@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
-     * all others run as the unprivileged user...
-     */
- 
--    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
-+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
-   }
- 
-   cupsDirClose(dir);
-diff --git a/scheduler/job.c b/scheduler/job.c
-index 2cfb1b03d..515fc8b5e 100644
---- a/scheduler/job.c
-+++ b/scheduler/job.c
-@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
-       else if (stat(command, &backinfo))
- 	backroot = 0;
-       else
--        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
-+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
- 
-       argv[0] = job->printer->sanitized_device_uri;
- 
diff --git a/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
deleted file mode 100644
index bd70c63f2..000000000
--- a/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2474a5970d84faed3cc688a6748461cb2b5c7fd4 Mon Sep 17 00:00:00 2001
-From: Tim Waugh 
-Date: Tue, 9 Aug 2016 18:11:30 +0200
-Subject: Let snmp backend also use manufacturer-specific MIBs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
- … of HP and Ricoh to obtain the device IDs of network-connected
- printers. This way we get more reliable information about make and model
- and in addition the supported page description languages, which allows one to
- identify whether an optional PostScript add-on is installed or for an
- unsupported printer which generic PPD is the best choice (requested by
- Ricoh).
-Bug: https://www.cups.org/str.php?L3552
----
- backend/snmp.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/backend/snmp.c b/backend/snmp.c
-index 66ac884c6..9572822a8 100644
---- a/backend/snmp.c
-+++ b/backend/snmp.c
-@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
- static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
- static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
- static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
-+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
-+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
- static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
- static cups_array_t	*DeviceURIs = NULL;
- static int		HostNameLookups = 0;
-@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
- 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
- 	               packet.community, CUPS_ASN1_GET_REQUEST,
- 		       DEVICE_ID, LexmarkDeviceIdOID);
-+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
-+		       packet.community, CUPS_ASN1_GET_REQUEST,
-+		       DEVICE_ID, RicohDeviceIdOID);
- 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
- 	               packet.community, CUPS_ASN1_GET_REQUEST,
- 		       DEVICE_PRODUCT, XeroxProductOID);
-+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
-+		       packet.community, CUPS_ASN1_GET_REQUEST,
-+		       DEVICE_ID, HPDeviceIdOID);
-         break;
- 
-     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0032-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0032-Build-mantohtml-with-the-build-architecture-compiler.patch
deleted file mode 100644
index c459271e0..000000000
--- a/debian/patches/0032-Build-mantohtml-with-the-build-architecture-compiler.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 1fa058eaa7d4fc4127a687edcaf5ada96f76bcd1 Mon Sep 17 00:00:00 2001
-From: Helmut Grohne 
-Date: Tue, 9 Aug 2016 18:11:49 +0200
-Subject: Build mantohtml with the build architecture compiler
-
-mantohtml is run during build. Thus it needs to be built with the build
-architecture compiler (or execution fails). The obvious part is switching to
-CC_FOR_BUILD. That also depends on it not requiring any other cups components.
-In particular, removing uses of strlcpy and replacing host architecture-
-specific includes is thus needed.
-
-Bug-Debian: https://bugs.debian.org/837936
----
- Makedefs.in     |  1 +
- configure.ac    |  9 +++++++++
- man/Makefile    |  5 ++---
- man/mantohtml.c | 15 ++++++++++-----
- 4 files changed, 22 insertions(+), 8 deletions(-)
-
-diff --git a/Makedefs.in b/Makedefs.in
-index 038bb9451..291099cf2 100644
---- a/Makedefs.in
-+++ b/Makedefs.in
-@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
- AR		=	@AR@
- AWK		=	@AWK@
- CC		=	@LIBTOOL_CC@ @CC@
-+CC_FOR_BUILD	=	@CC_FOR_BUILD@
- CHMOD		=	@CHMOD@
- CXX		=	@LIBTOOL_CXX@ @CXX@
- DSO		=	@DSO@
-diff --git a/configure.ac b/configure.ac
-index 7eca9e37f..2dfdbb93c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
- sinclude(config-scripts/cups-directories.m4)
- sinclude(config-scripts/cups-manpages.m4)
- 
-+AC_MSG_CHECKING([for build system compiler])
-+if test "$cross_compiling" = yes; then
-+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
-+else
-+	CC_FOR_BUILD=${CC}
-+fi
-+AC_MSG_RESULT(${CC_FOR_BUILD})
-+AC_SUBST(CC_FOR_BUILD)
-+
- sinclude(config-scripts/cups-sharedlibs.m4)
- sinclude(config-scripts/cups-libtool.m4)
- sinclude(config-scripts/cups-compiler.m4)
-diff --git a/man/Makefile b/man/Makefile
-index 621fe60c1..e01591a93 100644
---- a/man/Makefile
-+++ b/man/Makefile
-@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
- 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
- 	done
- 
--mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
--	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
--	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-+mantohtml:	mantohtml.c
-+	$(CC_FOR_BUILD) -o $@ $<
-diff --git a/man/mantohtml.c b/man/mantohtml.c
-index 2a9353a9f..6223f17d2 100644
---- a/man/mantohtml.c
-+++ b/man/mantohtml.c
-@@ -11,8 +11,10 @@
-  * Include necessary headers.
-  */
- 
--#include 
--#include 
-+#include 
-+#include 
-+#include 
-+#include 
- #include 
- 
- 
-@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
-         * Anchor for HTML output...
-         */
- 
--        strlcpy(anchor, line + 4, sizeof(anchor));
-+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
-+        anchor[sizeof(anchor) - 1] = '\0';
-       }
-       else if (strncmp(line, ".\\\"", 3))
-       {
-@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
- 		manfile[1024],		/* Man page filename */
- 		manurl[1024];		/* Man page URL */
- 
--        strlcpy(name, s, sizeof(name));
-+        strncpy(name, s, sizeof(name) - 1);
-+        name[sizeof(name) - 1] = '\0';
-         if ((size_t)(end - s) < sizeof(name))
-           name[end - s] = '\0';
- 
-@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
-       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
-         end --;
- 
--      strlcpy(temp, s, sizeof(temp));
-+      strncpy(temp, s, sizeof(temp) - 1);
-+      temp[sizeof(temp) - 1] = '\0';
-       if ((size_t)(end -s) < sizeof(temp))
-         temp[end - s] = '\0';
- 
diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch
deleted file mode 100644
index 242eaff81..000000000
--- a/debian/patches/airprint-support.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From aaf1b2a721086ece6a680eec900ba2976000e398 Mon Sep 17 00:00:00 2001
-From: Till Kamppeter 
-Date: Tue, 9 Aug 2016 18:11:29 +0200
-Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
- Touch to a CUPS server)
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
-Bug-Debian: http://bugs.debian.org/700961
-Bug: https://cups.org/str.php?L4341
-Last-Update: 2015-02-10
-
-Patch-Name: airprint-support.patch
----
- conf/mime.convs.in   | 3 +++
- conf/mime.types      | 3 +++
- scheduler/conf.c     | 2 +-
- scheduler/dirsvc.c   | 6 ++++++
- scheduler/printers.c | 4 +++-
- 5 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/conf/mime.convs.in b/conf/mime.convs.in
-index 57b459d73..e042e0129 100644
---- a/conf/mime.convs.in
-+++ b/conf/mime.convs.in
-@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
- application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
- application/vnd.cups-raster	image/urf			100	rastertopwg
- 
-+# Needed for printing from iOS (AirPrint) clients
-+image/urf    	      	       application/pdf			100	-
-+
- ########################################################################
- #
- # Raw filter...
-diff --git a/conf/mime.types b/conf/mime.types
-index fcd6b6eff..ebb05257e 100644
---- a/conf/mime.types
-+++ b/conf/mime.types
-@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
- image/x-bitmap			bmp string(0,BM) + !printable(2,14)
- image/x-icon			ico
- 
-+# Needed for printing from iOS (AirPrint) clients
-+image/urf			urf string(0,UNIRAST<00>)
-+
- ########################################################################
- #
- # Text files...
-diff --git a/scheduler/conf.c b/scheduler/conf.c
-index bb6049b2c..bb4f9d215 100644
---- a/scheduler/conf.c
-+++ b/scheduler/conf.c
-@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
-   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
- 
- #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
--  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
-+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
-   cupsdClearString(&DNSSDHostName);
- #endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
-index ddd3701e0..fb2a30526 100644
---- a/scheduler/dirsvc.c
-+++ b/scheduler/dirsvc.c
-@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
-     keyvalue[count  ][0] = "pdl";
-     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
- 
-+    /* iOS 6 does not accept this printer as AirPrint printer if there is
-+       no URF txt record or "URF=none", "DM3" is the minimum needed found
-+       by try and error */
-+    keyvalue[count  ][0] = "URF";
-+    keyvalue[count++][1] = "DM3";
-+
-     if (get_auth_info_required(p, air_str, sizeof(air_str)))
-     {
-       keyvalue[count  ][0] = "air";
-diff --git a/scheduler/printers.c b/scheduler/printers.c
-index 542523760..b366bf588 100644
---- a/scheduler/printers.c
-+++ b/scheduler/printers.c
-@@ -3806,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
-       }
-       else if (!_cups_strcasecmp(type->super, "image"))
-       {
--        if (!_cups_strcasecmp(type->type, "jpeg"))
-+        if (!_cups_strcasecmp(type->type, "urf"))
-+	  strlcat(pdl, "image/urf,", sizeof(pdl));
-+	else if (!_cups_strcasecmp(type->type, "jpeg"))
- 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
- 	else if (!_cups_strcasecmp(type->type, "png"))
- 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch
deleted file mode 100644
index 61e38896f..000000000
--- a/debian/patches/confdirperms.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e61a3fa6794d59e1868b982ded16f37df0fbc50f Mon Sep 17 00:00:00 2001
-From: Martin Pitt 
-Date: Tue, 9 Aug 2016 18:11:41 +0200
-Subject: Do not mess with the permissions of cupsd.conf.
-
-Last-Update: 2015-02-10
-
-Patch-Name: confdirperms.patch
----
- scheduler/conf.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/scheduler/conf.c b/scheduler/conf.c
-index b73d33f93..31eedbf71 100644
---- a/scheduler/conf.c
-+++ b/scheduler/conf.c
-@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
- 			     Group, 1, 1) < 0 ||
-        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
- 			     Group, 1, 0) < 0 ||
-+       /* Never alter permissions of central conffile
-        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
- 			     Group, 0, 0) < 0 ||
-        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
- 			     Group, 0, 0) < 0 ||
-+       */
-        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
- 			     Group, 0, 0) < 0 ||
-        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/cups-set-default-error-policy-retry-job.patch b/debian/patches/cups-set-default-error-policy-retry-job.patch
deleted file mode 100644
index 49b4aad77..000000000
--- a/debian/patches/cups-set-default-error-policy-retry-job.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 80ca9110d73f5128b16032f5a35723bc8665313e Mon Sep 17 00:00:00 2001
-From: Martin Pitt 
-Date: Tue, 9 Aug 2016 18:11:47 +0200
-Subject: Set default job error policy to "retry-job", since it is less
-
- confusing and a better default on most machines.
- .
- Amend documentation accordingly.
-Author: Didier Raboud 
-Origin: vendor
-Last-Update: 2016-07-03
-
-Patch-Name: cups-set-default-error-policy-retry-job.patch
----
- doc/help/man-cupsd.conf.html | 4 ++--
- man/cupsd.conf.5             | 4 ++--
- scheduler/conf.c             | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
-index 1668eee8a..7d161edd2 100644
---- a/doc/help/man-cupsd.conf.html
-+++ b/doc/help/man-cupsd.conf.html
-@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
- 
ErrorPolicy retry-current-job
- 
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
- 
ErrorPolicy retry-job
--
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
-+
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
- 
ErrorPolicy stop-printer
--
Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
-+
Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
- 
FilterLimit limit
- 
Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
- A limit of 0 disables filter limiting.
-diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
-index 49fdb06b1..6d3d8e393 100644
---- a/man/cupsd.conf.5
-+++ b/man/cupsd.conf.5
-@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
- Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
- .TP 5
- \fBErrorPolicy retry-job\fR
--Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
-+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
- .TP 5
- \fBErrorPolicy stop-printer\fR
--Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
-+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
- .\"#FilterLimit
- .TP 5
- \fBFilterLimit \fIlimit\fR
-diff --git a/scheduler/conf.c b/scheduler/conf.c
-index f2924f844..944655ecb 100644
---- a/scheduler/conf.c
-+++ b/scheduler/conf.c
-@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
-   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
-   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
- 
--  cupsdSetString(&ErrorPolicy, "stop-printer");
-+  cupsdSetString(&ErrorPolicy, "retry-job");
- 
-   JobHistory          = DEFAULT_HISTORY;
-   JobFiles            = DEFAULT_FILES;
-@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
-       strcmp(ErrorPolicy, "retry-job") &&
-       strcmp(ErrorPolicy, "stop-printer"))
-   {
--    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
--    cupsdSetString(&ErrorPolicy, "stop-printer");
-+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
-+    cupsdSetString(&ErrorPolicy, "retry-job");
-   }
- 
-  /*
diff --git a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
deleted file mode 100644
index 68aff3a72..000000000
--- a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 9049c3015d0fe5add9d2d0de24366283f9df7ede Mon Sep 17 00:00:00 2001
-From: Tim Waugh 
-Date: Tue, 9 Aug 2016 18:11:46 +0200
-Subject: Set the default for SyncOnClose to Yes
-
-Last-Update: 2015-02-10
-
-Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
----
- conf/cups-files.conf.in           | 2 +-
- doc/help/man-cups-files.conf.html | 2 +-
- man/cups-files.conf.5             | 2 +-
- scheduler/conf.c                  | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
-index 4a78ba615..a3d088da5 100644
---- a/conf/cups-files.conf.in
-+++ b/conf/cups-files.conf.in
-@@ -7,7 +7,7 @@
- #FatalErrors @CUPS_FATAL_ERRORS@
- 
- # Do we call fsync() after writing configuration or status files?
--#SyncOnClose No
-+#SyncOnClose Yes
- 
- # Default user and group for filters/backends/helper programs; this cannot be
- # any user or group that resolves to ID 0 for security reasons...
-diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
-index c567cbba7..f2f6802e6 100644
---- a/doc/help/man-cups-files.conf.html
-+++ b/doc/help/man-cups-files.conf.html
-@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
- 
Specifies whether the scheduler calls
- fsync(2)
- after writing configuration or state files.
--The default is "No".
-+The default is "Yes".
- 
SystemGroup group-name [ ... group-name ]
- 
Specifies the group(s) to use for @SYSTEM group authentication.
- The default contains "admin", "lpadmin", "root", "sys", and/or "system".
-diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
-index 72494065c..955f47b55 100644
---- a/man/cups-files.conf.5
-+++ b/man/cups-files.conf.5
-@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
- Specifies whether the scheduler calls
- .BR fsync (2)
- after writing configuration or state files.
--The default is "No".
-+The default is "Yes".
- .\"#SystemGroup
- .TP 5
- \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
-diff --git a/scheduler/conf.c b/scheduler/conf.c
-index 31eedbf71..f2924f844 100644
---- a/scheduler/conf.c
-+++ b/scheduler/conf.c
-@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
-   RootCertDuration         = 300;
-   Sandboxing               = CUPSD_SANDBOXING_STRICT;
-   StrictConformance        = FALSE;
--  SyncOnClose              = FALSE;
-+  SyncOnClose              = TRUE;
-   Timeout                  = 900;
-   WebInterface             = CUPS_DEFAULT_WEBIF;
- 
diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch
deleted file mode 100644
index d2cec1110..000000000
--- a/debian/patches/debianize_cups-config.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 4ae7f022cbd6bf3ce0db078ad847c13f876de1d5 Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:49 +0200
-Subject: Use dpkg-architecture in cups-config to make it
- architecture-independant
-
- Also filter -L/usr/lib/(triplet) out of LDFLAGS.
- Also strip unnecessary libs from --libs.
- Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
-Bug-Debian: https://bugs.debian.org/741519
-Bug-Debian: https://bugs.debian.org/727058
-Bug-Debian: https://bugs.debian.org/730838
-Bug-Debian: https://bugs.debian.org/751157
-Last-Update: 2014-06-11
-Patch-Name: debianize_cups-config.patch
----
- cups-config.in | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/cups-config.in b/cups-config.in
-index 9dd094d16..b073a074a 100755
---- a/cups-config.in
-+++ b/cups-config.in
-@@ -17,7 +17,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
- includedir=@includedir@
--libdir=@libdir@
-+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
- datarootdir=@datadir@
- datadir=@datadir@
- sysconfdir=@sysconfdir@
-@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
- # flags for compiler and linker...
- CFLAGS=""
- LDFLAGS="@EXPORT_LDFLAGS@"
--LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
-+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
-+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
- 
- # Check for local invocation...
- selfdir=`dirname $0`
-@@ -43,7 +44,7 @@ else
- 	CFLAGS="$CFLAGS -I$includedir"
-     fi
- 
--    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
-+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
- 	LDFLAGS="$LDFLAGS -L$libdir"
-     fi
- fi
diff --git a/debian/patches/default_log_settings.patch b/debian/patches/default_log_settings.patch
deleted file mode 100644
index fcc62bc41..000000000
--- a/debian/patches/default_log_settings.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7a56ba79974cab424dce061f8fdbabda54d11af7 Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:40 +0200
-Subject: Deactivate CUPS' own log rotating as the system already provides a
- more sophisticated log rotating
-
-Last-Update: 2015-02-10
-
-Patch-Name: default_log_settings.patch
----
- conf/cupsd.conf.in | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
-index ab37ca68c..78189e535 100644
---- a/conf/cupsd.conf.in
-+++ b/conf/cupsd.conf.in
-@@ -8,6 +8,10 @@
- LogLevel @CUPS_LOG_LEVEL@
- @CUPS_PAGE_LOG_FORMAT@
- 
-+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
-+# LogLevel debug2 gets usable now
-+MaxLogSize 0
-+
- # Only listen for connections from the local machine.
- Listen localhost:@DEFAULT_IPP_PORT@
- @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/do-not-broadcast-with-hostnames.patch b/debian/patches/do-not-broadcast-with-hostnames.patch
deleted file mode 100644
index e327baddf..000000000
--- a/debian/patches/do-not-broadcast-with-hostnames.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 69c18bbfd8b929d8dc3e4fd06ae672cc1073e4fb Mon Sep 17 00:00:00 2001
-From: Till Kampetter 
-Date: Tue, 9 Aug 2016 18:11:35 +0200
-Subject: Do not use host names for broadcasting print queues and
-
- managing print queues broadcasted from other servers by default. Many
- networks do not have valid host names for all machines.
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
-
-Patch-Name: do-not-broadcast-with-hostnames.patch
----
- scheduler/conf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scheduler/conf.c b/scheduler/conf.c
-index bb4f9d215..b73d33f93 100644
---- a/scheduler/conf.c
-+++ b/scheduler/conf.c
-@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
-     cupsdAddAlias(ServerAlias, temp);
-     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
- 
--    if (HostNameLookups || RemotePort)
-+    if (HostNameLookups)
-     {
-       struct hostent	*host;		/* Host entry to get FQDN */
- 
diff --git a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
deleted file mode 100644
index e2126cdc8..000000000
--- a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 37869bd8f18d81325b189315c9b1949ba74253df Mon Sep 17 00:00:00 2001
-From: Tim Waugh 
-Date: Tue, 9 Aug 2016 18:11:07 +0200
-Subject: Fix jobs with multiple files or multiple formats
-
-Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
-Bug: https://www.cups.org/str.php?L4348
-Last-Updated: 2015-02-10
-Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
----
- backend/ipp.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/backend/ipp.c b/backend/ipp.c
-index 8226acc7b..5902dd6cb 100644
---- a/backend/ipp.c
-+++ b/backend/ipp.c
-@@ -1803,7 +1803,10 @@ main(int  argc,				/* I - Number of command-line args */
- 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
-         	      (i + 1) >= num_files);
- 
--	if (document_format)
-+	if (num_files > 1)
-+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
-+		       "document-format", NULL, "application/octet-stream");
-+	else if (document_format)
- 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
- 		       "document-format", NULL, document_format);
- 
diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch
deleted file mode 100644
index f335bbe4d..000000000
--- a/debian/patches/logfiles_adm_readable.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7ac113c693bddb95bac40bb945eb296969781c1d Mon Sep 17 00:00:00 2001
-From: Martin Pitt 
-Date: Tue, 9 Aug 2016 18:11:38 +0200
-Subject: Make log files readable to group "adm", if present.
-
-Bug-Ubuntu: https://launchpad.net/bugs/345953
-
-Last-Update: 2015-02-10
-Patch-Name: logfiles_adm_readable.patch
----
- scheduler/log.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/scheduler/log.c b/scheduler/log.c
-index cdb5437dc..d53d1401c 100644
---- a/scheduler/log.c
-+++ b/scheduler/log.c
-@@ -21,6 +21,7 @@
- #  include 
- #endif /* HAVE_ASL_H */
- #include 
-+#include 
- 
- 
- /*
-@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
- 		filename[1024],		/* Formatted log filename */
- 		*ptr;			/* Pointer into filename */
-   const char	*logptr;		/* Pointer into log filename */
-+  struct group  *loggrp;		/* Group entry of log filename */
- 
- 
-  /*
-@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
-     return (1);
-   }
- 
-+ /*
-+  * Use adm group if possible, fall back to Group
-+  */
-+ loggrp = getgrnam("adm");
-+
-  /*
-   * Format the filename as needed...
-   */
-@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
-       * Change ownership and permissions of non-device logs...
-       */
- 
--      fchown(cupsFileNumber(*lf), RunUser, Group);
-+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
-       fchmod(cupsFileNumber(*lf), LogFilePerm);
-     }
-   }
-@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
-     * Change ownership and permissions of non-device logs...
-     */
- 
--    fchown(cupsFileNumber(*lf), RunUser, Group);
-+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
-     fchmod(cupsFileNumber(*lf), LogFilePerm);
-   }
- 
diff --git a/debian/patches/man-cups-lpd-drop-dangling-references.patch b/debian/patches/man-cups-lpd-drop-dangling-references.patch
deleted file mode 100644
index e62ad8b0e..000000000
--- a/debian/patches/man-cups-lpd-drop-dangling-references.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e592e92ab6c05bb920898e5371c6ef246ae67e18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= 
-Date: Tue, 9 Aug 2016 18:11:48 +0200
-Subject: Drop dangling references from cups-lpd.man
-
-Bug-Debian: http://bugs.debian.org/570157
-Last-Update: 2015-10-02
-Patch-Name: man-cups-lpd-drop-dangling-references.patch
----
- man/cups-lpd.8 | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
-index 344d2af2b..e998df361 100644
---- a/man/cups-lpd.8
-+++ b/man/cups-lpd.8
-@@ -109,9 +109,7 @@ Simply enable the
- .B cups-lpd
- service using the corresponding control program.
- .SH SEE ALSO
--.BR cups (1),
- .BR cupsd (8),
--.BR inetconv (1m),
- .BR inetd (8),
- .BR launchd (8),
- .BR xinetd (8),
diff --git a/debian/patches/manpage-hyphen-minus.patch b/debian/patches/manpage-hyphen-minus.patch
deleted file mode 100644
index 1993a567e..000000000
--- a/debian/patches/manpage-hyphen-minus.patch
+++ /dev/null
@@ -1,574 +0,0 @@
-From df131bf9aa20180603b678a2daa39881164b725a Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:05 +0200
-Subject: Fix hyphen-used-as-minus-sign manpage errors
-
-Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
-Also fix a missing backslash escape
-
-Origin: vendor
-Bug-Upstream: https://cups.org/str.php?L4299
-Last-Update: 2015-02-10
-
-Patch-Name: manpage-hyphen-minus.patch
----
- man/backend.7         |  4 ++--
- man/client.conf.5     |  4 ++--
- man/cups-files.conf.5 |  2 +-
- man/cups-lpd.8        |  6 +++---
- man/cups-snmp.conf.5  |  2 +-
- man/cups.1            |  2 +-
- man/cupsctl.8         |  6 +++---
- man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
- man/cupsd.conf.5      |  2 +-
- man/cupsfilter.8      |  2 +-
- man/filter.7          |  2 +-
- man/ippeveprinter.1   |  6 +++---
- man/ippfind.1         |  6 +++---
- man/ipptoolfile.5     |  8 ++++----
- man/lp.1              | 12 ++++++------
- man/lpadmin.8         |  6 +++---
- man/lpoptions.1       |  4 ++--
- man/lpr.1             |  8 ++++----
- man/mime.convs.5      |  6 +++---
- man/mime.types.5      |  4 ++--
- man/ppdc.1            |  2 +-
- 21 files changed, 65 insertions(+), 65 deletions(-)
-
-diff --git a/man/backend.7 b/man/backend.7
-index 5a7032650..3c426310c 100644
---- a/man/backend.7
-+++ b/man/backend.7
-@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
- .TP 5
- .B CUPS_BACKEND_RETRY
- The print file was not successfully transmitted because of a temporary issue.
--The scheduler will retry the job at a future time - other jobs may print before this one.
-+The scheduler will retry the job at a future time \- other jobs may print before this one.
- .TP 5
- .B CUPS_BACKEND_RETRY_CURRENT
- The print file was not successfully transmitted because of a temporary issue.
-@@ -198,7 +198,7 @@ or
- programs to send print jobs or
- .BR lpinfo (8)
- to query for available printers using the backend.
--The one exception is the SNMP backend - see
-+The one exception is the SNMP backend \- see
- .BR cups-snmp (8)
- for more information.
- .SH NOTES
-diff --git a/man/client.conf.5 b/man/client.conf.5
-index 8805561db..92f1d9575 100644
---- a/man/client.conf.5
-+++ b/man/client.conf.5
-@@ -64,7 +64,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
- The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
- The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
- The \fIDenyCBC\fR option disables all CBC cipher suites.
--The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
-+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
- The \fIMinTLS\fR options set the minimum TLS version to support.
- The \fIMaxTLS\fR options set the maximum TLS version to support.
- Not all operating systems support TLS 1.3 at this time.
-@@ -114,7 +114,7 @@ Configuration settings can instead be viewed or changed using the
- command:
- .nf
- defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
--defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
-+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
- 
- defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
- .fi
-diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
-index b451e2f92..72494065c 100644
---- a/man/cups-files.conf.5
-+++ b/man/cups-files.conf.5
-@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
- \fBFileDevice No\fR
- Specifies whether the file pseudo-device can be used for new printer queues.
- The URI "file:///dev/null" is always allowed.
--File devices cannot be used with "raw" print queues - a PPD file is required.
-+File devices cannot be used with "raw" print queues \- a PPD file is required.
- The specified file is overwritten for every print job.
- Writing to directories is not supported.
- .\"#FontPath
-diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
-index e8ce3251f..344d2af2b 100644
---- a/man/cups-lpd.8
-+++ b/man/cups-lpd.8
-@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
- [
- \fB\-h \fIhostname\fR[\fB:\fIport\fR]
- ] [
--.B -n
-+.B \-n
- ] [
--.B -o
-+.B \-o
- .I option=value
- ]
- .SH DESCRIPTION
-@@ -34,7 +34,7 @@ and
- \fB-h \fIhostname\fR[\fB:\fIport\fR]
- Sets the CUPS server (and port) to use.
- .TP 5
--.B -n
-+.B \-n
- Disables reverse address lookups; normally
- .B cups-lpd
- will try to discover the hostname of the client via a reverse DNS lookup.
-diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
-index 4ca20f24f..bb77c7342 100644
---- a/man/cups-snmp.conf.5
-+++ b/man/cups-snmp.conf.5
-@@ -16,7 +16,7 @@ The
- file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
- Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
- .LP
--The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
-+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
- .BR cups-snmp (8).
- .SH DIRECTIVES
- The following directives are understood by the CUPS network backends:
-diff --git a/man/cups.1 b/man/cups.1
-index 706620d7c..b0c51a738 100644
---- a/man/cups.1
-+++ b/man/cups.1
-@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
- .LP
- When you are asked for a username and password, enter your login username and password or the "root" username and password.
- .LP
--After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
-+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
- .LP
- Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
- .LP
-diff --git a/man/cupsctl.8 b/man/cupsctl.8
-index 791954c19..c88eb22ec 100644
---- a/man/cupsctl.8
-+++ b/man/cupsctl.8
-@@ -73,19 +73,19 @@ Display the current settings:
- Enable debug logging:
- .nf
- 
--    cupsctl --debug-logging
-+    cupsctl \--debug-logging
- 
- .fi
- Get the current debug logging state:
- .nf
- 
--    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
-+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
- 
- .fi
- Disable printer sharing:
- .nf
- 
--    cupsctl --no-share-printers
-+    cupsctl \--no-share-printers
- .fi
- .SH KNOWN ISSUES
- You cannot set the Listen or Port directives using \fBcupsctl\fR.
-diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
-index 2070be9a5..a912c4693 100644
---- a/man/cupsd-logs.5
-+++ b/man/cupsd-logs.5
-@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
- For example:
- .nf
- 
--    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
-+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
-       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
--    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
--      200 0 - -
--    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-+      200 0 \- \-
-+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-       200 157 CUPS-Get-Printers
-       successful-ok-ignored-or-substituted-attributes
--    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
--      200 1411 CUPS-Get-Devices -
--    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
--      200 6667 - -
-+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-+      200 1411 CUPS-Get-Devices \-
-+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-+      200 6667 \- \-
- 
- .fi
- The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
- .LP
--The \fIgroup\fR field always contains "-".
-+The \fIgroup\fR field always contains "\-".
- .LP
- The \fIuser\fR field is the authenticated username of the requesting user.
--If no username and password is supplied for the request then this field contains "-".
-+If no username and password is supplied for the request then this field contains "\-".
- .LP
- The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
- .LP
-@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
- Upgrading to TLS-encrypted connection.
- .TP 5
- 500
--Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
-+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
- .TP 5
- 501
- The client requested encryption but encryption support is not enabled/compiled in.
-@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
- The \fIbytes\fR field contains the number of bytes in the request.
- For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
- .LP
--The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
-+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
- .LP
--The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
-+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
- .SS ERROR LOG FILE FORMAT
--The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
-+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
- .BR cupsd.conf (5)
- file controls which messages are logged:
- .nf
-@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
- .LP
- The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
- .LP
--The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
-+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
- .LP
- The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
- .LP
--The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
-+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
- .LP
--The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
-+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
- .LP
--The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
-+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
- .SH SEE ALSO
- .BR cupsd (8),
- .BR cupsd.conf (5),
-diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
-index 00b1a22d6..49fdb06b1 100644
---- a/man/cupsd.conf.5
-+++ b/man/cupsd.conf.5
-@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
- The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
- The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
- The \fIDenyCBC\fR option disables all CBC cipher suites.
--The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
-+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
- The \fIMinTLS\fR options set the minimum TLS version to support.
- The \fIMaxTLS\fR options set the maximum TLS version to support.
- Not all operating systems support TLS 1.3 at this time.
-diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
-index c655c21c0..fe4c5a2cf 100644
---- a/man/cupsfilter.8
-+++ b/man/cupsfilter.8
-@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
- The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
- .nf
- 
--    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
-+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
- .fi
- .SH SEE ALSO
- .BR cups (1),
-diff --git a/man/filter.7 b/man/filter.7
-index dbc3150c8..8cb79bbf9 100644
---- a/man/filter.7
-+++ b/man/filter.7
-@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
- .TP 5
- \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
- .TP 5
--\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
-+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
- Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
- .TP 5
- \fBWARNING:\fI message\fR
-diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
-index 5753c69da..2fcda8b9f 100644
---- a/man/ippeveprinter.1
-+++ b/man/ippeveprinter.1
-@@ -129,8 +129,8 @@ If "command" is not an absolute path ("/path/to/command"),
- looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
- The
- .BR cups-config (1)
--command can be used to discover the correct binary directory ("cups-config --serverbin").
--In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
-+command can be used to discover the correct binary directory ("cups-config \--serverbin").
-+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
- .BR cups (1)
- man page for more details.
- .TP 5
-@@ -227,7 +227,7 @@ Logs an informational/progress message if \-v has been specified and copies the
- \fBSTATE: \fIkeyword[,keyword,...]\fR
- Sets the printer's "printer-state-reasons" attribute to the listed keywords.
- .TP 5
--\fBSTATE: -\fIkeyword[,keyword,...]\fR
-+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
- Removes the listed keywords from the printer's "printer-state-reasons" attribute.
- .TP 5
- \fBSTATE: +\fIkeyword[,keyword,...]\fR
-diff --git a/man/ippfind.1 b/man/ippfind.1
-index 32f2e6f8b..d77ef75cc 100644
---- a/man/ippfind.1
-+++ b/man/ippfind.1
-@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
- .B \-l
- .TP 5
- .B \-\-ls
--Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
-+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
- The result is true if the URI is accessible, false otherwise.
- .TP 5
- .B \-\-local
-@@ -108,7 +108,7 @@ The result is always true.
- .B \-q
- .TP 5
- .B \-\-quiet
--Quiet mode - just returns the exit codes below.
-+Quiet mode \- just returns the exit codes below.
- .TP 5
- .B \-r
- .TP 5
-@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
- .TP 5
- \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
- Executes the specified program if the current result is true.
--"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
-+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
- .PP
- Expressions may also contain modifiers:
- .TP 5
-diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
-index 700101773..576323291 100644
---- a/man/ipptoolfile.5
-+++ b/man/ipptoolfile.5
-@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
- \fBATTR \fItag attribute-name value(s)\fR
- Adds an attribute to the test request.
- Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
--Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
--Common attributes and values are listed in the IANA IPP registry - see references below.
-+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
-+Common attributes and values are listed in the IANA IPP registry \- see references below.
- .TP 5
- \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
- Adds a collection attribute to the test request.
-@@ -194,7 +194,7 @@ test report.
- \fBEXPECT ?\fIattribute-name predicate(s)\fR
- .TP 5
- \fBEXPECT !\fIattribute-name\fR
--Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
-+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
- .TP 5
- \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
- .TP 5
-@@ -246,7 +246,7 @@ Specifies whether
- will skip the current test if the previous test resulted in an error/failure.
- .TP 5
- \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
--Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
-+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
- .TP 5
- \fBTEST\-ID "\fIidentifier\fR"
- Specifies an identifier string for the current test.
-diff --git a/man/lp.1 b/man/lp.1
-index cbea3b840..839a48278 100644
---- a/man/lp.1
-+++ b/man/lp.1
-@@ -83,7 +83,7 @@ lp \- print files
- ]
- .SH DESCRIPTION
- \fBlp\fR submits files for printing or alters a pending job.
--Use a filename of "-" to force printing from the standard input.
-+Use a filename of "\-" to force printing from the standard input.
- .SS THE DEFAULT DESTINATION
- CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
- If neither are set, the current default set using the
-@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
- \fB\-P \fIpage-list\fR
- Specifies which pages to print in the document.
- The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
--The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
-+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
- .SS COMMON JOB OPTIONS
- Aside from the printer-specific options reported by the
- .BR lpoptions (1)
-@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
- \fB\-o print\-quality=4\fR
- .TP 5
- \fB\-o print\-quality=5\fR
--Specifies the output quality - draft (3), normal (4), or best (5).
-+Specifies the output quality \- draft (3), normal (4), or best (5).
- .TP 5
- \fB\-o sides=one\-sided\fR
- Prints on one side of the paper.
-@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
- Print two copies of a document to the default printer:
- .nf
- 
--    lp -n 2 filename
-+    lp \-n 2 filename
- 
- .fi
- Print a double-sided legal document to a printer called "foo":
- .nf
- 
--    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
-+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
- 
- .fi
- Print a presentation document 2-up to a printer called "bar":
- .nf
- 
--    lp -d bar -o number-up=2 filename
-+    lp \-d bar \-o number-up=2 filename
- .fi
- .SH SEE ALSO
- .BR cancel (1),
-diff --git a/man/lpadmin.8 b/man/lpadmin.8
-index 1b8c91ba4..ce6a698ff 100644
---- a/man/lpadmin.8
-+++ b/man/lpadmin.8
-@@ -120,7 +120,7 @@ command.
- .TP 5
- \fB\-o \fIname\fB-default=\fIvalue\fR
- Sets a default server-side option for the destination.
--Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
-+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
- .TP 5
- \fB\-o port\-monitor=\fIname\fR
- Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
-@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
- Sets user-level access control on a destination.
- Names starting with "@" are interpreted as UNIX groups.
- The latter two forms turn user-level access control off.
--Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
-+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
- .TP 5
- \fB\-v "\fIdevice-uri\fB"\fR
- Sets the \fIdevice-uri\fR attribute of the printer queue.
-@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
- Create an IPP Everywhere print queue:
- .nf
- 
--    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
-+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
- 
- .fi
- .SH SEE ALSO
-diff --git a/man/lpoptions.1 b/man/lpoptions.1
-index a34fd01dc..7550d9afb 100644
---- a/man/lpoptions.1
-+++ b/man/lpoptions.1
-@@ -102,9 +102,9 @@ Destinations can only be removed using the
- .BR lpadmin (8)
- command.
- .SH FILES
--\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
-+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
- .br
--\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
-+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
- .SH CONFORMING TO
- The \fBlpoptions\fR command is unique to CUPS.
- .SH SEE ALSO
-diff --git a/man/lpr.1 b/man/lpr.1
-index f367cd97c..635d126d6 100644
---- a/man/lpr.1
-+++ b/man/lpr.1
-@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
- \fB\-o print\-quality=4\fR
- .TP 5
- \fB\-o print\-quality=5\fR
--Specifies the output quality - draft (3), normal (4), or best (5).
-+Specifies the output quality \- draft (3), normal (4), or best (5).
- .TP 5
- \fB\-o sides=one\-sided\fR
- Prints on one side of the paper.
-@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
- Print two copies of a document to the default printer:
- .nf
- 
--    lpr -# 2 filename
-+    lpr \-# 2 filename
- 
- .fi
- Print a double-sided legal document to a printer called "foo":
- .nf
- 
--    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
-+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
- 
- .fi
- Print a presentation document 2-up to a printer called "foo":
- .nf
- 
--    lpr -P foo -o number-up=2 filename
-+    lpr \-P foo \-o number-up=2 filename
- .fi
- .SH SEE ALSO
- .BR cancel (1),
-diff --git a/man/mime.convs.5 b/man/mime.convs.5
-index 25a6f7653..04ba39494 100644
---- a/man/mime.convs.5
-+++ b/man/mime.convs.5
-@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
- The \fIfilter\fR field specifies the filter program filename.
- Filenames are relative to the CUPS filter directory.
- .SH FILES
--\fI/etc/cups\fR - Typical CUPS configuration directory.
-+\fI/etc/cups\fR \- Typical CUPS configuration directory.
- .br
--\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
-+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
- .br
--\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
-+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
- .SH EXAMPLES
- Define a filter that converts PostScript documents to CUPS Raster format:
- .nf
-diff --git a/man/mime.types.5 b/man/mime.types.5
-index 7e83de16a..3572726f5 100644
---- a/man/mime.types.5
-+++ b/man/mime.types.5
-@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
- .LP
- The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
- .SS RULES
--Rules take two forms - a filename extension by itself and functions with test
-+Rules take two forms \- a filename extension by itself and functions with test
- values inside parenthesis.
- The following functions are available:
- .TP 5
-@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
- alphanumerically smaller than "text/foo".
- However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
- .SH FILES
--\fI/etc/cups\fR - Typical CUPS configuration directory.
-+\fI/etc/cups\fR \- Typical CUPS configuration directory.
- .SH EXAMPLES
- Define two MIME media types for raster data, with one being a subset with higher priority:
- .nf
-diff --git a/man/ppdc.1 b/man/ppdc.1
-index 44e9d2448..38e266978 100644
---- a/man/ppdc.1
-+++ b/man/ppdc.1
-@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
- \fB\-\-crlf\fR
- .TP 5
- \fB\-\-lf\fR
--Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
-+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
- The default is to use the line feed character alone.
- .SH NOTES
- PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch
deleted file mode 100644
index f0ef0fcff..000000000
--- a/debian/patches/manpage-translations.patch
+++ /dev/null
@@ -1,344 +0,0 @@
-From 28d60c4020cb2d40bfe203f3a25e5ea529a56c24 Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:50 +0200
-Subject: po4a infrastructure and translations for manpages.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Author: Nicolas François , Helge Kreutzmann 
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/478597
-
-Patch-Name: manpage-translations.patch
----
- man/Makefile      |  17 +++-
- man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++
- man/de/Makefile   |   7 ++
- man/fr/Makefile   |   7 ++
- 4 files changed, 264 insertions(+), 2 deletions(-)
- create mode 100644 man/Makefile.l10n
- create mode 100644 man/de/Makefile
- create mode 100644 man/fr/Makefile
-
-diff --git a/man/Makefile b/man/Makefile
-index e01591a93..48f06c48a 100644
---- a/man/Makefile
-+++ b/man/Makefile
-@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
- 		lpmove.8 \
- 		lpc.8
- 
-+LANGUAGES=de fr
- 
- #
- # Make everything...
- #
- 
--all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
-+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
-+
-+translations:
-+	# Update the translations and build the translated material
-+	po4a --previous ../debian/manpage-po4a/cups.cfg
-+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
- 
- 
- #
-@@ -91,6 +97,12 @@ unittests:
- 
- clean:
- 	$(RM) mantohtml mantohtml.o
-+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
-+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
-+	# Make sure the PO files are updated and remove generated
-+	# translations.
-+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
-+	$(RM) ../debian/manpage-po4a/po/cups.pot
- 
- 
- #
-@@ -142,6 +154,7 @@ install-data: all
- 		$(RM) $(MANDIR)/man8/$$file; \
- 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
- 	done
-+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
- 
- 
- #
-@@ -189,7 +202,7 @@ uninstall:
- 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
- 		$(RM) $(MANDIR)/man8/$$file; \
- 	done
--	-$(RMDIR) $(MANDIR)/man8
-+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
- 
- 
- #
-diff --git a/man/Makefile.l10n b/man/Makefile.l10n
-new file mode 100644
-index 000000000..08390f5dc
---- /dev/null
-+++ b/man/Makefile.l10n
-@@ -0,0 +1,235 @@
-+#
-+# Man page makefile for CUPS.
-+#
-+# Copyright © 2007-2019 by Apple Inc.
-+# Copyright © 1993-2006 by Easy Software Products.
-+#
-+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
-+# information.
-+#
-+
-+include ../../Makedefs
-+
-+
-+#
-+# Man pages...
-+#
-+
-+MAN1	=	cancel.1 \
-+		cups.1 \
-+		cups-config.1 \
-+		cupstestppd.1 \
-+		ippeveprinter.1 \
-+		$(IPPFIND_MAN) \
-+		ipptool.1 \
-+		lp.1 \
-+		lpoptions.1 \
-+		lpq.1 \
-+		lprm.1 \
-+		lpr.1 \
-+		lpstat.1 \
-+		ppdc.1 \
-+		ppdhtml.1 \
-+		ppdi.1 \
-+		ppdmerge.1 \
-+		ppdpo.1
-+MAN5	=	classes.conf.5 \
-+		client.conf.5 \
-+		cups-files.conf.5 \
-+		cups-snmp.conf.5 \
-+		cupsd.conf.5 \
-+		cupsd-logs.5 \
-+		ipptoolfile.5 \
-+		mailto.conf.5 \
-+		mime.convs.5 \
-+		mime.types.5 \
-+		ppdcfile.5 \
-+		printers.conf.5 \
-+		subscriptions.conf.5
-+MAN7	=	backend.7 \
-+		filter.7 \
-+		ippevepcl.7 \
-+		notifier.7
-+MAN8	=	cupsaccept.8 \
-+		cupsctl.8 \
-+		cupsfilter.8 \
-+		cups-lpd.8 \
-+		cups-snmp.8 \
-+		cupsd.8 \
-+		cupsd-helper.8 \
-+		cupsenable.8 \
-+		lpadmin.8 \
-+		lpinfo.8 \
-+		lpmove.8 \
-+		lpc.8
-+
-+
-+#
-+# Make everything...
-+#
-+
-+# Debian-specific patch: Just assume all files are here.
-+all:
-+
-+
-+#
-+# Make library targets...
-+#
-+
-+libs:
-+
-+
-+#
-+# Make unit tests...
-+#
-+
-+unittests:
-+
-+
-+#
-+# Clean all config and object files...
-+#
-+
-+clean:
-+	$(RM) mantohtml mantohtml.o
-+
-+
-+#
-+# Dummy depend target...
-+#
-+
-+depend:
-+
-+
-+#
-+# Install all targets...
-+#
-+
-+# Debian-specific patch: directory-based language namespace
-+MANDIR := $(MANDIR)/$(LANGUAGE)
-+
-+install:	all install-data install-headers install-libs install-exec
-+
-+
-+#
-+# Install data files...
-+#
-+
-+# Debian-specific patch: skip if doesn't exist
-+install-data: all
-+	echo Installing man pages in $(MANDIR)/man1...
-+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
-+	for file in $(MAN1); do \
-+		[ ! -r $$file ] || \
-+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
-+	done
-+	echo Installing man pages in $(MANDIR)/man5...
-+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
-+	for file in $(MAN5); do \
-+		[ ! -r $$file ] || \
-+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
-+	done
-+	echo Installing man pages in $(MANDIR)/man7...
-+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
-+	for file in $(MAN7); do \
-+		[ ! -r $$file ] || \
-+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
-+	done
-+	$(RM) $(MANDIR)/man7/ippeveps.7
-+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
-+	echo Installing man pages in $(MANDIR)/man8...
-+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
-+	for file in $(MAN8); do \
-+		[ ! -r $$file ] || \
-+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
-+	done
-+	$(RM) $(MANDIR)/man8/cupsdisable.8
-+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
-+	$(RM) $(MANDIR)/man8/cupsreject.8
-+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
-+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
-+		$(RM) $(MANDIR)/man8/$$file; \
-+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
-+	done
-+
-+
-+#
-+# Install programs...
-+#
-+
-+install-exec:
-+
-+
-+#
-+# Install headers...
-+#
-+
-+install-headers:
-+
-+
-+#
-+# Install libraries...
-+#
-+
-+install-libs:
-+
-+
-+#
-+# Uninstall files...
-+#
-+
-+uninstall:
-+	echo Uninstalling man pages from $(MANDIR)/man1...
-+	for file in $(MAN1); do \
-+		$(RM) $(MANDIR)/man1/$$file; \
-+	done
-+	-$(RMDIR) $(MANDIR)/man1
-+	echo Uninstalling man pages from $(MANDIR)/man5...
-+	for file in $(MAN5); do \
-+		$(RM) $(MANDIR)/man5/$$file; \
-+	done
-+	-$(RMDIR) $(MANDIR)/man5
-+	echo Uninstalling man pages from $(MANDIR)/man7...
-+	for file in $(MAN7) ippeveps.7; do \
-+		$(RM) $(MANDIR)/man7/$$file; \
-+	done
-+	-$(RMDIR) $(MANDIR)/man7
-+	echo Uninstalling man pages from $(MANDIR)/man8...
-+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
-+		$(RM) $(MANDIR)/man8/$$file; \
-+	done
-+	-$(RMDIR) $(MANDIR)/man8
-+
-+
-+#
-+# Local programs (not built when cross-compiling...)
-+#
-+
-+local:	html
-+
-+
-+#
-+# Make html versions of man pages...
-+#
-+
-+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
-+	echo Converting man pages to HTML...
-+	for file in $(MAN1); do \
-+		echo "    $$file..."; \
-+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
-+	done
-+	for file in $(MAN5); do \
-+		echo "    $$file..."; \
-+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
-+	done
-+	for file in $(MAN7); do \
-+		echo "    $$file..."; \
-+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
-+	done
-+	for file in $(MAN8); do \
-+		echo "    $$file..."; \
-+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
-+	done
-+
-+mantohtml:	mantohtml.c
-+	$(CC_FOR_BUILD) -o $@ $<
-diff --git a/man/de/Makefile b/man/de/Makefile
-new file mode 100644
-index 000000000..7c237840e
---- /dev/null
-+++ b/man/de/Makefile
-@@ -0,0 +1,7 @@
-+#
-+#   Man page makefile for the Common UNIX Printing System (CUPS).
-+#
-+
-+LANGUAGE=de
-+
-+include ../Makefile.l10n
-diff --git a/man/fr/Makefile b/man/fr/Makefile
-new file mode 100644
-index 000000000..6a50e9348
---- /dev/null
-+++ b/man/fr/Makefile
-@@ -0,0 +1,7 @@
-+#
-+#   Man page makefile for the Common UNIX Printing System (CUPS).
-+#
-+
-+LANGUAGE=fr
-+
-+include ../Makefile.l10n
diff --git a/debian/patches/move-cupsd-conf-default-to-share.patch b/debian/patches/move-cupsd-conf-default-to-share.patch
deleted file mode 100644
index 505d7fd22..000000000
--- a/debian/patches/move-cupsd-conf-default-to-share.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 07f2a4581effba6b7ee88cc89ca15c679d5155db Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:24 +0200
-Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
-
-Origin: vendor
-Bug: https://cups.org/str.php?L4342
-Bug-Debian: http://bugs.debian.org/640124
-Last-Update: 2015-02-10
-
-Patch-Name: move-cupsd-conf-default-to-share.patch
----
- cgi-bin/admin.c | 6 +++++-
- conf/Makefile   | 5 +++--
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
-index f087809f7..6e9a64a7c 100644
---- a/cgi-bin/admin.c
-+++ b/cgi-bin/admin.c
-@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
-     int		ch;			/* Character from file */
-     char	filename[1024];		/* Filename */
-     const char	*server_root;		/* Location of config files */
-+    const char	*data_dir;		/* Location of data files */
- 
- 
-    /*
-@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
-     * well...
-     */
- 
--    strlcat(filename, ".default", sizeof(filename));
-+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
-+      data_dir = CUPS_DATADIR;
-+
-+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
- 
-     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
-         (cupsd = cupsFileOpen(filename, "r")) != NULL)
-diff --git a/conf/Makefile b/conf/Makefile
-index e249e6069..42a123f75 100644
---- a/conf/Makefile
-+++ b/conf/Makefile
-@@ -70,7 +70,7 @@ install-data:
- 		else \
- 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
- 		fi ; \
--		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
-+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
- 	done
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
- 	for file in $(REPLACE); do \
-@@ -118,9 +118,10 @@ install-libs:
- #
- 
- uninstall:
--	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
-+	for file in $(KEEP) $(REPLACE); do \
- 		$(RM) $(SERVERROOT)/$$file; \
- 	done
-+	$(RM) $(DATADIR)/cupsd.conf.default
- 	-$(RMDIR) $(SERVERROOT)
- 	for file in $(REPLACE); do \
- 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/no-conffile-timestamp.patch b/debian/patches/no-conffile-timestamp.patch
deleted file mode 100644
index 60be402ba..000000000
--- a/debian/patches/no-conffile-timestamp.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 1adcbd790f2a304c91a674520d3e50d83e9ddca8 Mon Sep 17 00:00:00 2001
-From: Joey Hess 
-Date: Tue, 9 Aug 2016 18:11:31 +0200
-Subject: Disable time stamps in conffiles, to avoid ever-changing files in
- /etc.
-
-Bug: https://github.com/apple/cups/issues/3067
-Bug-Debian: https://bugs.debian.org/549673
-
-Patch-Name: no-conffile-timestamp.patch
----
- scheduler/classes.c       | 2 +-
- scheduler/job.c           | 2 +-
- scheduler/printers.c      | 2 +-
- scheduler/subscriptions.c | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/scheduler/classes.c b/scheduler/classes.c
-index 776e79a91..ec6357ffe 100644
---- a/scheduler/classes.c
-+++ b/scheduler/classes.c
-@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
-   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
- 
-   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
--  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
-+  cupsFilePrintf(fp, "# Written by cupsd\n");
-   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
- 
-  /*
-diff --git a/scheduler/job.c b/scheduler/job.c
-index 515fc8b5e..9c197efc9 100644
---- a/scheduler/job.c
-+++ b/scheduler/job.c
-@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
-   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
- 
-   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
--  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
-+  cupsFilePrintf(fp, "# Written by cupsd\n");
-   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
- 
-  /*
-diff --git a/scheduler/printers.c b/scheduler/printers.c
-index b366bf588..10ae91234 100644
---- a/scheduler/printers.c
-+++ b/scheduler/printers.c
-@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
-   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
- 
-   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
--  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
-+  cupsFilePrintf(fp, "# Written by cupsd\n");
-   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
- 
-   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
-diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
-index 3267a2ff6..2542ab148 100644
---- a/scheduler/subscriptions.c
-+++ b/scheduler/subscriptions.c
-@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
-   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
- 
-   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
--  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
-+  cupsFilePrintf(fp, "# Written by cupsd\n");
- 
-   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
- 
diff --git a/debian/patches/pwg-raster-attributes.patch b/debian/patches/pwg-raster-attributes.patch
deleted file mode 100644
index 8d3592262..000000000
--- a/debian/patches/pwg-raster-attributes.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 4b15ee733bb3f40197333f8fbad1eef6a1142109 Mon Sep 17 00:00:00 2001
-From: Till Kamppeter 
-Date: Tue, 9 Aug 2016 18:11:04 +0200
-Subject: For PWG Raster, add required IPP attributes
-
-Add required by IPP Everywhere for PWG Raster when PWG Raster as input format
-is supported
-
-Bug-Upstream: https://www.cups.org/str.php?L4428
-Last-Update: 2015-02-10
-Patch-Name: pwg-raster-attributes.patch
----
- scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 76 insertions(+), 1 deletion(-)
-
-diff --git a/scheduler/printers.c b/scheduler/printers.c
-index 75ef4c0d2..542523760 100644
---- a/scheduler/printers.c
-+++ b/scheduler/printers.c
-@@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
-   cupsd_location_t *auth;		/* Pointer to authentication element */
-   const char	*auth_supported;	/* Authentication supported */
-   ipp_t		*oldattrs;		/* Old printer attributes */
--  ipp_attribute_t *attr;		/* Attribute data */
-+  ipp_attribute_t *attr, *attr2;	/* Attribute data */
-   char		*name,			/* Current user/group name */
- 		*filter;		/* Current filter */
-+  mime_type_t   *type;
- 
- 
-  /*
-@@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
- 
-   add_printer_formats(p);
- 
-+  /* 
-+   * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input
-+   * is supported
-+   */
-+  for (type = (mime_type_t *)cupsArrayFirst(p->filetypes);
-+       type;
-+       type = (mime_type_t *)cupsArrayNext(p->filetypes))
-+  {
-+    if (!_cups_strcasecmp(type->super, "image"))
-+    {
-+      if (!_cups_strcasecmp(type->type, "pwg-raster"))
-+      {
-+	if (p->ppd_attrs != NULL &&
-+	    (attr = ippFindAttribute(p->ppd_attrs,
-+				     "printer-resolution-supported",
-+				     IPP_TAG_ZERO)) != NULL)
-+	{
-+	  attr2 = ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
-+				    "pwg-raster-document-resolution-supported",
-+				    attr->num_values, IPP_RES_PER_INCH,
-+				    NULL, NULL);
-+	  for (i = 0; i < attr->num_values; i ++)
-+	  {
-+	    attr2->values[i].resolution.xres =
-+	      attr->values[i].resolution.xres;
-+	    attr2->values[i].resolution.yres =
-+	      attr->values[i].resolution.yres;
-+	    attr2->values[i].resolution.units = IPP_RES_PER_INCH;
-+	  }
-+	}
-+	else
-+	{
-+	  static const int	pwg_raster_document_resolution_supported[] =
-+	  {
-+	    300,
-+	    600,
-+	    1200
-+	  };
-+	  ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
-+			    "pwg-raster-document-resolution-supported",
-+			    (int)(sizeof(pwg_raster_document_resolution_supported) /
-+				  sizeof(pwg_raster_document_resolution_supported[0])),
-+			    IPP_RES_PER_INCH,
-+			    pwg_raster_document_resolution_supported,
-+			    pwg_raster_document_resolution_supported);
-+	}
-+	ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
-+		     "pwg-raster-document-sheet-back", NULL, "normal");
-+	static const char * const pwg_raster_document_type_supported[] =
-+	{
-+	  "adobergb-8",
-+	  "adobergb-16",
-+	  "black-1",
-+	  "black-8",
-+	  "black-16",
-+	  "cmyk-8",
-+	  "cmyk-16",
-+	  "rgb-8",
-+	  "rgb-16",
-+	  "sgray-1",
-+	  "sgray-8",
-+	  "sgray-16",
-+	  "srgb-8",
-+	  "srgb-16"
-+	};
-+	ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
-+		      "pwg-raster-document-type-supported",
-+		      (int)(sizeof(pwg_raster_document_type_supported) /
-+			    sizeof(pwg_raster_document_type_supported[0])), NULL,
-+		      pwg_raster_document_type_supported);
-+      }
-+    }
-+  }
-+
-  /*
-   * Add name-default attributes...
-   */
diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch
deleted file mode 100644
index e4f0e402c..000000000
--- a/debian/patches/reactivate_recommended_driver.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1118aeef013fa7864534de69b699210598915cc2 Mon Sep 17 00:00:00 2001
-From: Till Kampetter 
-Date: Tue, 9 Aug 2016 18:11:36 +0200
-Subject: CUPS removes the "(recommended)" comments of the NickNames of
- Foomatic PPDs when listing available PPDs. This patch removes this removal
- action.
-
-Last-Update: 2015-02-10
-
-Patch-Name: reactivate_recommended_driver.patch
----
- scheduler/cups-driverd.cxx | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
-index 85516eb8c..874eb3c07 100644
---- a/scheduler/cups-driverd.cxx
-+++ b/scheduler/cups-driverd.cxx
-@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
- 	const char *scheme)		/* I - PPD scheme */
- {
-   ppd_info_t	*ppd;			/* PPD */
--  char		*recommended;		/* Foomatic driver string */
- 
- 
-  /*
-@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
-   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
-   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
- 
-- /*
--  * Strip confusing (and often wrong) "recommended" suffix added by
--  * Foomatic drivers...
--  */
--
--  if ((recommended = strstr(ppd->record.make_and_model,
--                            " (recommended)")) != NULL)
--    *recommended = '\0';
--
-  /*
-   * Add the PPD to the PPD arrays...
-   */
diff --git a/debian/patches/removecvstag.patch b/debian/patches/removecvstag.patch
deleted file mode 100644
index 8335fdea1..000000000
--- a/debian/patches/removecvstag.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e9de51045546ba63ef57979ddbe88e865c2ced26 Mon Sep 17 00:00:00 2001
-From: Kenshi Muto 
-Date: Tue, 9 Aug 2016 18:11:33 +0200
-Subject: Do not write VCS tags into installed conffiles
-
-Bug: http://www.cups.org/str.php?L2369
-Origin: vendor
-Author: Didier Raboud 
-Last-Update: 2014-01-16
-
-Patch-Name: removecvstag.patch
----
- conf/Makefile | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/conf/Makefile b/conf/Makefile
-index 42a123f75..db0060d75 100644
---- a/conf/Makefile
-+++ b/conf/Makefile
-@@ -69,8 +69,12 @@ install-data:
- 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
- 		else \
- 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
-+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
-+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
- 		fi ; \
- 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
-+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
-+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
- 	done
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
- 	for file in $(REPLACE); do \
diff --git a/debian/patches/rename-systemd-units.patch b/debian/patches/rename-systemd-units.patch
deleted file mode 100644
index f15f320bf..000000000
--- a/debian/patches/rename-systemd-units.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c347ff881f6abdc44b7aeeb03170a16dec777aae Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:34 +0200
-Subject: Rename the systemd service file from org.cups.cups.* to cups.*
-
-Patch-Name: rename-systemd-units.patch
----
- scheduler/org.cups.cups-lpd.socket  | 2 +-
- scheduler/org.cups.cupsd.path.in    | 2 +-
- scheduler/org.cups.cupsd.service.in | 2 +-
- scheduler/org.cups.cupsd.socket.in  | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
-index ed23f9dfd..eb8445905 100644
---- a/scheduler/org.cups.cups-lpd.socket
-+++ b/scheduler/org.cups.cups-lpd.socket
-@@ -1,6 +1,6 @@
- [Unit]
- Description=CUPS LPD Server Socket
--PartOf=org.cups.cups-lpd.service
-+PartOf=cups-lpd.service
- 
- [Socket]
- ListenStream=515
-diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
-index 0f1cc46f2..7c8509fa6 100644
---- a/scheduler/org.cups.cupsd.path.in
-+++ b/scheduler/org.cups.cupsd.path.in
-@@ -1,6 +1,6 @@
- [Unit]
- Description=CUPS Scheduler
--PartOf=org.cups.cupsd.service
-+PartOf=cups.service
- 
- [Path]
- PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
-diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
-index 5273762fb..cd2334396 100644
---- a/scheduler/org.cups.cupsd.service.in
-+++ b/scheduler/org.cups.cupsd.service.in
-@@ -9,5 +9,5 @@ Type=simple
- Restart=on-failure
- 
- [Install]
--Also=org.cups.cupsd.socket org.cups.cupsd.path
-+Also=cups.socket cups.path
- WantedBy=printer.target
-diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
-index 613b977a6..3c37d7213 100644
---- a/scheduler/org.cups.cupsd.socket.in
-+++ b/scheduler/org.cups.cupsd.socket.in
-@@ -1,6 +1,6 @@
- [Unit]
- Description=CUPS Scheduler
--PartOf=org.cups.cupsd.service
-+PartOf=cups.service
- 
- [Socket]
- ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 72e9ce168..000000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,33 +0,0 @@
-pwg-raster-attributes.patch
-manpage-hyphen-minus.patch
-0003-Install-root-backends-world-readable.patch
-fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
-tests-ignore-warnings.patch
-tests-ignore-usb-crash.patch
-tests-ignore-kfreebsd-amd64-not-a-pdf.patch
-tests-ignore-ipv6-address-family-not-supported.patch
-tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
-test-i18n-nonlinux.patch
-tests-wait-on-unfinished-jobs-everytime.patch
-tests-fix-ppdLocalize-on-unclean-env.patch
-tests-use-ipv4-lo-address.patch
-tests-make-lpstat-call-reproducible.patch
-tests-no-pdftourf.patch
-move-cupsd-conf-default-to-share.patch
-airprint-support.patch
-0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
-no-conffile-timestamp.patch
-removecvstag.patch
-rename-systemd-units.patch
-do-not-broadcast-with-hostnames.patch
-reactivate_recommended_driver.patch
-logfiles_adm_readable.patch
-default_log_settings.patch
-confdirperms.patch
-show-compile-command-lines.patch
-cupsd-set-default-for-SyncOnClose-to-Yes.patch
-cups-set-default-error-policy-retry-job.patch
-man-cups-lpd-drop-dangling-references.patch
-debianize_cups-config.patch
-0032-Build-mantohtml-with-the-build-architecture-compiler.patch
-manpage-translations.patch
diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch
deleted file mode 100644
index 993ececa5..000000000
--- a/debian/patches/show-compile-command-lines.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6826016f93b9327994d050b67344fceb5736df08 Mon Sep 17 00:00:00 2001
-From: Till Kampetter 
-Date: Tue, 9 Aug 2016 18:11:43 +0200
-Subject: Show compile command lines
-
-Patch-Name: show-compile-command-lines.patch
----
- Makedefs.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makedefs.in b/Makedefs.in
-index 9ee75856d..038bb9451 100644
---- a/Makedefs.in
-+++ b/Makedefs.in
-@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
- # Rules...
- #
- 
--.SILENT:
- .SUFFIXES:	.a .c .cxx .h .o
- 
- .c.o:
diff --git a/debian/patches/test-i18n-nonlinux.patch b/debian/patches/test-i18n-nonlinux.patch
deleted file mode 100644
index 496cffc37..000000000
--- a/debian/patches/test-i18n-nonlinux.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 69215a096afb42f03e239b2586f1efc16de0a486 Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:16 +0200
-Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
- glibc's iconv behavior is different than what the test expects.
-
-Bug-Debian: http://bugs.debian.org/662996
-
-Last-Update: 2015-10-02
-Patch-Name: test-i18n-nonlinux.patch
----
- cups/testi18n.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cups/testi18n.c b/cups/testi18n.c
-index 45e1cab35..449670c44 100644
---- a/cups/testi18n.c
-+++ b/cups/testi18n.c
-@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
-       puts("PASS");
-   }
- 
--#ifndef __linux
-+#if !defined(__linux__) && !defined(__GLIBC__)
-   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
- 
-   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
deleted file mode 100644
index 05af302fa..000000000
--- a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 62edc4e78c5831c3d3e35b9676cbecc9f9b0c686 Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:18 +0200
-Subject: Tests: Force LC_* environment variables when testing (non)
- l10n'isation.
-
- Permits building in non-"C" environments.
-Origin: vendor
-Last-Update: 2015-02-10
-Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
----
- cups/testppd.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/cups/testppd.c b/cups/testppd.c
-index 36707f29a..a4ab7bfaa 100644
---- a/cups/testppd.c
-+++ b/cups/testppd.c
-@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
-     * Test localization...
-     */
- 
-+   /*
-+    * Enforce void localization
-+    */
-+    putenv("LANG=C");
-+    putenv("LC_ALL=C");
-+    putenv("LC_CTYPE=C");
-+    putenv("LC_MESSAGES=C");
-+
-     fputs("ppdLocalizeIPPReason(text): ", stdout);
-     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
-         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
deleted file mode 100644
index b982218ef..000000000
--- a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 68d005026cb34fffc3634c9f20b358fbf9973878 Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:33:56 +0200
-Subject: Tests: ignore errors triggered on ipv6-deprived hosts
-
-Ignore the 'Address family not supported by protocol' error that breaks the
-errorlines counting on buildds without a working IPv6 stack.
-Origin: vendor
-Last-Update: 2015-02-10
-Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
----
- test/run-stp-tests.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index f5a98dd64..f3a432155 100755
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
-        $GREP -v '(dnssd) stopped with status 1' | \
-        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
-        $GREP -v 'Failed to connect to system bus' | \
-+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
-        wc -l | awk '{print $1}'`
- if test $count != 33; then
- 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
deleted file mode 100644
index 2a42d9ef6..000000000
--- a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 77abc6f2c098f7381be9e4fa5fa9ddd4a1180b4c Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:30:48 +0200
-Subject: Tests: ignore loadFile failures
-
-Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
-breaks the errorlines counting on kfreebsd-amd64 for some reason
-Origin: vendor
-Last-Update: 2015-02-10
-Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
----
- test/run-stp-tests.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 8bde425d6..f5a98dd64 100755
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -1028,6 +1028,8 @@ fi
- count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
-        $GREP -v '(usb) crashed on signal 11' | \
-        $GREP -v '(dnssd) stopped with status 1' | \
-+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
-+       $GREP -v 'Failed to connect to system bus' | \
-        wc -l | awk '{print $1}'`
- if test $count != 33; then
- 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
deleted file mode 100644
index 23c341213..000000000
--- a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 57e7deea1b458b94d14dc133046adf4103240488 Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:36:02 +0200
-Subject: Tests: ignore the failure to write uncompressed data
-
-Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
-sometimes breaks the errorlines counting on kfreebsd for some reason.
-Origin: vendor
-Last-Update: 2016-08-09
-
-Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
----
- test/run-stp-tests.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index f3a432155..c072ad88d 100755
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
-        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
-        $GREP -v 'Failed to connect to system bus' | \
-        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
-+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
-        wc -l | awk '{print $1}'`
- if test $count != 33; then
- 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-usb-crash.patch b/debian/patches/tests-ignore-usb-crash.patch
deleted file mode 100644
index 12a0f7f1b..000000000
--- a/debian/patches/tests-ignore-usb-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5279167dfd4cbf564fe80c945d874fd53cc4b1f1 Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:10 +0200
-Subject: Tests: ignore usb & dnssd backend unexpected exits
-
-Ignore the following errors:
- "[cups-deviced] PID * (usb) crashed on signal 11!" and
- "[cups-deviced] PID * (dnssd) stopped with status 1"
-
- They seem to regularly happen on Debian/Ubuntu buildds and break error lines
- counting.
-Last-Update: 2015-02-10
-
-Patch-Name: tests-ignore-usb-crash.patch
----
- test/run-stp-tests.sh | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index a60158156..8bde425d6 100755
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -1025,7 +1025,10 @@ else
- fi
- 
- # Error log messages
--count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
-+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
-+       $GREP -v '(usb) crashed on signal 11' | \
-+       $GREP -v '(dnssd) stopped with status 1' | \
-+       wc -l | awk '{print $1}'`
- if test $count != 33; then
- 	echo "FAIL: $count error messages, expected 33."
- 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/tests-ignore-warnings.patch b/debian/patches/tests-ignore-warnings.patch
deleted file mode 100644
index 516a98592..000000000
--- a/debian/patches/tests-ignore-warnings.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0b429c446dee90330c2367f801f7f13c7347dcb0 Mon Sep 17 00:00:00 2001
-From: Martin Pitt 
-Date: Tue, 9 Aug 2016 18:11:09 +0200
-Subject: Tests: Ignore warnings from colord and Avahi
-
-These warnings change the expected number of warnings
-
-Last-Update: 2015-08-05
-
-Patch-Name: tests-ignore-warnings.patch
----
- test/run-stp-tests.sh | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 2f9630f52..a60158156 100755
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -1040,7 +1040,11 @@ else
- fi
- 
- # Warning log messages
--count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
-+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
-+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
-+       $GREP -v 'org.freedesktop.ColorManager' | \
-+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
-+       wc -l | awk '{print $1}'`
- if test $count != 8; then
- 	echo "FAIL: $count warning messages, expected 8."
- 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/tests-make-lpstat-call-reproducible.patch b/debian/patches/tests-make-lpstat-call-reproducible.patch
deleted file mode 100644
index 69786bf4c..000000000
--- a/debian/patches/tests-make-lpstat-call-reproducible.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7a57b1e7f9f04d05a9e6075abd887093d5d319d3 Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:22 +0200
-Subject: Tests: Force LC_ALL=C environment variable when grepping the output
- of lpstat
-
-Permits testing in non-"C" environments.
-Origin: vendor
-Last-Update: 2016-07-11
-Patch-Name: tests-make-lpstat-call-reproducible.patch
----
- test/run-stp-tests.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 3f0becde9..baebdeec9 100755
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
- echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
- echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
- echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
-+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
- if test "x$CUPS_DEBUG_LEVEL" != x; then
- 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
- 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/tests-no-pdftourf.patch b/debian/patches/tests-no-pdftourf.patch
deleted file mode 100644
index af6499ea6..000000000
--- a/debian/patches/tests-no-pdftourf.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 9dd262ab1d018195771b45af250fa01268c8433e Mon Sep 17 00:00:00 2001
-From: Michael Sweet 
-Date: Tue, 9 Aug 2016 18:11:23 +0200
-Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c
-
- "Update "make test" to include alternate filter."
- .
- This fixes the error lines counting in the test, and is unneeded as pdftourf
- is not shipped in Debian.
-Origin: upstream
-
-Patch-Name: tests-no-pdftourf.patch
----
- test/run-stp-tests.sh | 4 +---
- test/test.convs       | 1 -
- test/test.types       | 2 --
- 3 files changed, 1 insertion(+), 6 deletions(-)
- delete mode 100644 test/test.types
-
-diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index baebdeec9..001e2f61f 100755
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
- 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
- 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
- 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
--		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
-+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
- 		;;
- 
- 	*)
-@@ -443,14 +443,12 @@ EOF
- }
- 
- ln -s $root/test/test.convs $BASE/share/mime
--ln -s $root/test/test.types $BASE/share/mime
- 
- if test `uname` = Darwin; then
- 	instfilter cgimagetopdf imagetopdf pdf
- 	instfilter cgpdftopdf pdftopdf passthru
- 	instfilter cgpdftops pdftops ps
- 	instfilter cgpdftoraster pdftoraster raster
--	instfilter cgpdftoraster pdftourf raster
- 	instfilter cgtexttopdf texttopdf pdf
- 	instfilter pstocupsraster pstoraster raster
- else
-diff --git a/test/test.convs b/test/test.convs
-index 77a9ce01e..57540aac4 100644
---- a/test/test.convs
-+++ b/test/test.convs
-@@ -2,7 +2,6 @@
- application/pdf application/vnd.cups-pdf 100 pdftopdf
- application/pdf application/postscript 100 pdftops
- application/pdf application/vnd.cups-raster 100 pdftoraster
--application/pdf image/urf 100 pdftourf
- application/postscript application/vnd.cups-raster 100 pstoraster
- image/jpeg application/pdf 100 imagetopdf
- text/plain application/pdf 100 texttopdf
-diff --git a/test/test.types b/test/test.types
-deleted file mode 100644
-index 914081c7f..000000000
---- a/test/test.types
-+++ /dev/null
-@@ -1,2 +0,0 @@
--# Test file listing potential MIME media types that are not in the standard mime.types file
--image/urf
-\ No newline at end of file
diff --git a/debian/patches/tests-use-ipv4-lo-address.patch b/debian/patches/tests-use-ipv4-lo-address.patch
deleted file mode 100644
index 0df28da83..000000000
--- a/debian/patches/tests-use-ipv4-lo-address.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1e063279ac30fe50296a85f9d87b794377b823db Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:21 +0200
-Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
-
-This should make the test-suite work in pbuilder. It apparently also fixes an
-ipp backend problem in the test-suite.
-
-Origin: vendor
-Last-Update: 2016-08-05
-Patch-Name: tests-use-ipv4-lo-address.patch
----
- test/5.1-lpadmin.sh   | 4 ++--
- test/run-stp-tests.sh | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
-index 7efc39892..08b8c508f 100644
---- a/test/5.1-lpadmin.sh
-+++ b/test/5.1-lpadmin.sh
-@@ -52,8 +52,8 @@ echo ""
- 
- echo "Add Shared Printer Test"
- echo ""
--echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
--$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
-+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
-+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
- if test $? != 0; then
- 	echo "    FAILED"
- 	exit 1
-diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index 492982005..3f0becde9 100755
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -490,7 +490,7 @@ fi
- cat >$BASE/cupsd.conf <>$strfile
- 
- 	if test $file = ../examples/ipp-2.1.test; then
--		uri="ipp://localhost:$port/printers/Test1"
-+		uri="ipp://127.0.0.1:$port/printers/Test1"
- 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
- 	else
--		uri="ipp://localhost:$port/printers"
-+		uri="ipp://127.0.0.1:$port/printers"
- 		options=""
- 	fi
- 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
deleted file mode 100644
index b9844fb74..000000000
--- a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a6a69d9950c167a62d47ec0c251c2ead3c7db441 Mon Sep 17 00:00:00 2001
-From: Didier Raboud 
-Date: Tue, 9 Aug 2016 18:11:17 +0200
-Subject: Tests: Make sure that all scheduled jobs are finished before
-
- running a new test. Fixes failures on slow architectures like armel and
- mipsel.
-Bug-Debian: http://bugs.debian.org/670878
-Last-Update: 2015-02-10
-
-Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
----
- test/run-stp-tests.sh | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
-index c072ad88d..492982005 100755
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
- echo "    
" >>$strfile
- 
- for file in 5*.sh; do
-+	#
-+	# Make sure the past jobs are done before going on.
-+	#
-+	./waitjobs.sh 1800
-+
- 	echo $ac_n "Performing $file: $ac_c"
- 	echo "" >>$strfile
-         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index f2f6802e6..c567cbba7 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 
Specifies whether the scheduler calls
 fsync(2)
 after writing configuration or state files.
-The default is "Yes".
+The default is "No".
 
SystemGroup group-name [ ... group-name ]
 
Specifies the group(s) to use for @SYSTEM group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 7d161edd2..1668eee8a 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 
ErrorPolicy retry-current-job
 
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 
ErrorPolicy retry-job
-
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
 
ErrorPolicy stop-printer
-
Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+
Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
 
FilterLimit limit
 
Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/Makefile b/man/Makefile
index 48f06c48a..621fe60c1 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,18 +63,12 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
-LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
-
-translations:
-	# Update the translations and build the translated material
-	po4a --previous ../debian/manpage-po4a/cups.cfg
-	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
 
 
 #
@@ -97,12 +91,6 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
-	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
-	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
-	# Make sure the PO files are updated and remove generated
-	# translations.
-	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
-	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -154,7 +142,6 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
-	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -202,7 +189,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+	-$(RMDIR) $(MANDIR)/man8
 
 
 #
@@ -235,5 +222,6 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.c
-	$(CC_FOR_BUILD) -o $@ $<
+mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
deleted file mode 100644
index 08390f5dc..000000000
--- a/man/Makefile.l10n
+++ /dev/null
@@ -1,235 +0,0 @@
-#
-# Man page makefile for CUPS.
-#
-# Copyright © 2007-2019 by Apple Inc.
-# Copyright © 1993-2006 by Easy Software Products.
-#
-# Licensed under Apache License v2.0.  See the file "LICENSE" for more
-# information.
-#
-
-include ../../Makedefs
-
-
-#
-# Man pages...
-#
-
-MAN1	=	cancel.1 \
-		cups.1 \
-		cups-config.1 \
-		cupstestppd.1 \
-		ippeveprinter.1 \
-		$(IPPFIND_MAN) \
-		ipptool.1 \
-		lp.1 \
-		lpoptions.1 \
-		lpq.1 \
-		lprm.1 \
-		lpr.1 \
-		lpstat.1 \
-		ppdc.1 \
-		ppdhtml.1 \
-		ppdi.1 \
-		ppdmerge.1 \
-		ppdpo.1
-MAN5	=	classes.conf.5 \
-		client.conf.5 \
-		cups-files.conf.5 \
-		cups-snmp.conf.5 \
-		cupsd.conf.5 \
-		cupsd-logs.5 \
-		ipptoolfile.5 \
-		mailto.conf.5 \
-		mime.convs.5 \
-		mime.types.5 \
-		ppdcfile.5 \
-		printers.conf.5 \
-		subscriptions.conf.5
-MAN7	=	backend.7 \
-		filter.7 \
-		ippevepcl.7 \
-		notifier.7
-MAN8	=	cupsaccept.8 \
-		cupsctl.8 \
-		cupsfilter.8 \
-		cups-lpd.8 \
-		cups-snmp.8 \
-		cupsd.8 \
-		cupsd-helper.8 \
-		cupsenable.8 \
-		lpadmin.8 \
-		lpinfo.8 \
-		lpmove.8 \
-		lpc.8
-
-
-#
-# Make everything...
-#
-
-# Debian-specific patch: Just assume all files are here.
-all:
-
-
-#
-# Make library targets...
-#
-
-libs:
-
-
-#
-# Make unit tests...
-#
-
-unittests:
-
-
-#
-# Clean all config and object files...
-#
-
-clean:
-	$(RM) mantohtml mantohtml.o
-
-
-#
-# Dummy depend target...
-#
-
-depend:
-
-
-#
-# Install all targets...
-#
-
-# Debian-specific patch: directory-based language namespace
-MANDIR := $(MANDIR)/$(LANGUAGE)
-
-install:	all install-data install-headers install-libs install-exec
-
-
-#
-# Install data files...
-#
-
-# Debian-specific patch: skip if doesn't exist
-install-data: all
-	echo Installing man pages in $(MANDIR)/man1...
-	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
-	for file in $(MAN1); do \
-		[ ! -r $$file ] || \
-		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
-	done
-	echo Installing man pages in $(MANDIR)/man5...
-	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
-	for file in $(MAN5); do \
-		[ ! -r $$file ] || \
-		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
-	done
-	echo Installing man pages in $(MANDIR)/man7...
-	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
-	for file in $(MAN7); do \
-		[ ! -r $$file ] || \
-		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
-	done
-	$(RM) $(MANDIR)/man7/ippeveps.7
-	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
-	echo Installing man pages in $(MANDIR)/man8...
-	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
-	for file in $(MAN8); do \
-		[ ! -r $$file ] || \
-		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
-	done
-	$(RM) $(MANDIR)/man8/cupsdisable.8
-	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
-	$(RM) $(MANDIR)/man8/cupsreject.8
-	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
-	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
-		$(RM) $(MANDIR)/man8/$$file; \
-		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
-	done
-
-
-#
-# Install programs...
-#
-
-install-exec:
-
-
-#
-# Install headers...
-#
-
-install-headers:
-
-
-#
-# Install libraries...
-#
-
-install-libs:
-
-
-#
-# Uninstall files...
-#
-
-uninstall:
-	echo Uninstalling man pages from $(MANDIR)/man1...
-	for file in $(MAN1); do \
-		$(RM) $(MANDIR)/man1/$$file; \
-	done
-	-$(RMDIR) $(MANDIR)/man1
-	echo Uninstalling man pages from $(MANDIR)/man5...
-	for file in $(MAN5); do \
-		$(RM) $(MANDIR)/man5/$$file; \
-	done
-	-$(RMDIR) $(MANDIR)/man5
-	echo Uninstalling man pages from $(MANDIR)/man7...
-	for file in $(MAN7) ippeveps.7; do \
-		$(RM) $(MANDIR)/man7/$$file; \
-	done
-	-$(RMDIR) $(MANDIR)/man7
-	echo Uninstalling man pages from $(MANDIR)/man8...
-	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
-		$(RM) $(MANDIR)/man8/$$file; \
-	done
-	-$(RMDIR) $(MANDIR)/man8
-
-
-#
-# Local programs (not built when cross-compiling...)
-#
-
-local:	html
-
-
-#
-# Make html versions of man pages...
-#
-
-html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
-	echo Converting man pages to HTML...
-	for file in $(MAN1); do \
-		echo "    $$file..."; \
-		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
-	done
-	for file in $(MAN5); do \
-		echo "    $$file..."; \
-		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
-	done
-	for file in $(MAN7); do \
-		echo "    $$file..."; \
-		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
-	done
-	for file in $(MAN8); do \
-		echo "    $$file..."; \
-		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
-	done
-
-mantohtml:	mantohtml.c
-	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/backend.7 b/man/backend.7
index 3c426310c..5a7032650 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time \- other jobs may print before this one.
+The scheduler will retry the job at a future time - other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend \- see
+The one exception is the SNMP backend - see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 92f1d9575..8805561db 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -64,7 +64,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -114,7 +114,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 955f47b55..b451e2f92 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "Yes".
+The default is "No".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues \- a PPD file is required.
+File devices cannot be used with "raw" print queues - a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e998df361..e8ce3251f 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B \-n
+.B -n
 ] [
-.B \-o
+.B -o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B \-n
+.B -n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
@@ -109,7 +109,9 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
+.BR cups (1),
 .BR cupsd (8),
+.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index bb77c7342..4ca20f24f 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index b0c51a738..706620d7c 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index c88eb22ec..791954c19 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl \--debug-logging
+    cupsctl --debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl \--no-share-printers
+    cupsctl --no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index a912c4693..2070be9a5 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 \- \-
-    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 - -
+    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices \-
-    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 \- \-
+    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices -
+    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 - -
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "\-".
+The \fIgroup\fR field always contains "-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "\-".
+If no username and password is supplied for the request then this field contains "-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 6d3d8e393..00b1a22d6 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index fe4c5a2cf..c655c21c0 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/de/Makefile b/man/de/Makefile
deleted file mode 100644
index 7c237840e..000000000
--- a/man/de/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#   Man page makefile for the Common UNIX Printing System (CUPS).
-#
-
-LANGUAGE=de
-
-include ../Makefile.l10n
diff --git a/man/filter.7 b/man/filter.7
index 8cb79bbf9..dbc3150c8 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/fr/Makefile b/man/fr/Makefile
deleted file mode 100644
index 6a50e9348..000000000
--- a/man/fr/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#   Man page makefile for the Common UNIX Printing System (CUPS).
-#
-
-LANGUAGE=fr
-
-include ../Makefile.l10n
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index 2fcda8b9f..5753c69da 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -129,8 +129,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config \--serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+command can be used to discover the correct binary directory ("cups-config --serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -227,7 +227,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+\fBSTATE: -\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index d77ef75cc..32f2e6f8b 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode \- just returns the exit codes below.
+Quiet mode - just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 576323291..700101773 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry \- see references below.
+Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry - see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index 839a48278..cbea3b840 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "\-" to force printing from the standard input.
+Use a filename of "-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality \- draft (3), normal (4), or best (5).
+Specifies the output quality - draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp \-n 2 filename
+    lp -n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp \-d bar \-o number-up=2 filename
+    lp -d bar -o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index ce6a698ff..1b8c91ba4 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index 7550d9afb..a34fd01dc 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index 635d126d6..f367cd97c 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality \- draft (3), normal (4), or best (5).
+Specifies the output quality - draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr \-# 2 filename
+    lpr -# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr \-P foo \-o number-up=2 filename
+    lpr -P foo -o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 6223f17d2..2a9353a9f 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,10 +11,8 @@
  * Include necessary headers.
  */
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
 #include 
 
 
@@ -813,8 +811,7 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strncpy(anchor, line + 4, sizeof(anchor) - 1);
-        anchor[sizeof(anchor) - 1] = '\0';
+        strlcpy(anchor, line + 4, sizeof(anchor));
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -943,8 +940,7 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strncpy(name, s, sizeof(name) - 1);
-        name[sizeof(name) - 1] = '\0';
+        strlcpy(name, s, sizeof(name));
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1177,8 +1173,7 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strncpy(temp, s, sizeof(temp) - 1);
-      temp[sizeof(temp) - 1] = '\0';
+      strlcpy(temp, s, sizeof(temp));
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 04ba39494..25a6f7653 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR \- Typical CUPS configuration directory.
+\fI/etc/cups\fR - Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 3572726f5..7e83de16a 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms \- a filename extension by itself and functions with test
+Rules take two forms - a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR \- Typical CUPS configuration directory.
+\fI/etc/cups\fR - Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 38e266978..44e9d2448 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/scheduler/classes.c b/scheduler/classes.c
index ec6357ffe..776e79a91 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd\n");
+  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 944655ecb..bb6049b2c 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = TRUE;
+  SyncOnClose              = FALSE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
@@ -745,14 +745,14 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "retry-job");
+  cupsdSetString(&ErrorPolicy, "stop-printer");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups)
+    if (HostNameLookups || RemotePort)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
@@ -1135,12 +1135,10 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
-       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
-       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
@@ -1233,8 +1231,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "retry-job");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "stop-printer");
   }
 
  /*
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 14478fd99..77703b983 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 874eb3c07..85516eb8c 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,6 +240,7 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
+  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -277,6 +278,15 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
+ /*
+  * Strip confusing (and often wrong) "recommended" suffix added by
+  * Foomatic drivers...
+  */
+
+  if ((recommended = strstr(ppd->record.make_and_model,
+                            " (recommended)")) != NULL)
+    *recommended = '\0';
+
  /*
   * Add the PPD to the PPD arrays...
   */
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index fb2a30526..ddd3701e0 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,12 +440,6 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
-    /* iOS 6 does not accept this printer as AirPrint printer if there is
-       no URF txt record or "URF=none", "DM3" is the minimum needed found
-       by try and error */
-    keyvalue[count  ][0] = "URF";
-    keyvalue[count++][1] = "DM3";
-
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/job.c b/scheduler/job.c
index 9c197efc9..2cfb1b03d 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
 
       argv[0] = job->printer->sanitized_device_uri;
 
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd\n");
+  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/log.c b/scheduler/log.c
index d53d1401c..cdb5437dc 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,7 +21,6 @@
 #  include 
 #endif /* HAVE_ASL_H */
 #include 
-#include 
 
 
 /*
@@ -111,7 +110,6 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
-  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -131,11 +129,6 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
- /*
-  * Use adm group if possible, fall back to Group
-  */
- loggrp = getgrnam("adm");
-
  /*
   * Format the filename as needed...
   */
@@ -248,7 +241,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+      fchown(cupsFileNumber(*lf), RunUser, Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -291,7 +284,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+    fchown(cupsFileNumber(*lf), RunUser, Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index eb8445905..ed23f9dfd 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=cups-lpd.service
+PartOf=org.cups.cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 7c8509fa6..0f1cc46f2 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=cups.service
+PartOf=org.cups.cupsd.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index cd2334396..5273762fb 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=cups.socket cups.path
+Also=org.cups.cupsd.socket org.cups.cupsd.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 3c37d7213..613b977a6 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=cups.service
+PartOf=org.cups.cupsd.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 10ae91234..75ef4c0d2 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd\n");
+  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
@@ -2249,10 +2249,9 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
   cupsd_location_t *auth;		/* Pointer to authentication element */
   const char	*auth_supported;	/* Authentication supported */
   ipp_t		*oldattrs;		/* Old printer attributes */
-  ipp_attribute_t *attr, *attr2;	/* Attribute data */
+  ipp_attribute_t *attr;		/* Attribute data */
   char		*name,			/* Current user/group name */
 		*filter;		/* Current filter */
-  mime_type_t   *type;
 
 
  /*
@@ -2585,80 +2584,6 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
 
   add_printer_formats(p);
 
-  /* 
-   * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input
-   * is supported
-   */
-  for (type = (mime_type_t *)cupsArrayFirst(p->filetypes);
-       type;
-       type = (mime_type_t *)cupsArrayNext(p->filetypes))
-  {
-    if (!_cups_strcasecmp(type->super, "image"))
-    {
-      if (!_cups_strcasecmp(type->type, "pwg-raster"))
-      {
-	if (p->ppd_attrs != NULL &&
-	    (attr = ippFindAttribute(p->ppd_attrs,
-				     "printer-resolution-supported",
-				     IPP_TAG_ZERO)) != NULL)
-	{
-	  attr2 = ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
-				    "pwg-raster-document-resolution-supported",
-				    attr->num_values, IPP_RES_PER_INCH,
-				    NULL, NULL);
-	  for (i = 0; i < attr->num_values; i ++)
-	  {
-	    attr2->values[i].resolution.xres =
-	      attr->values[i].resolution.xres;
-	    attr2->values[i].resolution.yres =
-	      attr->values[i].resolution.yres;
-	    attr2->values[i].resolution.units = IPP_RES_PER_INCH;
-	  }
-	}
-	else
-	{
-	  static const int	pwg_raster_document_resolution_supported[] =
-	  {
-	    300,
-	    600,
-	    1200
-	  };
-	  ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
-			    "pwg-raster-document-resolution-supported",
-			    (int)(sizeof(pwg_raster_document_resolution_supported) /
-				  sizeof(pwg_raster_document_resolution_supported[0])),
-			    IPP_RES_PER_INCH,
-			    pwg_raster_document_resolution_supported,
-			    pwg_raster_document_resolution_supported);
-	}
-	ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
-		     "pwg-raster-document-sheet-back", NULL, "normal");
-	static const char * const pwg_raster_document_type_supported[] =
-	{
-	  "adobergb-8",
-	  "adobergb-16",
-	  "black-1",
-	  "black-8",
-	  "black-16",
-	  "cmyk-8",
-	  "cmyk-16",
-	  "rgb-8",
-	  "rgb-16",
-	  "sgray-1",
-	  "sgray-8",
-	  "sgray-16",
-	  "srgb-8",
-	  "srgb-16"
-	};
-	ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
-		      "pwg-raster-document-type-supported",
-		      (int)(sizeof(pwg_raster_document_type_supported) /
-			    sizeof(pwg_raster_document_type_supported[0])), NULL,
-		      pwg_raster_document_type_supported);
-      }
-    }
-  }
-
  /*
   * Add name-default attributes...
   */
@@ -3806,9 +3731,7 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "urf"))
-	  strlcat(pdl, "image/urf,", sizeof(pdl));
-	else if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 2542ab148..3267a2ff6 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd\n");
+  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 08b8c508f..7efc39892 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 001e2f61f..2f9630f52 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,12 +443,14 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
+ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
+	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
@@ -488,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
-echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
@@ -742,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://127.0.0.1:$port/printers/Test1"
+		uri="ipp://localhost:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://127.0.0.1:$port/printers"
+		uri="ipp://localhost:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
@@ -775,11 +776,6 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    
" >>$strfile
 
 for file in 5*.sh; do
-	#
-	# Make sure the past jobs are done before going on.
-	#
-	./waitjobs.sh 1800
-
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
@@ -1029,14 +1025,7 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
-       $GREP -v '(usb) crashed on signal 11' | \
-       $GREP -v '(dnssd) stopped with status 1' | \
-       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
-       $GREP -v 'Failed to connect to system bus' | \
-       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
-       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
-       wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
@@ -1051,11 +1040,7 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
-       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
-       $GREP -v 'org.freedesktop.ColorManager' | \
-       $GREP -v -E 'Avahi client failed: -(1|26)' | \
-       wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
diff --git a/test/test.convs b/test/test.convs
index 57540aac4..77a9ce01e 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,6 +2,7 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
+application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
new file mode 100644
index 000000000..914081c7f
--- /dev/null
+++ b/test/test.types
@@ -0,0 +1,2 @@
+# Test file listing potential MIME media types that are not in the standard mime.types file
+image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From dec7361ed714691a4e2d577c538818a60caec16a Mon Sep 17 00:00:00 2001
From: Till Kamppeter 
Date: Tue, 9 Aug 2016 18:11:04 +0200
Subject: For PWG Raster, add required IPP attributes

Add required by IPP Everywhere for PWG Raster when PWG Raster as input format
is supported

Bug-Upstream: https://www.cups.org/str.php?L4428
Last-Update: 2015-02-10
Patch-Name: pwg-raster-attributes.patch

Gbp-Pq: Name pwg-raster-attributes.patch
---
 scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 75ef4c0d2..542523760 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
   cupsd_location_t *auth;		/* Pointer to authentication element */
   const char	*auth_supported;	/* Authentication supported */
   ipp_t		*oldattrs;		/* Old printer attributes */
-  ipp_attribute_t *attr;		/* Attribute data */
+  ipp_attribute_t *attr, *attr2;	/* Attribute data */
   char		*name,			/* Current user/group name */
 		*filter;		/* Current filter */
+  mime_type_t   *type;
 
 
  /*
@@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
 
   add_printer_formats(p);
 
+  /* 
+   * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input
+   * is supported
+   */
+  for (type = (mime_type_t *)cupsArrayFirst(p->filetypes);
+       type;
+       type = (mime_type_t *)cupsArrayNext(p->filetypes))
+  {
+    if (!_cups_strcasecmp(type->super, "image"))
+    {
+      if (!_cups_strcasecmp(type->type, "pwg-raster"))
+      {
+	if (p->ppd_attrs != NULL &&
+	    (attr = ippFindAttribute(p->ppd_attrs,
+				     "printer-resolution-supported",
+				     IPP_TAG_ZERO)) != NULL)
+	{
+	  attr2 = ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
+				    "pwg-raster-document-resolution-supported",
+				    attr->num_values, IPP_RES_PER_INCH,
+				    NULL, NULL);
+	  for (i = 0; i < attr->num_values; i ++)
+	  {
+	    attr2->values[i].resolution.xres =
+	      attr->values[i].resolution.xres;
+	    attr2->values[i].resolution.yres =
+	      attr->values[i].resolution.yres;
+	    attr2->values[i].resolution.units = IPP_RES_PER_INCH;
+	  }
+	}
+	else
+	{
+	  static const int	pwg_raster_document_resolution_supported[] =
+	  {
+	    300,
+	    600,
+	    1200
+	  };
+	  ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
+			    "pwg-raster-document-resolution-supported",
+			    (int)(sizeof(pwg_raster_document_resolution_supported) /
+				  sizeof(pwg_raster_document_resolution_supported[0])),
+			    IPP_RES_PER_INCH,
+			    pwg_raster_document_resolution_supported,
+			    pwg_raster_document_resolution_supported);
+	}
+	ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
+		     "pwg-raster-document-sheet-back", NULL, "normal");
+	static const char * const pwg_raster_document_type_supported[] =
+	{
+	  "adobergb-8",
+	  "adobergb-16",
+	  "black-1",
+	  "black-8",
+	  "black-16",
+	  "cmyk-8",
+	  "cmyk-16",
+	  "rgb-8",
+	  "rgb-16",
+	  "sgray-1",
+	  "sgray-8",
+	  "sgray-16",
+	  "srgb-8",
+	  "srgb-16"
+	};
+	ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
+		      "pwg-raster-document-type-supported",
+		      (int)(sizeof(pwg_raster_document_type_supported) /
+			    sizeof(pwg_raster_document_type_supported[0])), NULL,
+		      pwg_raster_document_type_supported);
+      }
+    }
+  }
+
  /*
   * Add name-default attributes...
   */
-- 
cgit v1.2.3


From a808377009e8710a3e72c08219db4bf744b335a2 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://cups.org/str.php?L4299
Last-Update: 2015-02-10

Patch-Name: manpage-hyphen-minus.patch

Gbp-Pq: Name manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 8805561db..92f1d9575 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -64,7 +64,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -114,7 +114,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index 5753c69da..2fcda8b9f 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -129,8 +129,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -227,7 +227,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From f93b70c7756e851d9ef7529117c2703173cd0c8f Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: http://www.cups.org/str.php?L2935
Bug-Debian: http://bugs.debian.org/410171

Gbp-Pq: Name 0003-Install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index 2cfb1b03d..515fc8b5e 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From 24dcd271201b557989053c739a604aaa8c7cd08e Mon Sep 17 00:00:00 2001
From: Tim Waugh 
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://www.cups.org/str.php?L4348
Last-Updated: 2015-02-10
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch

Gbp-Pq: Name fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 8226acc7b..5902dd6cb 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1803,7 +1803,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From 08d1c23132143b7ac6708fa42b789687da4f3019 Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Last-Update: 2015-08-05

Patch-Name: tests-ignore-warnings.patch

Gbp-Pq: Name tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From d3e08134ad8ffc1263208e0501530c6cc663f21f Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Last-Update: 2015-02-10

Patch-Name: tests-ignore-usb-crash.patch

Gbp-Pq: Name tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From eedf374c333ba1c8788bd9ce5a437313a4fb1255 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch

Gbp-Pq: Name tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 024423cfacad97af018b1c5baac272f39a3f5f3c Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch

Gbp-Pq: Name tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 51e30d106eec42dd391a579aee72c4fdc5a3f23d Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Last-Update: 2016-08-09

Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch

Gbp-Pq: Name tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From db28ca13c2dedbb9de06298960aaa1a0b4fc67e7 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: http://bugs.debian.org/662996

Last-Update: 2015-10-02
Patch-Name: test-i18n-nonlinux.patch

Gbp-Pq: Name test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From ef17a9a843ba24ccc694dc69005c0a69c3227b03 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: http://bugs.debian.org/670878
Last-Update: 2015-02-10

Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch

Gbp-Pq: Name tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..492982005 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    
" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From 5a1eb134b52bb7311258f085f5276e25a9aa720a Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch

Gbp-Pq: Name tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From c02507497ff678eff015430e51d566776db090d3 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Last-Update: 2016-08-05
Patch-Name: tests-use-ipv4-lo-address.patch

Gbp-Pq: Name tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 492982005..3f0becde9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From 558076ebf3e0992d9bbcda01e6450449f0e81a0e Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Last-Update: 2016-07-11
Patch-Name: tests-make-lpstat-call-reproducible.patch

Gbp-Pq: Name tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 3f0becde9..baebdeec9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From b53e7f19d242d5183e9d666a1374a15845df23c7 Mon Sep 17 00:00:00 2001
From: Michael Sweet 
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream

Patch-Name: tests-no-pdftourf.patch

Gbp-Pq: Name tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index baebdeec9..001e2f61f 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From e9e9beee5a6b3c36aa9e9507e90ec43a8158e45e Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://cups.org/str.php?L4342
Bug-Debian: http://bugs.debian.org/640124
Last-Update: 2015-02-10

Patch-Name: move-cupsd-conf-default-to-share.patch

Gbp-Pq: Name move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From b0989f1215cb3e800182d1232a3d91f132ddd7dd Mon Sep 17 00:00:00 2001
From: Till Kamppeter 
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: http://bugs.debian.org/700961
Bug: https://cups.org/str.php?L4341
Last-Update: 2015-02-10

Patch-Name: airprint-support.patch

Gbp-Pq: Name airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 542523760..b366bf588 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3806,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From d516c6465c7127dedce215e20d4212c357b9f2a6 Mon Sep 17 00:00:00 2001
From: Tim Waugh 
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://www.cups.org/str.php?L3552

Gbp-Pq: Name 0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 9fb7a404a782853c095446a9873e6bf457f1ae0f Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673

Patch-Name: no-conffile-timestamp.patch

Gbp-Pq: Name no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 776e79a91..ec6357ffe 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index 515fc8b5e..9c197efc9 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index b366bf588..10ae91234 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 3267a2ff6..2542ab148 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 78af0f4fdc312848f126b24f44e02c1dc37798fe Mon Sep 17 00:00:00 2001
From: Kenshi Muto 
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: http://www.cups.org/str.php?L2369
Origin: vendor
Author: Didier Raboud 
Last-Update: 2014-01-16

Patch-Name: removecvstag.patch

Gbp-Pq: Name removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From c5ef20c6a91e1c94bcfd5dd66b9bfcc86bffb741 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch

Gbp-Pq: Name rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From 245d5342ebcb6b21a0ce4a6f9a3ec833499fdb49 Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586

Patch-Name: do-not-broadcast-with-hostnames.patch

Gbp-Pq: Name do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 47599e6ac0e5bc7634405938d6bd1fa418ed2bd6 Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Last-Update: 2015-02-10

Patch-Name: reactivate_recommended_driver.patch

Gbp-Pq: Name reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 041e2120e1eb8ce24ee83adf73400923ec6fbaad Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953

Last-Update: 2015-02-10
Patch-Name: logfiles_adm_readable.patch

Gbp-Pq: Name logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index cdb5437dc..d53d1401c 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include 
 #endif /* HAVE_ASL_H */
 #include 
+#include 
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From 797f2e9b2aeca472d8c77347c5fe1c084a45cd0f Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Last-Update: 2015-02-10

Patch-Name: default_log_settings.patch

Gbp-Pq: Name default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From 099b255e9a534d1053c4d6fee7b747a19c76b564 Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Last-Update: 2015-02-10

Patch-Name: confdirperms.patch

Gbp-Pq: Name confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 07eadf857cdef6a99a8bdaef623bc75ae8b07298 Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch

Gbp-Pq: Name show-compile-command-lines.patch
---
 Makedefs.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..038bb9451 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
 .SUFFIXES:	.a .c .cxx .h .o
 
 .c.o:
-- 
cgit v1.2.3


From 1f90e44b6d7da0bc16e334b36c01d1a03274c6aa Mon Sep 17 00:00:00 2001
From: Tim Waugh 
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Last-Update: 2015-02-10

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch

Gbp-Pq: Name cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 
Specifies whether the scheduler calls
 fsync(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 
SystemGroup group-name [ ... group-name ]
 
Specifies the group(s) to use for @SYSTEM group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From f3144a47cdfd0ba8807e5474e4b04298427cebeb Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job", since it is less

 confusing and a better default on most machines.
 .
 Amend documentation accordingly.
Author: Didier Raboud 
Origin: vendor
Last-Update: 2016-07-03

Patch-Name: cups-set-default-error-policy-retry-job.patch

Gbp-Pq: Name cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 
ErrorPolicy retry-current-job
 
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 
ErrorPolicy retry-job
-
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 
ErrorPolicy stop-printer
-
Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+
Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 
FilterLimit limit
 
Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From 5c04438eb1fe479252f81eae2d4d34d3e6400bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= 
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: http://bugs.debian.org/570157
Last-Update: 2015-10-02
Patch-Name: man-cups-lpd-drop-dangling-references.patch

Gbp-Pq: Name man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 8c8b0f63a4a00ec33392138482523dbfe04da55f Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Last-Update: 2014-06-11
Patch-Name: debianize_cups-config.patch

Gbp-Pq: Name debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From a2b73aea985e89534a1947a130664feb9739f234 Mon Sep 17 00:00:00 2001
From: Helmut Grohne 
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936

Gbp-Pq: Name 0032-Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 038bb9451..291099cf2 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 7eca9e37f..2dfdbb93c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From d002102eedfffe6c104ebe59ff180c4589a7f729 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François , Helge Kreutzmann 
Origin: vendor
Bug-Debian: http://bugs.debian.org/478597

Patch-Name: manpage-translations.patch

Gbp-Pq: Name manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 1a3b3144761ea5d62484ba9126b1e96de1008231 Mon Sep 17 00:00:00 2001
From: Till Kamppeter 
Date: Tue, 9 Aug 2016 18:11:04 +0200
Subject: For PWG Raster, add required IPP attributes

Add required by IPP Everywhere for PWG Raster when PWG Raster as input format
is supported

Bug-Upstream: https://www.cups.org/str.php?L4428
Last-Update: 2015-02-10
Patch-Name: pwg-raster-attributes.patch

Gbp-Pq: Name pwg-raster-attributes.patch
---
 scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

diff --git a/scheduler/printers.c b/scheduler/printers.c
index e4841c071..1984a659c 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -2254,9 +2254,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
   cupsd_location_t *auth;		/* Pointer to authentication element */
   const char	*auth_supported;	/* Authentication supported */
   ipp_t		*oldattrs;		/* Old printer attributes */
-  ipp_attribute_t *attr;		/* Attribute data */
+  ipp_attribute_t *attr, *attr2;	/* Attribute data */
   char		*name,			/* Current user/group name */
 		*filter;		/* Current filter */
+  mime_type_t   *type;
 
 
  /*
@@ -2589,6 +2590,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
 
   add_printer_formats(p);
 
+  /* 
+   * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input
+   * is supported
+   */
+  for (type = (mime_type_t *)cupsArrayFirst(p->filetypes);
+       type;
+       type = (mime_type_t *)cupsArrayNext(p->filetypes))
+  {
+    if (!_cups_strcasecmp(type->super, "image"))
+    {
+      if (!_cups_strcasecmp(type->type, "pwg-raster"))
+      {
+	if (p->ppd_attrs != NULL &&
+	    (attr = ippFindAttribute(p->ppd_attrs,
+				     "printer-resolution-supported",
+				     IPP_TAG_ZERO)) != NULL)
+	{
+	  attr2 = ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
+				    "pwg-raster-document-resolution-supported",
+				    attr->num_values, IPP_RES_PER_INCH,
+				    NULL, NULL);
+	  for (i = 0; i < attr->num_values; i ++)
+	  {
+	    attr2->values[i].resolution.xres =
+	      attr->values[i].resolution.xres;
+	    attr2->values[i].resolution.yres =
+	      attr->values[i].resolution.yres;
+	    attr2->values[i].resolution.units = IPP_RES_PER_INCH;
+	  }
+	}
+	else
+	{
+	  static const int	pwg_raster_document_resolution_supported[] =
+	  {
+	    300,
+	    600,
+	    1200
+	  };
+	  ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
+			    "pwg-raster-document-resolution-supported",
+			    (int)(sizeof(pwg_raster_document_resolution_supported) /
+				  sizeof(pwg_raster_document_resolution_supported[0])),
+			    IPP_RES_PER_INCH,
+			    pwg_raster_document_resolution_supported,
+			    pwg_raster_document_resolution_supported);
+	}
+	ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
+		     "pwg-raster-document-sheet-back", NULL, "normal");
+	static const char * const pwg_raster_document_type_supported[] =
+	{
+	  "adobergb-8",
+	  "adobergb-16",
+	  "black-1",
+	  "black-8",
+	  "black-16",
+	  "cmyk-8",
+	  "cmyk-16",
+	  "rgb-8",
+	  "rgb-16",
+	  "sgray-1",
+	  "sgray-8",
+	  "sgray-16",
+	  "srgb-8",
+	  "srgb-16"
+	};
+	ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
+		      "pwg-raster-document-type-supported",
+		      (int)(sizeof(pwg_raster_document_type_supported) /
+			    sizeof(pwg_raster_document_type_supported[0])), NULL,
+		      pwg_raster_document_type_supported);
+      }
+    }
+  }
+
  /*
   * Add name-default attributes...
   */
-- 
cgit v1.2.3


From 90c4744e10448775a6e48ee844b223cd9a122ffc Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://cups.org/str.php?L4299
Last-Update: 2015-02-10

Patch-Name: manpage-hyphen-minus.patch

Gbp-Pq: Name manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 8805561db..92f1d9575 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -64,7 +64,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -114,7 +114,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 75d060279..5788265fa 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index 5753c69da..2fcda8b9f 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -129,8 +129,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -227,7 +227,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 5ef621979..9cd640344 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are separated by the comma (",") character - escape commas using the "\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are separated by the comma (",") character \- escape commas using the "\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From 20caaa31276ae966c99ac9042c30b2edeb8250f8 Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: http://www.cups.org/str.php?L2935
Bug-Debian: http://bugs.debian.org/410171

Gbp-Pq: Name 0003-Install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index 33ad7025b..81acecdfa 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From 3a7738c4ec0c9b23874818d4dda5bfd89d7236a7 Mon Sep 17 00:00:00 2001
From: Tim Waugh 
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://www.cups.org/str.php?L4348
Last-Updated: 2015-02-10
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch

Gbp-Pq: Name fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 7851956db..08a61960b 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1803,7 +1803,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From d6afbdc23718a20b67558282fa9fcc36387743ed Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Last-Update: 2015-08-05

Patch-Name: tests-ignore-warnings.patch

Gbp-Pq: Name tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From 942e49f07960d37a5937b09817ec138bf690010d Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Last-Update: 2015-02-10

Patch-Name: tests-ignore-usb-crash.patch

Gbp-Pq: Name tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From fa3c2d5c3411a89208480673c38aea30d9f0889c Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch

Gbp-Pq: Name tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 0499b9a06c41b1a5502b1a0a529340b85c1b4621 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch

Gbp-Pq: Name tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 8dc36a92525b8359053a9a2247f327c2a7cf0e3b Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Last-Update: 2016-08-09

Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch

Gbp-Pq: Name tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 28fc8f1c99de55cde6e91f23ef172a5567db6bc0 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: http://bugs.debian.org/662996

Last-Update: 2015-10-02
Patch-Name: test-i18n-nonlinux.patch

Gbp-Pq: Name test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 691edf5cf5778f1c560934e4d0eace253678b550 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: http://bugs.debian.org/670878
Last-Update: 2015-02-10

Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch

Gbp-Pq: Name tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..492982005 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    
" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From 471a69023d02631700e2c2d535ad661fbbbb2732 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch

Gbp-Pq: Name tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 914abbd42..13598c91b 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From 344de0f1c984c6c125bbd7b0cca88c0d4899fc6c Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Last-Update: 2016-08-05
Patch-Name: tests-use-ipv4-lo-address.patch

Gbp-Pq: Name tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 492982005..3f0becde9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From 2fc2632d6f23c030780af7295bd96d404f14920e Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Last-Update: 2016-07-11
Patch-Name: tests-make-lpstat-call-reproducible.patch

Gbp-Pq: Name tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 3f0becde9..baebdeec9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From f5b588fefa06ed3c9e6c2f602da94dfc26e8352e Mon Sep 17 00:00:00 2001
From: Michael Sweet 
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream

Patch-Name: tests-no-pdftourf.patch

Gbp-Pq: Name tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index baebdeec9..001e2f61f 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From 6f3b778b7749dd87a4dcd5a615045f22b54fff28 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://cups.org/str.php?L4342
Bug-Debian: http://bugs.debian.org/640124
Last-Update: 2015-02-10

Patch-Name: move-cupsd-conf-default-to-share.patch

Gbp-Pq: Name move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f8c57639f..fa4d82c2d 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 31060d7d7495b9ef905ed7bff71acbcb85f14280 Mon Sep 17 00:00:00 2001
From: Till Kamppeter 
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: http://bugs.debian.org/700961
Bug: https://cups.org/str.php?L4341
Last-Update: 2015-02-10

Patch-Name: airprint-support.patch

Gbp-Pq: Name airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 1984a659c..2578aa76b 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3811,7 +3811,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 4d7759e41bf7ab0e872546d512164f926d5b57e4 Mon Sep 17 00:00:00 2001
From: Tim Waugh 
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://www.cups.org/str.php?L3552

Gbp-Pq: Name 0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 72aefa29b624330e994feec0df3334922634e892 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673

Patch-Name: no-conffile-timestamp.patch

Gbp-Pq: Name no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 776e79a91..ec6357ffe 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index 81acecdfa..c39bd09d3 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 2578aa76b..149eaac7e 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1508,7 +1508,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 0908f3c0c..71892c7f4 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1084,7 +1084,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From bc6b87d5c94dd6f7d4350251599c6fe000d50300 Mon Sep 17 00:00:00 2001
From: Kenshi Muto 
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: http://www.cups.org/str.php?L2369
Origin: vendor
Author: Didier Raboud 
Last-Update: 2014-01-16

Patch-Name: removecvstag.patch

Gbp-Pq: Name removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From 0bd602e2194437dac435f8a06f912303163991c8 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch

Gbp-Pq: Name rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From 7fd5f40ebc32d395e1fcd643da702a904b042899 Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586

Patch-Name: do-not-broadcast-with-hostnames.patch

Gbp-Pq: Name do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 2eb3b9f239fc167411211f6c93bec66d7c031211 Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Last-Update: 2015-02-10

Patch-Name: reactivate_recommended_driver.patch

Gbp-Pq: Name reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 3d65de7df2a43601b550d3872963d45d1446637a Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953

Last-Update: 2015-02-10
Patch-Name: logfiles_adm_readable.patch

Gbp-Pq: Name logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index cdb5437dc..d53d1401c 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include 
 #endif /* HAVE_ASL_H */
 #include 
+#include 
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From b32d72417b6a5377c8f40b423d46f928bb7323fa Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Last-Update: 2015-02-10

Patch-Name: default_log_settings.patch

Gbp-Pq: Name default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From d7393c8abb4e4fe41af61ab80cc28e15b1000d8a Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Last-Update: 2015-02-10

Patch-Name: confdirperms.patch

Gbp-Pq: Name confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 50a3e503d2c33743e28249ddcfa895fd1002b29c Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch

Gbp-Pq: Name show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 65ae345bc..c71e8138f 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From 517538879f304aa3061c3aa0d9b3857ead7085df Mon Sep 17 00:00:00 2001
From: Tim Waugh 
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Last-Update: 2015-02-10

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch

Gbp-Pq: Name cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 
Specifies whether the scheduler calls
 fsync(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 
SystemGroup group-name [ ... group-name ]
 
Specifies the group(s) to use for @SYSTEM group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 5c08e9a9aae19ebd71b7f516fbeb046f54d9f8e5 Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job", since it is less

 confusing and a better default on most machines.
 .
 Amend documentation accordingly.
Author: Didier Raboud 
Origin: vendor
Last-Update: 2016-07-03

Patch-Name: cups-set-default-error-policy-retry-job.patch

Gbp-Pq: Name cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 10101dbbe..988916678 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 
ErrorPolicy retry-current-job
 
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 
ErrorPolicy retry-job
-
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 
ErrorPolicy stop-printer
-
Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+
Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 
FilterLimit limit
 
Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 5788265fa..79f17ea0c 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From 37ed16e88047fa105e4ab4c27d3212eaf6faf2b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= 
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: http://bugs.debian.org/570157
Last-Update: 2015-10-02
Patch-Name: man-cups-lpd-drop-dangling-references.patch

Gbp-Pq: Name man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From f85a97315a98acc5e066bfd852555556a0ea3756 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Last-Update: 2014-06-11
Patch-Name: debianize_cups-config.patch

Gbp-Pq: Name debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 9d6b2010eaee37e83aa72e9070477a4c7200e6b0 Mon Sep 17 00:00:00 2001
From: Helmut Grohne 
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936

Gbp-Pq: Name 0035-Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index c71e8138f..7b99dab98 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index c7f58b662..8ca5393ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 6bd7e75179f8c7be9e534caee9ef0993c72bf70d Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François , Helge Kreutzmann 
Origin: vendor
Bug-Debian: http://bugs.debian.org/478597

Patch-Name: manpage-translations.patch

Gbp-Pq: Name manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 35702ad8d4a1c022fa14d4feec3e297e170d8b41 Mon Sep 17 00:00:00 2001
From: Till Kamppeter 
Date: Tue, 9 Aug 2016 18:11:04 +0200
Subject: For PWG Raster, add required IPP attributes

Add required by IPP Everywhere for PWG Raster when PWG Raster as input format
is supported

Bug-Upstream: https://www.cups.org/str.php?L4428
Last-Update: 2015-02-10
Patch-Name: pwg-raster-attributes.patch

Gbp-Pq: Name pwg-raster-attributes.patch
---
 scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 75ef4c0d2..542523760 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
   cupsd_location_t *auth;		/* Pointer to authentication element */
   const char	*auth_supported;	/* Authentication supported */
   ipp_t		*oldattrs;		/* Old printer attributes */
-  ipp_attribute_t *attr;		/* Attribute data */
+  ipp_attribute_t *attr, *attr2;	/* Attribute data */
   char		*name,			/* Current user/group name */
 		*filter;		/* Current filter */
+  mime_type_t   *type;
 
 
  /*
@@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
 
   add_printer_formats(p);
 
+  /* 
+   * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input
+   * is supported
+   */
+  for (type = (mime_type_t *)cupsArrayFirst(p->filetypes);
+       type;
+       type = (mime_type_t *)cupsArrayNext(p->filetypes))
+  {
+    if (!_cups_strcasecmp(type->super, "image"))
+    {
+      if (!_cups_strcasecmp(type->type, "pwg-raster"))
+      {
+	if (p->ppd_attrs != NULL &&
+	    (attr = ippFindAttribute(p->ppd_attrs,
+				     "printer-resolution-supported",
+				     IPP_TAG_ZERO)) != NULL)
+	{
+	  attr2 = ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
+				    "pwg-raster-document-resolution-supported",
+				    attr->num_values, IPP_RES_PER_INCH,
+				    NULL, NULL);
+	  for (i = 0; i < attr->num_values; i ++)
+	  {
+	    attr2->values[i].resolution.xres =
+	      attr->values[i].resolution.xres;
+	    attr2->values[i].resolution.yres =
+	      attr->values[i].resolution.yres;
+	    attr2->values[i].resolution.units = IPP_RES_PER_INCH;
+	  }
+	}
+	else
+	{
+	  static const int	pwg_raster_document_resolution_supported[] =
+	  {
+	    300,
+	    600,
+	    1200
+	  };
+	  ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
+			    "pwg-raster-document-resolution-supported",
+			    (int)(sizeof(pwg_raster_document_resolution_supported) /
+				  sizeof(pwg_raster_document_resolution_supported[0])),
+			    IPP_RES_PER_INCH,
+			    pwg_raster_document_resolution_supported,
+			    pwg_raster_document_resolution_supported);
+	}
+	ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
+		     "pwg-raster-document-sheet-back", NULL, "normal");
+	static const char * const pwg_raster_document_type_supported[] =
+	{
+	  "adobergb-8",
+	  "adobergb-16",
+	  "black-1",
+	  "black-8",
+	  "black-16",
+	  "cmyk-8",
+	  "cmyk-16",
+	  "rgb-8",
+	  "rgb-16",
+	  "sgray-1",
+	  "sgray-8",
+	  "sgray-16",
+	  "srgb-8",
+	  "srgb-16"
+	};
+	ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
+		      "pwg-raster-document-type-supported",
+		      (int)(sizeof(pwg_raster_document_type_supported) /
+			    sizeof(pwg_raster_document_type_supported[0])), NULL,
+		      pwg_raster_document_type_supported);
+      }
+    }
+  }
+
  /*
   * Add name-default attributes...
   */
-- 
cgit v1.2.3


From 575d6399622b55bddeb220821316e02f60dea562 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://cups.org/str.php?L4299
Last-Update: 2015-02-10

Patch-Name: manpage-hyphen-minus.patch

Gbp-Pq: Name manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 8805561db..92f1d9575 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -64,7 +64,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -114,7 +114,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index 5753c69da..2fcda8b9f 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -129,8 +129,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -227,7 +227,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From 96d5ea207b05c8e6bcbcdddb0eb2330730cd3fdc Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: http://www.cups.org/str.php?L2935
Bug-Debian: http://bugs.debian.org/410171

Gbp-Pq: Name 0003-Install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index 2cfb1b03d..515fc8b5e 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From bcdf390daa8d914aeba020bc0f750c15597e55cb Mon Sep 17 00:00:00 2001
From: Tim Waugh 
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://www.cups.org/str.php?L4348
Last-Updated: 2015-02-10
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch

Gbp-Pq: Name fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 8226acc7b..5902dd6cb 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1803,7 +1803,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From 755fa5661633fd6fa26a5ac0147ad42c9db9174d Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Last-Update: 2015-08-05

Patch-Name: tests-ignore-warnings.patch

Gbp-Pq: Name tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From 4b291e3a21872ad14bf341ce51662dab6e8deea8 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Last-Update: 2015-02-10

Patch-Name: tests-ignore-usb-crash.patch

Gbp-Pq: Name tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From e3f3cd10911628f3681030e980b534c58aa63376 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch

Gbp-Pq: Name tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From a00ddb69a3d20834c3d77f69a3ec2e237f583b1d Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch

Gbp-Pq: Name tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From c16dd8df8c3b2afe66d403c275eb3fee8eb4589b Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Last-Update: 2016-08-09

Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch

Gbp-Pq: Name tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 662533588e580bebeec11dd67a5e402381d20950 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: http://bugs.debian.org/662996

Last-Update: 2015-10-02
Patch-Name: test-i18n-nonlinux.patch

Gbp-Pq: Name test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 4eaa33ca0308fbed576ddf050f1d669b21a875ea Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: http://bugs.debian.org/670878
Last-Update: 2015-02-10

Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch

Gbp-Pq: Name tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..492982005 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    
" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From eb5be967c46fa2a0ab8ee034d18e1a7a918bdda4 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch

Gbp-Pq: Name tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From e2f957f11b9a4932bb42032f73046a6aa0cc4638 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Last-Update: 2016-08-05
Patch-Name: tests-use-ipv4-lo-address.patch

Gbp-Pq: Name tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 492982005..3f0becde9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From 89e2b8f0312311fb3aec9eec32e33fd334616132 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Last-Update: 2016-07-11
Patch-Name: tests-make-lpstat-call-reproducible.patch

Gbp-Pq: Name tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 3f0becde9..baebdeec9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From 98701c7554f612df8a21d5dc03421aa03f0af24a Mon Sep 17 00:00:00 2001
From: Michael Sweet 
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream

Patch-Name: tests-no-pdftourf.patch

Gbp-Pq: Name tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index baebdeec9..001e2f61f 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From cae28e3295682dad209f6a3401c06667a9756cb2 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://cups.org/str.php?L4342
Bug-Debian: http://bugs.debian.org/640124
Last-Update: 2015-02-10

Patch-Name: move-cupsd-conf-default-to-share.patch

Gbp-Pq: Name move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 5da4b6884e3d3a9c52ecbd6ef25db23973439ea6 Mon Sep 17 00:00:00 2001
From: Till Kamppeter 
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: http://bugs.debian.org/700961
Bug: https://cups.org/str.php?L4341
Last-Update: 2015-02-10

Patch-Name: airprint-support.patch

Gbp-Pq: Name airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 542523760..b366bf588 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3806,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 181cd364383ea4d757347758745d8a32e9d404cf Mon Sep 17 00:00:00 2001
From: Tim Waugh 
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://www.cups.org/str.php?L3552

Gbp-Pq: Name 0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 5e3c93c0ca145ed5367ef79aa4963872f2d5fdc6 Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673

Patch-Name: no-conffile-timestamp.patch

Gbp-Pq: Name no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 776e79a91..ec6357ffe 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index 515fc8b5e..9c197efc9 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index b366bf588..10ae91234 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 3267a2ff6..2542ab148 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 47044312776535303cdc1d35409dfcdcc30c97f5 Mon Sep 17 00:00:00 2001
From: Kenshi Muto 
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: http://www.cups.org/str.php?L2369
Origin: vendor
Author: Didier Raboud 
Last-Update: 2014-01-16

Patch-Name: removecvstag.patch

Gbp-Pq: Name removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From 97ebe4040f54e7158daf72763dbe45ea865b4150 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch

Gbp-Pq: Name rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From 635aff45bb7c4fa5528fa9506fb5db42e9353689 Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586

Patch-Name: do-not-broadcast-with-hostnames.patch

Gbp-Pq: Name do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 4b990bd3cc3e61ea26c33f7ce1a171bc86bc0c52 Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Last-Update: 2015-02-10

Patch-Name: reactivate_recommended_driver.patch

Gbp-Pq: Name reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 5a70bbd5b2ec6e371d7191aa6dfdf39e3e0e6d62 Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953

Last-Update: 2015-02-10
Patch-Name: logfiles_adm_readable.patch

Gbp-Pq: Name logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index cdb5437dc..d53d1401c 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include 
 #endif /* HAVE_ASL_H */
 #include 
+#include 
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From d3a0c2c2a9d427f5b1db9ef67ba352738ded5d3b Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Last-Update: 2015-02-10

Patch-Name: default_log_settings.patch

Gbp-Pq: Name default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From f8c89a3a0f72c0af075829448bdadb690db88108 Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Last-Update: 2015-02-10

Patch-Name: confdirperms.patch

Gbp-Pq: Name confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 8ecf9725e4baa41c5aaa75c10f3840d342cd10c8 Mon Sep 17 00:00:00 2001
From: Till Kampetter 
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch

Gbp-Pq: Name show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From d794845242b8e471d3032c1807ee33fcb7af38ac Mon Sep 17 00:00:00 2001
From: Tim Waugh 
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Last-Update: 2015-02-10

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch

Gbp-Pq: Name cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 
Specifies whether the scheduler calls
 fsync(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 
SystemGroup group-name [ ... group-name ]
 
Specifies the group(s) to use for @SYSTEM group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From b73753243d86d3841acb3ff804aef7cd6889dccc Mon Sep 17 00:00:00 2001
From: Martin Pitt 
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job", since it is less

 confusing and a better default on most machines.
 .
 Amend documentation accordingly.
Author: Didier Raboud 
Origin: vendor
Last-Update: 2016-07-03

Patch-Name: cups-set-default-error-policy-retry-job.patch

Gbp-Pq: Name cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 
ErrorPolicy retry-current-job
 
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 
ErrorPolicy retry-job
-
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 
ErrorPolicy stop-printer
-
Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+
Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 
FilterLimit limit
 
Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From d7d3afd1a7b7848b19bcafa80d4433871f7d43f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= 
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: http://bugs.debian.org/570157
Last-Update: 2015-10-02
Patch-Name: man-cups-lpd-drop-dangling-references.patch

Gbp-Pq: Name man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 66cc04f07baa7b3ebbe3eb50178b9efddbce444f Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Last-Update: 2014-06-11
Patch-Name: debianize_cups-config.patch

Gbp-Pq: Name debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From b7183b4fdf02fe29134b8ae30f68a676907d0399 Mon Sep 17 00:00:00 2001
From: Helmut Grohne 
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936

Gbp-Pq: Name 0035-Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 7eca9e37f..2dfdbb93c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From e69e1104c33c7eeff2cefb02315a72e575ae0d60 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François , Helge Kreutzmann 
Origin: vendor
Bug-Debian: http://bugs.debian.org/478597

Patch-Name: manpage-translations.patch

Gbp-Pq: Name manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From f657fa9087cf49d44c5b072f60f9cf0b29ee4ba1 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Mon, 2 Sep 2019 09:21:57 +0200
Subject: Rewrite debian/copyright with upstream's Apache2 + GPL2/LGPL2
 exception

---
 debian/copyright | 139 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 84 insertions(+), 55 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a0c0c06a1..6fd360b5f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,81 +3,54 @@ Upstream-Name: CUPS
 Upstream-Contact: Michael Sweet 
 Source: https://www.cups.org/software.html
 Copyright: 2005-2018, Apple Inc.
-License: Apache-2.0
+License: Apache-2.0-with-GPL2-LGPL2-Exception
 
 Files: *
-Copyright: 2005-2018, Apple Inc.
-           1993-2007, Easy Software Products
-License: Apache-2.0
+Copyright: 2007-2019, Apple Inc.
+  1993-2007, Easy Software Products
+License: Apache-2.0-with-GPL2-LGPL2-Exception
 
 Files: config-scripts/cups-gssapi.m4
-       cups/auth.c
-       cups/http.c
-       cups/tls.c
-       scheduler/auth.c
-       scheduler/client.c
-Copyright: 2007-2017, Apple Inc.
-  2006, Jelmer Vernooij.
-  1997-2007, Easy Software Products.
-License: Apache-2.0
+ cups/auth.c
+ cups/http.c
+ cups/tls.c
+ scheduler/auth.c
+ scheduler/client.c
+ scheduler/ipp.c
+Copyright: 2007-2019, Apple Inc.
+  1993-2007, Easy Software Products
+  2006, Jelmer Vernooij
+License: Apache-2.0-with-GPL2-LGPL2-Exception
 
 Files: configure
-Copyright: 1992-1996, 1998-2010, Free Software
+Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
 License: FSFUL
  This configure script is free software; the Free Software Foundation gives
  unlimited permission to copy, distribute and modify it.
 
-Files: cups/md5-private.h
+Files: cups/md5-internal.h
   cups/md5.c
-Copyright: 2007-2017, Apple Inc.
-  2005, Easy Software Products
+Copyright: 2007-2019, Apple Inc.
+  1993-2007, Easy Software Products
   1999, Aladdin Enterprises.
 License: Zlib
 
-Files: scheduler/colorman.c
-Copyright: 2011, Red Hat, Inc
- 2007-2014, Apple Inc
- 1997-2007, Easy Software Products
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
-   Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- .
-   Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
 Files: debian/local/*
 Copyright: 2009, Canonical Ltd.
 License: Apache-2.0
 
 Files: notifier/dbus.c
-Copyright: 2011, 2013, Red Hat, Inc.
-  2008-2014, Apple Inc.
-  2007, Tim Waugh 
-  1997-2005, Easy Software Products.
-License: Apache-2.0
+Copyright: 2007-2019, Apple Inc.
+  1993-2007, Easy Software Products
+  2011, 2013 Red Hat, Inc.
+  2007 Tim Waugh 
+License: Apache-2.0-with-GPL2-LGPL2-Exception
 
-Files: scheduler/ipp.c
-Copyright: 2006, Jelmer Vernooij.
-License: Apache-2.0
+Files: scheduler/colorman.c
+Copyright: 2011, Red Hat, Inc.
+  2007-2019, Apple Inc.
+  1993-2007, Easy Software Products
+License: Apache-2.0-with-GPL2-LGPL2-Exception or BSD-2-clause
 
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -93,6 +66,62 @@ License: Apache-2.0
  On Debian systems, the complete text of the Apache License,
  Version 2.0 can be found in '/usr/share/common-licenses/Apache-2.0'.
 
+License: Apache-2.0-with-GPL2-LGPL2-Exception
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS"BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License,
+ Version 2.0 can be found in '/usr/share/common-licenses/Apache-2.0'.
+ .
+ As an exception, if, as a result of your compiling your source code, portions
+ of this Software are embedded into an Object form of such source code, you
+ may redistribute such embedded portions in such Object form without complying
+ with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
+ .
+ In addition, if you combine or link compiled forms of this Software with
+ software that is licensed under the GPLv2 ("Combined Software") and if a
+ court of competent jurisdiction determines that the patent provision (Section
+ 3), the indemnity provision (Section 9) or other Section of the License
+ conflicts with the conditions of the GPLv2, you may retroactively and
+ prospectively choose to deem waived or otherwise exclude such Section(s) of
+ the License, but only in their entirety and only with respect to the Combined
+ Software.
+
+License: BSD-3-clause
+ This software is Copyright (c) 2019 by foo.
+ This is free software, licensed under:
+ The (three-clause) BSD License
+ The BSD License
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of foo nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: Zlib
  The zlib License
  .
-- 
cgit v1.2.3


From c0c907c7df69261cf134e4606153ba4eee805c91 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Mon, 2 Sep 2019 11:55:11 +0200
Subject: Install Apache2's NOTICE file in cups'docs

---
 debian/cups.docs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/cups.docs b/debian/cups.docs
index 1c48226de..8062bdcda 100644
--- a/debian/cups.docs
+++ b/debian/cups.docs
@@ -1,3 +1,4 @@
 CREDITS.md
+NOTICE
 README.md
 debian/HOWTO_BUGREPORT.txt
-- 
cgit v1.2.3


From 3c0c0c9128e5cbf01a7f823d1974ce996b09a521 Mon Sep 17 00:00:00 2001
From: Didier Raboud 
Date: Mon, 2 Sep 2019 10:51:37 +0200
Subject: Refresh manpage translations

---
 debian/manpage-po4a/po/cups.pot |  8899 ++++++++---------
 debian/manpage-po4a/po/de.po    | 19748 +++++++++++++++++++-------------------
 debian/manpage-po4a/po/fr.po    | 14764 ++++++++++++++--------------
 3 files changed, 22033 insertions(+), 21378 deletions(-)

diff --git a/debian/manpage-po4a/po/cups.pot b/debian/manpage-po4a/po/cups.pot
index 71eb446c5..8a1ad0ac8 100644
--- a/debian/manpage-po4a/po/cups.pot
+++ b/debian/manpage-po4a/po/cups.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-08-17 15:33+0200\n"
+"POT-Creation-Date: 2019-09-02 10:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -17,70 +17,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
-#: backend.man:13
+#: backend.7:10
 #, no-wrap
 msgid "backend"
 msgstr ""
 
 #. type: TH
-#: backend.man:13 cancel.man:13 classes.conf.man:13 client.conf.man.in:13 cupsaccept.man:13 cupsaddsmb.man.in:13 cups-config.man:13 cupsctl.man:13 cupsd.conf.man.in:13 cupsd-helper.man:13 cupsd-logs.man:13 cupsd.man.in:13 cupsenable.man:13 cups-files.conf.man.in:13 cupsfilter.man:12 cups-lpd.man.in:13 cups.man:13 cups-snmp.conf.man:13 cups-snmp.man.in:12 cupstestdsc.man:13 cupstestppd.man:13 filter.man:13 ippfind.man:12 ../test/ippserver.man:12 ipptoolfile.man:12 ipptool.man:12 lpadmin.man:13 lpc.man:13 lpinfo.man:13 lp.man:13 lpmove.man:13 lpoptions.man.in:13 lpq.man:13 lpr.man:13 lprm.man:13 lpstat.man:13 mailto.conf.man:13 mime.convs.man:13 mime.types.man:13 notifier.man:13 ppdcfile.man:13 ppdc.man:13 ppdhtml.man:13 ppdi.man:13 ppdmerge.man:13 ppdpo.man:13 printers.conf.man:13 subscriptions.conf.man:13
+#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10 cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10 cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10 cupsfilter.8:9 cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10 cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ipptool.1:9 ipptoolfile.5:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10 lpmove.8:10 lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9 mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10 ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10 printers.conf.5:9 subscriptions.conf.5:10
 #, no-wrap
 msgid "CUPS"
 msgstr ""
 
 #. type: TH
-#: backend.man:13
+#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10 cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10 cupsfilter.8:9 cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10 cupstestppd.1:10 filter.7:10 ippfind.1:9 ipptool.1:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10 lpmove.8:10 lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9 mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10 ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10 printers.conf.5:9 subscriptions.conf.5:10
 #, no-wrap
-msgid "4 April 2014"
+msgid "26 April 2019"
 msgstr ""
 
 #. type: TH
-#: backend.man:13 cancel.man:13 classes.conf.man:13 client.conf.man.in:13 cupsaccept.man:13 cupsaddsmb.man.in:13 cups-config.man:13 cupsctl.man:13 cupsd.conf.man.in:13 cupsd-helper.man:13 cupsd-logs.man:13 cupsd.man.in:13 cupsenable.man:13 cups-files.conf.man.in:13 cupsfilter.man:12 cups-lpd.man.in:13 cups.man:13 cups-snmp.conf.man:13 cups-snmp.man.in:12 cupstestdsc.man:13 cupstestppd.man:13 filter.man:13 ippfind.man:12 ../test/ippserver.man:12 ipptoolfile.man:12 ipptool.man:12 lpadmin.man:13 lpc.man:13 lpinfo.man:13 lp.man:13 lpmove.man:13 lpoptions.man.in:13 lpq.man:13 lpr.man:13 lprm.man:13 lpstat.man:13 mailto.conf.man:13 mime.convs.man:13 mime.types.man:13 notifier.man:13 ppdcfile.man:13 ppdc.man:13 ppdhtml.man:13 ppdi.man:13 ppdmerge.man:13 ppdpo.man:13 printers.conf.man:13 subscriptions.conf.man:13
+#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10 cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10 cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10 cupsfilter.8:9 cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10 cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ippfind.1:9 ipptool.1:9 ipptoolfile.5:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10 lpmove.8:10 lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9 mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10 ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10 printers.conf.5:9 subscriptions.conf.5:10
 #, no-wrap
 msgid "Apple Inc."
 msgstr ""
 
 #. type: SH
-#: backend.man:14 cancel.man:14 classes.conf.man:14 client.conf.man.in:14 cupsaccept.man:14 cupsaddsmb.man.in:14 cups-config.man:14 cupsctl.man:14 cupsd.conf.man.in:14 cupsd-helper.man:14 cupsd-logs.man:14 cupsd.man.in:14 cupsenable.man:14 cups-files.conf.man.in:14 cupsfilter.man:13 cups-lpd.man.in:14 cups.man:14 cups-snmp.conf.man:14 cups-snmp.man.in:13 cupstestdsc.man:14 cupstestppd.man:14 filter.man:14 ippfind.man:13 ../test/ippserver.man:13 ipptoolfile.man:13 ipptool.man:13 lpadmin.man:14 lpc.man:14 lpinfo.man:14 lp.man:14 lpmove.man:14 lpoptions.man.in:14 lpq.man:14 lpr.man:14 lprm.man:14 lpstat.man:14 mailto.conf.man:14 mime.convs.man:14 mime.types.man:14 notifier.man:14 ppdcfile.man:14 ppdc.man:14 ppdhtml.man:14 ppdi.man:14 ppdmerge.man:14 ppdpo.man:14 printers.conf.man:14 subscriptions.conf.man:14
+#: backend.7:11 cancel.1:11 classes.conf.5:11 client.conf.5:11 cups.1:11 cupsaccept.8:11 cups-config.1:11 cupsctl.8:11 cupsd.8:11 cupsd.conf.5:11 cupsd-helper.8:11 cupsd-logs.5:11 cupsenable.8:11 cups-files.conf.5:11 cupsfilter.8:10 cups-lpd.8:11 cups-snmp.8:10 cups-snmp.conf.5:11 cupstestppd.1:11 filter.7:11 ippevepcl.7:10 ippeveprinter.1:10 ippfind.1:10 ipptool.1:10 ipptoolfile.5:10 lp.1:11 lpadmin.8:11 lpc.8:11 lpinfo.8:11 lpmove.8:11 lpoptions.1:11 lpq.1:11 lpr.1:11 lprm.1:11 lpstat.1:10 mailto.conf.5:11 mime.convs.5:11 mime.types.5:11 notifier.7:11 ppdc.1:11 ppdcfile.5:11 ppdhtml.1:11 ppdi.1:11 ppdmerge.1:11 ppdpo.1:11 printers.conf.5:10 subscriptions.conf.5:11
 #, no-wrap
 msgid "NAME"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:16
+#: backend.7:13
 msgid "backend - cups backend transmission interfaces"
 msgstr ""
 
 #. type: SH
-#: backend.man:16 cancel.man:16 cupsaccept.man:16 cupsaddsmb.man.in:17 cups-config.man:16 cupsctl.man:16 cupsd-helper.man:16 cupsd.man.in:16 cupsenable.man:16 cupsfilter.man:15 cups-lpd.man.in:16 cups-snmp.man.in:15 cupstestdsc.man:16 cupstestppd.man:16 filter.man:16 ippfind.man:15 ../test/ippserver.man:15 ipptool.man:15 lpadmin.man:16 lpc.man:16 lpinfo.man:16 lp.man:16 lpmove.man:16 lpoptions.man.in:16 lpq.man:16 lpr.man:16 lprm.man:16 lpstat.man:16 notifier.man:16 ppdc.man:16 ppdhtml.man:16 ppdi.man:16 ppdmerge.man:16 ppdpo.man:16
+#: backend.7:13 cancel.1:13 cupsaccept.8:13 cups-config.1:13 cupsctl.8:13 cupsd.8:13 cupsd-helper.8:13 cupsenable.8:13 cupsfilter.8:12 cups-lpd.8:13 cups-snmp.8:12 cupstestppd.1:13 filter.7:13 ippevepcl.7:12 ippeveprinter.1:12 ippfind.1:12 ipptool.1:12 lp.1:13 lpadmin.8:13 lpc.8:13 lpinfo.8:13 lpmove.8:13 lpoptions.1:13 lpq.1:13 lpr.1:13 lprm.1:13 lpstat.1:12 notifier.7:13 ppdc.1:13 ppdhtml.1:13 ppdi.1:13 ppdmerge.1:13 ppdpo.1:13
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:18
+#: backend.7:15
 msgid "B"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:28
+#: backend.7:25
 msgid "B I I I I<num-copies> I<options> [ I<filename> ]"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:31 filter.man:29
+#: backend.7:28 filter.7:26
 #, no-wrap
 msgid "B<#include E<lt>cups/cups.hE<gt>>\n"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:33
+#: backend.7:30
 #, no-wrap
 msgid "B<const char *cupsBackendDeviceURI>(B<char **>I<argv>);\n"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:40
+#: backend.7:37
 #, no-wrap
 msgid ""
 "B<void cupsBackendReport>(B<const char *>I<device_scheme>,\n"
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: backend.man:43
+#: backend.7:40
 #, no-wrap
 msgid ""
 "B<ssize_t cupsBackChannelWrite>(B<const char *>I<buffer>,\n"
@@ -100,7 +100,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: backend.man:47
+#: backend.7:44
 #, no-wrap
 msgid ""
 "B<int cupsSideChannelRead>(B<cups_sc_command_t *>I<command>,\n"
@@ -109,7 +109,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: backend.man:51
+#: backend.7:48
 #, no-wrap
 msgid ""
 "B<int cupsSideChannelWrite>(B<cups_sc_command_t >I<command>,\n"
@@ -119,20 +119,20 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: backend.man:52 cancel.man:40 classes.conf.man:16 client.conf.man.in:16 cupsaccept.man:43 cupsaddsmb.man.in:50 cups-config.man:52 cupsctl.man:39 cupsd.conf.man.in:16 cupsd-helper.man:49 cupsd-logs.man:16 cupsd.man.in:35 cupsenable.man:49 cups-files.conf.man.in:16 cupsfilter.man:57 cups-lpd.man.in:26 cups.man:16 cups-snmp.conf.man:16 cups-snmp.man.in:26 cupstestdsc.man:31 cupstestppd.man:54 filter.man:54 ippfind.man:35 ../test/ippserver.man:62 ipptoolfile.man:15 ipptool.man:75 lpadmin.man:57 lpc.man:23 lpinfo.man:63 lp.man:87 lpmove.man:40 lpoptions.man.in:56 lpq.man:34 lpr.man:56 lprm.man:34 lpstat.man:69 mailto.conf.man:16 mime.convs.man:16 mime.types.man:16 notifier.man:22 ppdcfile.man:16 ppdc.man:48 ppdhtml.man:25 ppdi.man:29 ppdmerge.man:27 ppdpo.man:28 printers.conf.man:16 subscriptions.conf.man:16
+#: backend.7:49 cancel.1:37 classes.conf.5:13 client.conf.5:13 cups.1:13 cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:13 cupsd-helper.8:46 cupsd-logs.5:13 cupsenable.8:46 cups-files.conf.5:13 cupsfilter.8:54 cups-lpd.8:23 cups-snmp.8:23 cups-snmp.conf.5:13 cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:79 ippfind.1:32 ipptool.1:75 ipptoolfile.5:12 lp.1:84 lpadmin.8:54 lpc.8:20 lpinfo.8:60 lpmove.8:37 lpoptions.1:53 lpq.1:31 lpr.1:53 lprm.1:31 lpstat.1:65 mailto.conf.5:13 mime.convs.5:13 mime.types.5:13 notifier.7:19 ppdc.1:45 ppdcfile.5:13 ppdhtml.1:22 ppdi.1:26 ppdmerge.1:24 ppdpo.1:25 printers.conf.5:12 subscriptions.conf.5:13
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:56
+#: backend.7:53
 msgid ""
 "Backends are a special type of B<filter>(7)  which is used to send print "
 "data to and discover different devices on the system."
 msgstr ""
 
 #. type: Plain text
-#: backend.man:58
+#: backend.7:55
 msgid ""
 "Like filters, backends must be capable of reading from a filename on the "
 "command-line or from the standard input, copying the standard input to a "
@@ -140,24 +140,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: backend.man:66
+#: backend.7:64
 msgid ""
 "The command name (I<argv[0]>) is set to the device URI of the destination "
-"printer. Authentication information in I<argv[0]> is removed, so backend "
+"printer.  Authentication information in I<argv[0]> is removed, so backend "
 "developers are urged to use the B<DEVICE_URI> environment variable whenever "
 "authentication information is required. The B<cupsBackendDeviceURI>()  "
 "function may be used to retrieve the correct device URI."
 msgstr ""
 
 #. type: Plain text
-#: backend.man:68
+#: backend.7:66
 msgid ""
 "Back-channel data from the device should be relayed to the job filters using "
 "the I<cupsBackChannelWrite> function."
 msgstr ""
 
 #. type: Plain text
-#: backend.man:76
+#: backend.7:74
 msgid ""
 "Backends are responsible for reading side-channel requests using the "
 "B<cupsSideChannelRead>()  function and responding with the "
@@ -166,21 +166,21 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: backend.man:76
+#: backend.7:74
 #, no-wrap
 msgid "DEVICE DISCOVERY"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:78
+#: backend.7:77
 msgid ""
 "When run with no arguments, the backend should list the devices and schemes "
-"it supports or is advertising to the standard output. The output consists of "
-"zero or more lines consisting of any of the following forms:"
+"it supports or is advertising to the standard output.  The output consists "
+"of zero or more lines consisting of any of the following forms:"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:84
+#: backend.7:83
 #, no-wrap
 msgid ""
 "    device-class scheme \"Unknown\" \"device-info\"\n"
@@ -192,102 +192,102 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: backend.man:89
+#: backend.7:88
 msgid ""
 "The B<cupsBackendReport>()  function can be used to generate these lines and "
 "handle any necessary escaping of characters in the various strings."
 msgstr ""
 
 #. type: Plain text
-#: backend.man:93
+#: backend.7:92
 msgid "The I<device-class> field is one of the following values:"
 msgstr ""
 
 #. type: TP
-#: backend.man:93
+#: backend.7:92
 #, no-wrap
 msgid "B<direct>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:96
+#: backend.7:95
 msgid ""
 "The device-uri refers to a specific direct-access device with no options, "
 "such as a parallel, USB, or SCSI device."
 msgstr ""
 
 #. type: TP
-#: backend.man:96
+#: backend.7:95
 #, no-wrap
 msgid "B<file>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:99
+#: backend.7:98
 msgid "The device-uri refers to a file on disk."
 msgstr ""
 
 #. type: TP
-#: backend.man:99
+#: backend.7:98
 #, no-wrap
 msgid "B<network>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:103
+#: backend.7:102
 msgid ""
 "The device-uri refers to a networked device and conforms to the general form "
 "for network URIs."
 msgstr ""
 
 #. type: TP
-#: backend.man:103
+#: backend.7:102
 #, no-wrap
 msgid "B<serial>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:106
+#: backend.7:106
 msgid ""
 "The device-uri refers to a serial device with configurable baud rate and "
-"other options. If the device-uri contains a baud value, it represents the "
+"other options.  If the device-uri contains a baud value, it represents the "
 "maximum baud rate supported by the device."
 msgstr ""
 
 #. type: Plain text
-#: backend.man:112
+#: backend.7:114
 msgid ""
 "The I<scheme> field provides the URI scheme that is supported by the "
-"backend. Backends should use this form only when the backend supports any "
-"URI using that scheme. The I<device-uri> field specifies the full URI to use "
-"when communicating with the device."
+"backend.  Backends should use this form only when the backend supports any "
+"URI using that scheme.  The I<device-uri> field specifies the full URI to "
+"use when communicating with the device."
 msgstr ""
 
 #. type: Plain text
-#: backend.man:116
+#: backend.7:119
 msgid ""
 "The I<device-make-and-model> field specifies the make and model of the "
-"device, e.g. \"Example Foojet 2000\". If the make and model is not known, "
+"device, e.g. \"Example Foojet 2000\".  If the make and model is not known, "
 "you must report \"Unknown\"."
 msgstr ""
 
 #. type: Plain text
-#: backend.man:120
+#: backend.7:124
 msgid ""
-"The I<device-info> field specifies additional information about the "
-"device. Typically this includes the make and model along with the port "
-"number or network address, e.g. \"Example Foojet 2000 USB #1\"."
+"The I<device-info> field specifies additional information about the device.  "
+"Typically this includes the make and model along with the port number or "
+"network address, e.g. \"Example Foojet 2000 USB #1\"."
 msgstr ""
 
 #. type: Plain text
-#: backend.man:124
+#: backend.7:128
 msgid ""
 "The optional I<device-id> field specifies the IEEE-1284 device ID string for "
 "the device, which is used to select a matching driver."
 msgstr ""
 
 #. type: Plain text
-#: backend.man:128
+#: backend.7:132
 msgid ""
 "The optional I<device-location> field specifies the physical location of the "
 "device, which is often used to pre-populate the printer-location attribute "
@@ -295,256 +295,258 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: backend.man:128
+#: backend.7:132
 #, no-wrap
 msgid "PERMISSIONS"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:130
+#: backend.7:135
 msgid ""
 "Backends without world read and execute permissions are run as the root "
-"user. Otherwise, the backend is run using an unprivileged user account, "
+"user.  Otherwise, the backend is run using an unprivileged user account, "
 "typically \"lp\"."
 msgstr ""
 
 #. type: SH
-#: backend.man:130 cupsfilter.man:105 cupstestppd.man:113 ippfind.man:217 ../test/ippserver.man:130 ipptool.man:186
+#: backend.7:135 cupsfilter.8:102 cupstestppd.1:110 ippevepcl.7:39 ippeveprinter.1:183 ippfind.1:214 ipptool.1:191
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:132
+#: backend.7:137
 msgid "The following exit codes are defined for backends:"
 msgstr ""
 
 #. type: TP
-#: backend.man:132
+#: backend.7:137
 #, no-wrap
 msgid "B<CUPS_BACKEND_OK>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:135
+#: backend.7:140
 msgid "The print file was successfully transmitted to the device or remote server."
 msgstr ""
 
 #. type: TP
-#: backend.man:135
+#: backend.7:140
 #, no-wrap
 msgid "B<CUPS_BACKEND_FAILED>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:141
+#: backend.7:147
 msgid ""
 "The print file was not successfully transmitted to the device or remote "
-"server. The scheduler will respond to this by canceling the job, retrying "
+"server.  The scheduler will respond to this by canceling the job, retrying "
 "the job, or stopping the queue depending on the state of the "
 "I<printer-error-policy> attribute."
 msgstr ""
 
 #. type: TP
-#: backend.man:141
+#: backend.7:147
 #, no-wrap
 msgid "B<CUPS_BACKEND_AUTH_REQUIRED>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:144
+#: backend.7:151
 msgid ""
 "The print file was not successfully transmitted because valid authentication "
-"information is required. The scheduler will respond to this by holding the "
+"information is required.  The scheduler will respond to this by holding the "
 "job and adding the 'cups-held-for-authentication' keyword to the "
 "\"job-reasons\" Job Description attribute."
 msgstr ""
 
 #. type: TP
-#: backend.man:144
+#: backend.7:151
 #, no-wrap
 msgid "B<CUPS_BACKEND_HOLD>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:147
+#: backend.7:155
 msgid ""
 "The print file was not successfully transmitted because it cannot be printed "
-"at this time. The scheduler will respond to this by holding the job."
+"at this time.  The scheduler will respond to this by holding the job."
 msgstr ""
 
 #. type: TP
-#: backend.man:147
+#: backend.7:155
 #, no-wrap
 msgid "B<CUPS_BACKEND_STOP>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:150
+#: backend.7:159
 msgid ""
 "The print file was not successfully transmitted because it cannot be printed "
-"at this time. The scheduler will respond to this by stopping the queue."
+"at this time.  The scheduler will respond to this by stopping the queue."
 msgstr ""
 
 #. type: TP
-#: backend.man:150
+#: backend.7:159
 #, no-wrap
 msgid "B<CUPS_BACKEND_CANCEL>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:153
+#: backend.7:163
 msgid ""
 "The print file was not successfully transmitted because one or more "
-"attributes are not supported or the job was canceled at the printer. The "
+"attributes are not supported or the job was canceled at the printer.  The "
 "scheduler will respond to this by canceling the job."
 msgstr ""
 
 #. type: TP
-#: backend.man:153
+#: backend.7:163
 #, no-wrap
 msgid "B<CUPS_BACKEND_RETRY>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:156
+#: backend.7:167
 msgid ""
 "The print file was not successfully transmitted because of a temporary "
-"issue. The scheduler will retry the job at a future time - other jobs may "
+"issue.  The scheduler will retry the job at a future time - other jobs may "
 "print before this one."
 msgstr ""
 
 #. type: TP
-#: backend.man:156
+#: backend.7:167
 #, no-wrap
 msgid "B<CUPS_BACKEND_RETRY_CURRENT>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:159
+#: backend.7:171
 msgid ""
 "The print file was not successfully transmitted because of a temporary "
-"issue. The scheduler will retry the job immediately without allowing "
+"issue.  The scheduler will retry the job immediately without allowing "
 "intervening jobs."
 msgstr ""
 
 #. type: Plain text
-#: backend.man:161
+#: backend.7:173
 msgid "All other exit code values are reserved."
 msgstr ""
 
 #. type: SH
-#: backend.man:161 cupsfilter.man:108 cups.man:63 cups-snmp.man.in:40 ippfind.man:219 ../test/ippserver.man:141
+#: backend.7:173 cups.1:60 cupsfilter.8:105 cups-snmp.8:37 ippevepcl.7:41 ippeveprinter.1:194 ippfind.1:216
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:167
+#: backend.7:179
 msgid ""
 "In addition to the environment variables listed in B<cups>(1)  and "
 "B<filter>(7), CUPS backends can expect the following environment variable:"
 msgstr ""
 
 #. type: TP
-#: backend.man:167
+#: backend.7:179
 #, no-wrap
 msgid "B<DEVICE_URI>"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:170
+#: backend.7:182
 msgid "The device URI associated with the printer."
 msgstr ""
 
 #. type: SH
-#: backend.man:170 cupsd-helper.man:59 cupsd.man.in:74 cupsfilter.man:113 cups-lpd.man.in:57 cups.man:117 cups-snmp.man.in:43 ipptool.man:190 lpoptions.man.in:107 mime.convs.man:40 mime.types.man:90
+#: backend.7:182 cups.1:114 cupsd.8:71 cupsd-helper.8:56 cupsfilter.8:110 cups-lpd.8:54 cups-snmp.8:40 ipptool.1:195 lpoptions.1:104 mime.convs.5:37 mime.types.5:87
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:172
+#: backend.7:184
 msgid "I</etc/cups/cups-files.conf>"
 msgstr ""
 
 #. type: SH
-#: backend.man:172 cancel.man:84 classes.conf.man:20 client.conf.man.in:86 cupsfilter.man:120 cups-lpd.man.in:63 cupstestdsc.man:35 filter.man:204 lpadmin.man:199 lpc.man:43 lpr.man:187 ppdmerge.man:38 printers.conf.man:20 subscriptions.conf.man:20
+#: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:110 cups.1:122 cupsd.conf.5:858 cupsd-helper.8:77 cups-files.conf.5:273 cupsfilter.8:117 cups-lpd.8:60 cups-snmp.8:44 cups-snmp.conf.5:58 cupstestppd.1:138 filter.7:201 lpadmin.8:203 lpc.8:40 lpinfo.8:117 lpr.1:151 mime.convs.5:50 ppdc.1:90 ppdcfile.5:149 ppdhtml.1:35 ppdi.1:42 ppdmerge.1:35 ppdpo.1:42 printers.conf.5:16 subscriptions.conf.5:19
 #, no-wrap
 msgid "NOTES"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:178
+#: backend.7:192
 msgid ""
-"CUPS backends are not generally designed to be run directly by the "
-"user. Aside from the device URI issue ( I<argv[0]> and B<DEVICE_URI> "
-"environment variable contain the device URI), CUPS backends also expect "
-"specific environment variables and file descriptors, and typically run in a "
-"user session that (on macOS) has additional restrictions that affect how it "
-"runs. Backends can also be installed with restricted permissions (0500 or "
+"CUPS backends are not generally designed to be run directly by the user.  "
+"Aside from the device URI issue ( I<argv[0]> and B<DEVICE_URI> environment "
+"variable contain the device URI), CUPS backends also expect specific "
+"environment variables and file descriptors, and typically run in a user "
+"session that (on macOS) has additional restrictions that affect how it "
+"runs.  Backends can also be installed with restricted permissions (0500 or "
 "0700) that tell the scheduler to run them as the \"root\" user instead of an "
 "unprivileged user (typically \"lp\") on the system."
 msgstr ""
 
 #. type: Plain text
-#: backend.man:188
+#: backend.7:204
 msgid ""
 "Unless you are a developer and know what you are doing, please do not run "
-"backends directly. Instead, use the B<lp>(1)  or B<lpr>(1)  programs to send "
-"print jobs or B<lpinfo>(8)  to query for available printers using the "
-"backend. The one exception is the SNMP backend - see B<cups-snmp>(8)  for "
+"backends directly.  Instead, use the B<lp>(1)  or B<lpr>(1)  programs to "
+"send print jobs or B<lpinfo>(8)  to query for available printers using the "
+"backend.  The one exception is the SNMP backend - see B<cups-snmp>(8)  for "
 "more information."
 msgstr ""
 
+#. type: Plain text
+#: backend.7:208 filter.7:205 lpadmin.8:207 lpinfo.8:121
+msgid ""
+"CUPS printer drivers and backends are deprecated and will no longer be "
+"supported in a future feature release of CUPS.  Printers that do not support "
+"IPP can be supported using applications such as B<ippeveprinter>(1)."
+msgstr ""
+
 #. type: SH
-#: backend.man:188 cancel.man:87 classes.conf.man:22 client.conf.man.in:98 cupsaccept.man:80 cupsaddsmb.man.in:119 cups-config.man:107 cupsctl.man:95 cupsd.conf.man.in:869 cupsd-helper.man:80 cupsd-logs.man:219 cupsd.man.in:112 cupsenable.man:91 cups-files.conf.man.in:276 cupsfilter.man:130 cups-lpd.man.in:111 cups.man:125 cups-snmp.conf.man:60 cups-snmp.man.in:49 cupstestdsc.man:41 cupstestppd.man:141 filter.man:211 ippfind.man:258 ../test/ippserver.man:164 ipptoolfile.man:646 ipptool.man:241 lpadmin.man:210 lpc.man:48 lpinfo.man:120 lp.man:255 lpmove.man:69 lpoptions.man.in:113 lpq.man:59 lpr.man:207 lprm.man:77 lpstat.man:144 mailto.conf.man:43 mime.convs.man:53 mime.types.man:103 notifier.man:34 ppdcfile.man:152 ppdc.man:93 ppdhtml.man:38 ppdi.man:45 ppdmerge.man:41 ppdpo.man:45 printers.conf.man:22 subscriptions.conf.man:22
+#: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:122 cups.1:126 cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:895 cupsd-helper.8:81 cupsd-logs.5:216 cupsenable.8:88 cups-files.conf.5:280 cupsfilter.8:131 cups-lpd.8:111 cups-snmp.8:49 cups-snmp.conf.5:62 cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:251 ippfind.1:255 ipptool.1:246 ipptoolfile.5:649 lp.1:219 lpadmin.8:224 lpc.8:47 lpinfo.8:121 lpmove.8:66 lpoptions.1:110 lpq.1:56 lpr.1:171 lprm.1:74 lpstat.1:140 mailto.conf.5:40 mime.convs.5:54 mime.types.5:100 notifier.7:31 ppdc.1:94 ppdcfile.5:153 ppdhtml.1:39 ppdi.1:46 ppdmerge.1:42 ppdpo.1:46 printers.conf.5:18 subscriptions.conf.5:21
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:197
+#: backend.7:217
 msgid ""
 "I<cups>(1), I<cups-files.conf>(5), I<cups-snmp>(8), I<cupsd>(8), "
 "I<filter>(7), I<lp>(1), I<lpinfo>(8), I<lpr>(1),"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:199 cupsaccept.man:88 cupsctl.man:100 filter.man:219 lpmove.man:76
+#: backend.7:219 cupsaccept.8:85 cupsctl.8:97 filter.7:220 lpmove.8:73
 msgid "CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: SH
-#: backend.man:199 cancel.man:93 classes.conf.man:30 client.conf.man.in:102 cupsaccept.man:88 cupsaddsmb.man.in:125 cups-config.man:110 cupsctl.man:100 cupsd.conf.man.in:878 cupsd-helper.man:88 cupsd-logs.man:224 cupsd.man.in:128 cupsenable.man:99 cups-files.conf.man.in:286 cupsfilter.man:137 cups-lpd.man.in:118 cups.man:141 cups-snmp.conf.man:63 cups-snmp.man.in:55 cupstestdsc.man:45 cupstestppd.man:145 filter.man:219 ippfind.man:260 ../test/ippserver.man:166 ipptoolfile.man:651 ipptool.man:246 lpadmin.man:216 lpc.man:58 lpinfo.man:123 lp.man:264 lpmove.man:76 lpoptions.man.in:120 lpq.man:66 lpr.man:216 lprm.man:84 lpstat.man:151 mailto.conf.man:46 mime.convs.man:60 mime.types.man:110 notifier.man:38 ppdcfile.man:159 ppdc.man:100 ppdhtml.man:45 ppdi.man:52 ppdmerge.man:48 ppdpo.man:52 printers.conf.man:30 subscriptions.conf.man:30
+#: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:126 cups.1:142 cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:904 cupsd-helper.8:89 cupsd-logs.5:221 cupsenable.8:96 cups-files.conf.5:290 cupsfilter.8:138 cups-lpd.8:118 cups-snmp.8:55 cups-snmp.conf.5:65 cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:255 ippfind.1:257 ipptool.1:251 ipptoolfile.5:654 lp.1:228 lpadmin.8:230 lpc.8:57 lpinfo.8:124 lpmove.8:73 lpoptions.1:117 lpq.1:63 lpr.1:180 lprm.1:81 lpstat.1:147 mailto.conf.5:43 mime.convs.5:61 mime.types.5:107 notifier.7:35 ppdc.1:101 ppdcfile.5:160 ppdhtml.1:46 ppdi.1:53 ppdmerge.1:49 ppdpo.1:53 printers.conf.5:27 subscriptions.conf.5:30
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr ""
 
 #. type: Plain text
-#: backend.man:200 cancel.man:94 classes.conf.man:31 client.conf.man.in:103 cupsaccept.man:89 cupsaddsmb.man.in:126 cups-config.man:111 cupsctl.man:101 cupsd-helper.man:89 cupsd.man.in:129 cupsenable.man:100 cupsfilter.man:138 cups-lpd.man.in:119 cups.man:142 cups-snmp.conf.man:64 cups-snmp.man.in:56 cupstestdsc.man:46 cupstestppd.man:146 filter.man:220 ipptool.man:247 lpc.man:59 lpinfo.man:124 lp.man:265 lpmove.man:77 lpq.man:67 lpr.man:217 lprm.man:85 lpstat.man:152 mailto.conf.man:47 mime.convs.man:61 mime.types.man:111 notifier.man:39 ppdcfile.man:160 ppdc.man:101 ppdhtml.man:46 ppdi.man:53 ppdmerge.man:49 ppdpo.man:53 printers.conf.man:31 subscriptions.conf.man:31
-msgid "Copyright \\[co] 2007-2017 by Apple Inc."
+#: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:127 cups.1:143 cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:905 cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cups-files.conf.5:291 cupsfilter.8:139 cups-lpd.8:119 cups-snmp.8:56 cups-snmp.conf.5:66 cupstestppd.1:147 filter.7:221 ippeveprinter.1:256 ipptool.1:252 ipptoolfile.5:655 lp.1:229 lpadmin.8:231 lpc.8:58 lpinfo.8:125 lpmove.8:74 lpoptions.1:118 lpq.1:64 lpr.1:181 lprm.1:82 lpstat.1:148 mailto.conf.5:44 mime.convs.5:62 mime.types.5:108 notifier.7:36 ppdc.1:102 ppdcfile.5:161 ppdhtml.1:47 ppdi.1:54 ppdmerge.1:50 ppdpo.1:54 printers.conf.5:28 subscriptions.conf.5:31
+msgid "Copyright \\[co] 2007-2019 by Apple Inc."
 msgstr ""
 
 #. type: TH
-#: cancel.man:13
+#: cancel.1:10
 #, no-wrap
 msgid "cancel"
 msgstr ""
 
-#. type: TH
-#: cancel.man:13 classes.conf.man:13 cups-config.man:13 cupsd-helper.man:13 printers.conf.man:13 subscriptions.conf.man:13
-#, no-wrap
-msgid "15 April 2014"
-msgstr ""
-
 #. type: Plain text
-#: cancel.man:16
+#: cancel.1:13
 msgid "cancel - cancel jobs"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:40
+#: cancel.1:37
 msgid ""
 "B<cancel> [ B<-E> ] [ B<-U> I<username> ] [ B<-a> ] [ B<-h> "
 "I<hostname[:port]> ] [ B<-u> I<username> ] [ B<-x> ] [ I<id> ] [ "
@@ -552,7 +554,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:43
+#: cancel.1:40
 msgid ""
 "The B<cancel> command cancels print jobs.  If no I<destination> or I<id> is "
 "specified, the currently printing job on the default destination is "
@@ -560,92 +562,92 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: cancel.man:43 cupsaccept.man:53 cupsaddsmb.man.in:99 cups-config.man:55 cupsctl.man:43 cupsd.conf.man.in:479 cupsd.man.in:40 cupsenable.man:54 cupsfilter.man:62 cups-lpd.man.in:35 cupstestppd.man:61 filter.man:63 ippfind.man:194 ../test/ippserver.man:65 ipptool.man:88 lpadmin.man:76 lpinfo.man:66 lp.man:97 lpmove.man:42 lpoptions.man.in:71 lpq.man:39 lpr.man:67 lprm.man:39 lpstat.man:72 ppdc.man:51 ppdhtml.man:28 ppdi.man:33 ppdmerge.man:31 ppdpo.man:31
+#: cancel.1:40 cupsaccept.8:50 cups-config.1:52 cupsctl.8:40 cupsd.8:37 cupsd.conf.5:485 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:32 cupstestppd.1:58 filter.7:60 ippeveprinter.1:82 ippfind.1:191 ipptool.1:88 lp.1:94 lpadmin.8:73 lpinfo.8:63 lpmove.8:39 lpoptions.1:68 lpq.1:36 lpr.1:64 lprm.1:36 lpstat.1:68 ppdc.1:48 ppdhtml.1:25 ppdi.1:30 ppdmerge.1:28 ppdpo.1:28
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:45
+#: cancel.1:42
 msgid "The following options are recognized by B<cancel>:"
 msgstr ""
 
 #. type: TP
-#: cancel.man:45 cupsaddsmb.man.in:108 lpq.man:50
+#: cancel.1:42 lpq.1:47
 #, no-wrap
 msgid "B<-a>"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:49
+#: cancel.1:46
 msgid ""
 "Cancel all jobs on the named destination, or all jobs on all destinations if "
 "none is provided."
 msgstr ""
 
 #. type: TP
-#: cancel.man:49 cupsaccept.man:58 cupsctl.man:45 cupsenable.man:56 ipptool.man:120 lpadmin.man:183 lpinfo.man:68 lp.man:102 lpmove.man:44 lpoptions.man.in:73 lpq.man:41 lpr.man:69 lprm.man:43 lpstat.man:74
+#: cancel.1:46 cupsaccept.8:55 cupsctl.8:42 cupsenable.8:53 ipptool.1:125 lp.1:99 lpadmin.8:175 lpinfo.8:65 lpmove.8:41 lpoptions.1:70 lpq.1:38 lpr.1:66 lprm.1:40 lpstat.1:70
 #, no-wrap
 msgid "B<-E>"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:52 cupsaccept.man:61 lpinfo.man:71 lp.man:105 lpmove.man:47 lpq.man:44 lpr.man:72 lprm.man:46 lpstat.man:77
+#: cancel.1:49 cupsaccept.8:58 lp.1:102 lpinfo.8:68 lpmove.8:44 lpq.1:41 lpr.1:69 lprm.1:43 lpstat.1:73
 msgid "Forces encryption when connecting to the server."
 msgstr ""
 
 #. type: TP
-#: cancel.man:52
+#: cancel.1:49
 #, no-wrap
 msgid "B<-h >I<hostname>[I<:port>]"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:55 lpmove.man:53 lpq.man:56 lpr.man:75 lprm.man:55 lpstat.man:107
+#: cancel.1:52 lpmove.8:50 lpq.1:53 lpr.1:72 lprm.1:52 lpstat.1:103
 msgid "Specifies an alternate server."
 msgstr ""
 
 #. type: TP
-#: cancel.man:55 cupsaccept.man:61 cupsctl.man:48 cupsenable.man:59 lp.man:105 lpmove.man:47 lpq.man:47 lpr.man:85 lprm.man:49 lpstat.man:83
+#: cancel.1:52 cupsaccept.8:58 cupsctl.8:45 cupsenable.8:56 lp.1:102 lpmove.8:44 lpq.1:44 lpr.1:82 lprm.1:46 lpstat.1:79
 #, no-wrap
 msgid "B<-U >I<username>"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:58 lp.man:108
+#: cancel.1:55 lp.1:105
 msgid "Specifies the username to use when connecting to the server."
 msgstr ""
 
 #. type: TP
-#: cancel.man:58
+#: cancel.1:55
 #, no-wrap
 msgid "B<-u >I<username>"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:61
+#: cancel.1:58
 msgid "Cancels jobs owned by I<username>."
 msgstr ""
 
 #. type: TP
-#: cancel.man:61
+#: cancel.1:58
 #, no-wrap
 msgid "B<-x>"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:64
+#: cancel.1:61
 msgid "Deletes job data files in addition to canceling."
 msgstr ""
 
 #. type: SH
-#: cancel.man:64 cupsaccept.man:70 cupsd.conf.man.in:847 cupsd.man.in:84 cupsenable.man:80 cups-lpd.man.in:49 cups.man:122 cups-snmp.man.in:47 filter.man:202 ../test/ippserver.man:137 ipptool.man:224 lpadmin.man:194 lpinfo.man:100 lp.man:232 lpoptions.man.in:111 lprm.man:55 lpstat.man:137
+#: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:873 cupsenable.8:77 cups-lpd.8:46 cups-snmp.8:47 filter.7:199 ippeveprinter.1:190 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97 lpoptions.1:108 lprm.1:52 lpstat.1:133
 #, no-wrap
 msgid "CONFORMING TO"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:66
+#: cancel.1:63
 msgid ""
 "Unlike the System V printing system, CUPS allows printer names to contain "
 "any printable character except SPACE, TAB, \"/\", or \"#\". Also, printer "
@@ -653,46 +655,46 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: cancel.man:66 cups-config.man:94 cupsctl.man:69 cupsd.conf.man.in:849 cupsd.man.in:87 cupstestppd.man:128 ippfind.man:245 ../test/ippserver.man:148 ipptool.man:228 lpinfo.man:102 lp.man:237 lpmove.man:53 lpr.man:189 lprm.man:59 mime.convs.man:46 mime.types.man:92
+#: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:875 cupstestppd.1:125 ippeveprinter.1:235 ippfind.1:242 ipptool.1:233 lp.1:201 lpinfo.8:99 lpmove.8:50 lpr.1:153 lprm.1:56 mime.convs.5:43 mime.types.5:89
 #, no-wrap
 msgid "EXAMPLES"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:68
+#: cancel.1:65
 msgid "Cancel the current print job:"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:71
+#: cancel.1:68
 #, no-wrap
 msgid "    cancel\n"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:74
+#: cancel.1:71
 msgid "Cancel job \"myprinter-42\":"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:77
+#: cancel.1:74
 #, no-wrap
 msgid "    cancel myprinter-42\n"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:80 lprm.man:73
+#: cancel.1:77 lprm.1:70
 msgid "Cancel all jobs:"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:83
+#: cancel.1:80
 #, no-wrap
 msgid "    cancel -a\n"
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:87
+#: cancel.1:84
 msgid ""
 "Administrators wishing to prevent unauthorized cancellation of jobs via the "
 "I<-u> option should require authentication for Cancel-Jobs operations in "
@@ -700,41 +702,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cancel.man:93
+#: cancel.1:90
 msgid ""
 "B<cupsd.conf>(5), B<lp>(1), B<lpmove>(8), B<lpstat>(1), CUPS Online Help "
 "(http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: classes.conf.man:13
+#: classes.conf.5:10
 #, no-wrap
 msgid "classes.conf"
 msgstr ""
 
 #. type: Plain text
-#: classes.conf.man:16
+#: classes.conf.5:13
 msgid "classes.conf - class configuration file for cups"
 msgstr ""
 
 #. type: Plain text
-#: classes.conf.man:20
+#: classes.conf.5:19
 msgid ""
 "The B<classes.conf> file defines the local printer classes that are "
-"available. It is normally located in the I</etc/cups> directory and is "
-"maintained by the B<cupsd>(8)  program. This file is not intended to be "
+"available.  It is normally located in the I</etc/cups> directory and is "
+"maintained by the B<cupsd>(8)  program.  This file is not intended to be "
 "edited or managed manually."
 msgstr ""
 
 #. type: Plain text
-#: classes.conf.man:22 printers.conf.man:22 subscriptions.conf.man:22
+#: classes.conf.5:21 printers.conf.5:18 subscriptions.conf.5:21
 msgid ""
 "The name, location, and format of this file are an implementation detail "
 "that will change in future releases of CUPS."
 msgstr ""
 
 #. type: Plain text
-#: classes.conf.man:30
+#: classes.conf.5:29
 msgid ""
 "B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime.types>(5), "
 "B<printers.conf>(5), B<subscriptions.conf>(5), CUPS Online Help "
@@ -742,24 +744,18 @@ msgid ""
 msgstr ""
 
 #. type: TH
-#: client.conf.man.in:13
+#: client.conf.5:10
 #, no-wrap
 msgid "client.conf"
 msgstr ""
 
-#. type: TH
-#: client.conf.man.in:13
-#, no-wrap
-msgid "19 October 2017"
-msgstr ""
-
 #. type: Plain text
-#: client.conf.man.in:16
-msgid "client.conf - client configuration file for cups"
+#: client.conf.5:13
+msgid "client.conf - client configuration file for cups (deprecated on macos)"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:19
+#: client.conf.5:16
 msgid ""
 "The B<client.conf> file configures the CUPS client and is normally located "
 "in the I</etc/cups> and/or I<~/.cups> directories.  Each line in the file "
@@ -768,7 +764,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:24
+#: client.conf.5:21
 msgid ""
 "B<Note:> Starting with macOS 10.7, this file is only used by command-line "
 "and X11 applications plus the IPP backend.  The B<ServerName> directive is "
@@ -779,87 +775,87 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: client.conf.man.in:24 cups-files.conf.man.in:25 cups-snmp.conf.man:24 mailto.conf.man:23
+#: client.conf.5:21 cups-files.conf.5:22 cups-snmp.conf.5:21 mailto.conf.5:20
 #, no-wrap
 msgid "DIRECTIVES"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:26
+#: client.conf.5:23
 msgid ""
 "The following directives are understood by the client. Consult the online "
 "help for detailed descriptions:"
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:26
+#: client.conf.5:23
 #, no-wrap
 msgid "B<AllowAnyRoot Yes>"
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:28
+#: client.conf.5:25
 #, no-wrap
 msgid "B<AllowAnyRoot No>"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:32
+#: client.conf.5:29
 msgid ""
 "Specifies whether to allow TLS with certificates that have not been signed "
 "by a trusted Certificate Authority.  The default is \"Yes\"."
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:32
+#: client.conf.5:29
 #, no-wrap
 msgid "B<AllowExpiredCerts Yes>"
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:34
+#: client.conf.5:31
 #, no-wrap
 msgid "B<AllowExpiredCerts No>"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:38
+#: client.conf.5:35
 msgid ""
 "Specifies whether to allow TLS with expired certificates.  The default is "
 "\"No\"."
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:38 cupsd.conf.man.in:722
+#: client.conf.5:35 cupsd.conf.5:732
 #, no-wrap
 msgid "B<Encryption IfRequested>"
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:40 cupsd.conf.man.in:724
+#: client.conf.5:37 cupsd.conf.5:734
 #, no-wrap
 msgid "B<Encryption Never>"
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:42 cupsd.conf.man.in:726
+#: client.conf.5:39 cupsd.conf.5:736
 #, no-wrap
 msgid "B<Encryption Required>"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:45
+#: client.conf.5:42
 msgid "Specifies the level of encryption that should be used."
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:45 cupsd.conf.man.in:161
+#: client.conf.5:42 cupsd.conf.5:165
 #, no-wrap
 msgid "B<GSSServiceName >I<name>"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:49
+#: client.conf.5:46
 msgid ""
 "Specifies the Kerberos service name that is used for authentication, "
 "typically \"host\", \"http\", or \"ipp\".  CUPS adds the remote hostname "
@@ -867,53 +863,55 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:49
+#: client.conf.5:46
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]"
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:51
+#: client.conf.5:48
 #, no-wrap
 msgid "B<ServerName >I</domain/socket>"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:55
+#: client.conf.5:52
 msgid ""
 "Specifies the address and optionally the port to use when connecting to the "
 "server.  B<Note: This directive is not supported on macOS 10.7 or later.>"
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:55
+#: client.conf.5:52
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]B</version=1.1>"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:58
+#: client.conf.5:55
 msgid ""
 "Specifies the address and optionally the port to use when connecting to a "
 "server running CUPS 1.3.12 and earlier."
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:58 cupsd.conf.man.in:434
+#: client.conf.5:55 cupsd.conf.5:437
 #, no-wrap
 msgid ""
 "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] "
-"[I<DenyTLS1.0>]"
+"[I<DenyTLS1.0>] [I<MaxTLS1.0>] [I<MaxTLS1.1>] [I<MaxTLS1.2>] [I<MaxTLS1.3>] "
+"[I<MinTLS1.0>] [I<MinTLS1.1>] [I<MinTLS1.2>] [I<MinTLS1.3>]"
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:60 cupsd.conf.man.in:436
+#: client.conf.5:57 cupsd.conf.5:439
 #, no-wrap
 msgid "B<SSLOptions None>"
 msgstr ""
 
+#. #SSLPort
 #. type: Plain text
-#: client.conf.man.in:71
+#: client.conf.5:71 cupsd.conf.5:454
 msgid ""
 "Sets encryption options (only in /etc/cups/client.conf).  By default, CUPS "
 "only supports encryption using TLS v1.0 or higher using known secure cipher "
@@ -925,60 +923,117 @@ msgid ""
 "option enables SSL v3.0, which is required for some older clients that do "
 "not support TLS v1.0.  The I<DenyCBC> option disables all CBC cipher "
 "suites.  The I<DenyTLS1.0> option disables TLS v1.0 support - this sets the "
-"minimum protocol version to TLS v1.1."
+"minimum protocol version to TLS v1.1.  The I<MinTLS> options set the minimum "
+"TLS version to support.  The I<MaxTLS> options set the maximum TLS version "
+"to support.  Not all operating systems support TLS 1.3 at this time."
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:71
+#: client.conf.5:71
 #, no-wrap
 msgid "B<TrustOnFirstUse Yes>"
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:73
+#: client.conf.5:73
 #, no-wrap
 msgid "B<TrustOnFirstUse No>"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:77
+#: client.conf.5:77
 msgid ""
 "Specifies whether to trust new TLS certificates by default.  The default is "
 "\"Yes\"."
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:77
+#: client.conf.5:77
 #, no-wrap
 msgid "B<User >I<name>"
 msgstr ""
 
+#. #UserAgentTokens
 #. type: Plain text
-#: client.conf.man.in:80
+#: client.conf.5:81
 msgid "Specifies the default user name to use for requests."
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:80
+#: client.conf.5:81
+#, no-wrap
+msgid "B<UserAgentTokens None>"
+msgstr ""
+
+#. type: TP
+#: client.conf.5:83
+#, no-wrap
+msgid "B<UserAgentTokens ProductOnly>"
+msgstr ""
+
+#. type: TP
+#: client.conf.5:85
+#, no-wrap
+msgid "B<UserAgentTokens Major>"
+msgstr ""
+
+#. type: TP
+#: client.conf.5:87
+#, no-wrap
+msgid "B<UserAgentTokens Minor>"
+msgstr ""
+
+#. type: TP
+#: client.conf.5:89
+#, no-wrap
+msgid "B<UserAgentTokens Minimal>"
+msgstr ""
+
+#. type: TP
+#: client.conf.5:91
+#, no-wrap
+msgid "B<UserAgentTokens OS>"
+msgstr ""
+
+#. type: TP
+#: client.conf.5:93
+#, no-wrap
+msgid "B<UserAgentTokens Full>"
+msgstr ""
+
+#. type: Plain text
+#: client.conf.5:104
+msgid ""
+"Specifies what information is included in the User-Agent header of HTTP "
+"requests.  \"None\" disables the User-Agent header.  \"ProductOnly\" reports "
+"\"CUPS\".  \"Major\" reports \"CUPS/major IPP/2\".  \"Minor\" reports "
+"\"CUPS/major.minor IPP/2.1\".  \"Minimal\" reports \"CUPS/major.minor.patch "
+"IPP/2.1\".  \"OS\" reports \"CUPS/major.minor.path (osname osversion) "
+"IPP/2.1\".  \"Full\" reports \"CUPS/major.minor.path (osname osversion; "
+"architecture) IPP/2.1\".  The default is \"Minimal\"."
+msgstr ""
+
+#. type: TP
+#: client.conf.5:104
 #, no-wrap
 msgid "B<ValidateCerts Yes>"
 msgstr ""
 
 #. type: TP
-#: client.conf.man.in:82
+#: client.conf.5:106
 #, no-wrap
 msgid "B<ValidateCerts No>"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:86
+#: client.conf.5:110
 msgid ""
 "Specifies whether to only allow TLS with certificates whose common name "
 "matches the hostname.  The default is \"No\"."
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:91
+#: client.conf.5:115
 msgid ""
 "The B<client.conf> file is deprecated on macOS and will no longer be "
 "supported in a future version of CUPS.  Configuration settings can instead "
@@ -986,7 +1041,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:94
+#: client.conf.5:118
 #, no-wrap
 msgid ""
 "defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption "
@@ -996,13 +1051,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:96
+#: client.conf.5:120
 #, no-wrap
 msgid "defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption\n"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:98
+#: client.conf.5:122
 msgid ""
 "On Linux and other systems using GNU TLS, the I</etc/cups/ssl/site.crl> "
 "file, if present, provides a list of revoked X.509 certificates and is used "
@@ -1010,384 +1065,538 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: client.conf.man.in:102
+#: client.conf.5:126
 msgid "B<cups>(1), B<default>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: cupsaccept.man:13
-#, no-wrap
-msgid "cupsaccept"
-msgstr ""
-
-#. type: TH
-#: cupsaccept.man:13 cups-snmp.conf.man:13 cups-snmp.man.in:12
+#: cups.1:10
 #, no-wrap
-msgid "10 June 2014"
+msgid "cups"
 msgstr ""
 
 #. type: Plain text
-#: cupsaccept.man:16
-msgid "cupsaccept/cupsreject - accept/reject jobs sent to a destination"
+#: cups.1:13
+msgid "cups - a standards-based, open source printing system"
 msgstr ""
 
 #. type: Plain text
-#: cupsaccept.man:28
+#: cups.1:16
 msgid ""
-"B<cupsaccept> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] "
-"I<destination(s)>"
+"B<CUPS> is the software you use to print from applications like word "
+"processors, email readers, photo editors, and web browsers. It converts the "
+"page descriptions produced by your application (put a paragraph here, draw a "
+"line there, and so forth) into something your printer can understand and "
+"then sends the information to the printer for printing."
 msgstr ""
 
 #. type: Plain text
-#: cupsaccept.man:43
+#: cups.1:22
 msgid ""
-"B<cupsreject> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] [ "
-"B<-r> I<reason> ] I<destination(s)>"
+"Now, since every printer manufacturer does things differently, printing can "
+"be very complicated.  B<CUPS> does its best to hide this from you and your "
+"application so that you can concentrate on printing and less on how to "
+"print. Generally, the only time you need to know anything about your printer "
+"is when you use it for the first time, and even then B<CUPS> can often "
+"figure things out on its own."
 msgstr ""
 
-#. type: Plain text
-#: cupsaccept.man:47
-msgid ""
-"The B<cupsaccept> command instructs the printing system to accept print jobs "
-"to the specified destinations."
+#. type: SS
+#: cups.1:22
+#, no-wrap
+msgid "HOW DOES IT WORK?"
 msgstr ""
 
 #. type: Plain text
-#: cupsaccept.man:53
+#: cups.1:26
 msgid ""
-"The B<cupsreject> command instructs the printing system to reject print jobs "
-"to the specified destinations.  The I<-r> option sets the reason for "
-"rejecting print jobs. If not specified, the reason defaults to \"Reason "
-"Unknown\"."
+"The first time you print to a printer, B<CUPS> creates a queue to keep track "
+"of the current status of the printer (everything OK, out of paper, etc.) and "
+"any pages you have printed. Most of the time the queue points to a printer "
+"connected directly to your computer via a USB port, however it can also "
+"point to a printer on your network, a printer on the Internet, or multiple "
+"printers depending on the configuration. Regardless of where the queue "
+"points, it will look like any other printer to you and your applications."
 msgstr ""
 
 #. type: Plain text
-#: cupsaccept.man:58
-msgid "The following options are supported by both B<cupsaccept> and B<cupsreject>:"
+#: cups.1:32
+msgid ""
+"Every time you print something, B<CUPS> creates a job which contains the "
+"queue you are sending the print to, the name of the document you are "
+"printing, and the page descriptions. Job are numbered (queue-1, queue-2, and "
+"so forth) so you can monitor the job as it is printed or cancel it if you "
+"see a mistake. When B<CUPS> gets a job for printing, it determines the best "
+"programs (filters, printer drivers, port monitors, and backends) to convert "
+"the pages into a printable format and then runs them to actually print the "
+"job."
 msgstr ""
 
 #. type: Plain text
-#: cupsaccept.man:64
-msgid "Sets the username that is sent when connecting to the server."
+#: cups.1:36
+msgid ""
+"When the print job is completely printed, B<CUPS> removes the job from the "
+"queue and moves on to any other jobs you have submitted. You can also be "
+"notified when the job is finished, or if there are any errors during "
+"printing, in several different ways."
 msgstr ""
 
-#. type: TP
-#: cupsaccept.man:64
+#. type: SS
+#: cups.1:36
 #, no-wrap
-msgid "B<-h >I<hostname[:port]>"
+msgid "WHERE DO I BEGIN?"
 msgstr ""
 
 #. type: Plain text
-#: cupsaccept.man:67 lp.man:118
-msgid "Chooses an alternate server."
-msgstr ""
-
-#. type: TP
-#: cupsaccept.man:67
-#, no-wrap
-msgid "B<-r >\"I<reason>\""
+#: cups.1:38
+msgid ""
+"The easiest way to start is by using the web interface to configure your "
+"printer. Go to \"http://localhost:631\" and choose the Administration tab at "
+"the top of the page. Click/press on the Add Printer button and follow the "
+"prompts."
 msgstr ""
 
 #. type: Plain text
-#: cupsaccept.man:70
-msgid "Sets the reason string that is shown for a printer that is rejecting jobs."
+#: cups.1:40
+msgid ""
+"When you are asked for a username and password, enter your login username "
+"and password or the \"root\" username and password."
 msgstr ""
 
 #. type: Plain text
-#: cupsaccept.man:78
+#: cups.1:42
 msgid ""
-"The B<cupsaccept> and B<cupsreject> commands correspond to the System V "
-"printing system commands \"accept\" and \"reject\", respectively.  Unlike "
-"the System V printing system, CUPS allows printer names to contain any "
-"printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer and "
-"class names are I<not> case-sensitive."
+"After the printer is added you will be asked to set the default printer "
+"options (paper size, output mode, etc.) for the printer. Make any changes as "
+"needed and then click/press on the Set Default Options button to save "
+"them. Some printers also support auto-configuration - click/press on the "
+"Query Printer for Default Options button to update the options "
+"automatically."
 msgstr ""
 
 #. type: Plain text
-#: cupsaccept.man:80
+#: cups.1:44
 msgid ""
-"Finally, the CUPS versions may ask the user for an access password depending "
-"on the printing system configuration."
+"Once you have added the printer, you can print to it from any "
+"application. You can also choose Print Test Page from the maintenance menu "
+"to print a simple test page and verify that everything is working properly."
 msgstr ""
 
 #. type: Plain text
-#: cupsaccept.man:86
-msgid "B<cancel>(1), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), B<lpstat>(1),"
-msgstr ""
-
-#. type: TH
-#: cupsaddsmb.man.in:13
-#, no-wrap
-msgid "cupsaddsmb"
+#: cups.1:52
+msgid ""
+"You can also use the B<lpadmin>(8)  and B<lpinfo>(8)  commands to add "
+"printers to B<CUPS>.  Additionally, your operating system may include "
+"graphical user interfaces or automatically create printer queues when you "
+"connect a printer to your computer."
 msgstr ""
 
-#. type: TH
-#: cupsaddsmb.man.in:13 cupsenable.man:13 cupsfilter.man:12 cupstestdsc.man:13 cupstestppd.man:13 lpc.man:13
+#. type: SS
+#: cups.1:52
 #, no-wrap
-msgid "11 June 2014"
+msgid "HOW DO I GET HELP?"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:16
-msgid "cupsaddsmb - export printers to samba for windows clients"
+#: cups.1:60
+msgid ""
+"The B<CUPS> web site (http://www.CUPS.org) provides access to the I<cups> "
+"and I<cups-devel> mailing lists, additional documentation and resources, and "
+"a bug report database. Most vendors also provide online discussion forums to "
+"ask printing questions for your operating system of choice."
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:32
+#: cups.1:63
 msgid ""
-"B<cupsaddsmb> [ B<-H> I<samba-server> ] [ B<-U> "
-"I<samba-user[%samba-password]> ] [ B<-h> I<cups-server[:port]> ] [ B<-v> ] "
-"B<-a>"
+"B<CUPS> commands use the following environment variables to override the "
+"default locations of files and so forth. For security reasons, these "
+"environment variables are ignored for setuid programs:"
 msgstr ""
 
-#. type: Plain text
-#: cupsaddsmb.man.in:50
-msgid ""
-"B<cupsaddsmb> [ B<-H> I<samba-server> ] [ B<-U> "
-"I<samba-user[%samba-password]> ] [ B<-h> I<cups-server[:port]> ] [ B<-v> ] "
-"I<printer> [ ...  I<printer> ]"
+#. type: TP
+#: cups.1:63
+#, no-wrap
+msgid "B<CUPS_ANYROOT>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:54
-msgid ""
-"The B<cupsaddsmb> program exports printers to the SAMBA software (version "
-"2.2.0 or higher) for use with Windows clients.  Depending on the SAMBA "
-"configuration, you may need to provide a password to export the printers.  "
-"This program requires the Windows printer driver files described below."
+#: cups.1:66
+msgid "Whether to allow any X.509 certificate root (Y or N)."
 msgstr ""
 
-#. type: SS
-#: cupsaddsmb.man.in:54
+#. type: TP
+#: cups.1:66 filter.7:156
 #, no-wrap
-msgid "SAMBA CONFIGURATION"
+msgid "B<CUPS_CACHEDIR>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:60
-msgid ""
-"B<cupsaddsmb> uses the RPC-based printing support in SAMBA to provide "
-"printer drivers and PPD files to Windows client machines.  In order to use "
-"this functionality, you must first configure the SAMBA B<smb.conf>(5)  file "
-"to support printing through CUPS and provide a printer driver download "
-"share, as follows:"
+#: cups.1:69
+msgid "The directory where semi-persistent cache files can be found."
 msgstr ""
 
-#. type: Plain text
-#: cupsaddsmb.man.in:66
+#. type: TP
+#: cups.1:69 filter.7:159
 #, no-wrap
-msgid ""
-"    [global]\n"
-"\tload printers = yes\n"
-"\tprinting = cups\n"
-"\tprintcap name = cups\n"
+msgid "B<CUPS_DATADIR>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:75
+#: cups.1:72 filter.7:162
+msgid "The directory where data files can be found."
+msgstr ""
+
+#. type: TP
+#: cups.1:72
 #, no-wrap
-msgid ""
-"    [printers]\n"
-"\tcomment = All Printers\n"
-"\tpath = /var/spool/samba\n"
-"\tbrowseable = no\n"
-"\tpublic = yes\n"
-"\tguest ok = yes\n"
-"\twritable = no\n"
-"\tprintable = yes\n"
+msgid "B<CUPS_ENCRYPTION>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:83
+#: cups.1:75
+msgid "The default level of encryption (Always, IfRequested, Never, Required)."
+msgstr ""
+
+#. type: TP
+#: cups.1:75
 #, no-wrap
-msgid ""
-"    [print$]\n"
-"\tcomment = Printer Drivers\n"
-"\tpath = /etc/samba/drivers\n"
-"\tbrowseable = yes\n"
-"\tguest ok = no\n"
-"\tread only = yes\n"
-"\twrite list = root\n"
+msgid "B<CUPS_EXPIREDCERTS>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:86
-msgid ""
-"This configuration assumes a FHS-compliant installation of SAMBA; adjust the "
-"[printers] and [print$] share paths accordingly on your system as needed."
+#: cups.1:78
+msgid "Whether to allow expired X.509 certificates (Y or N)."
 msgstr ""
 
-#. type: SS
-#: cupsaddsmb.man.in:86
+#. type: TP
+#: cups.1:78
 #, no-wrap
-msgid "MICROSOFT POSTSCRIPT DRIVERS FOR WINDOWS"
+msgid "B<CUPS_GSSSERVICENAME>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:88
-msgid ""
-"The base driver for Windows 2000 and higher is the Microsoft PostScript "
-"driver, which is available on any system running Windows 2000 or higher in "
-"the %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eW32X86\\e3 folder for 32-bit "
-"drivers and %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eX64\\e3 folder for "
-"64-bit drivers."
+#: cups.1:81
+msgid "The Kerberos service name used for authentication."
+msgstr ""
+
+#. type: TP
+#: cups.1:81
+#, no-wrap
+msgid "B<CUPS_SERVER>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:90
+#: cups.1:84
 msgid ""
-"Copy the 32-bit drivers to the I</usr/share/cups/drivers> directory and the "
-"64-bit drivers to the I</usr/share/cups/drivers/x64> directory exactly as "
-"named below:"
+"The hostname/IP address and port number of the CUPS scheduler (hostname:port "
+"or ipaddress:port)."
 msgstr ""
 
-#. type: Plain text
-#: cupsaddsmb.man.in:96
+#. type: TP
+#: cups.1:84
 #, no-wrap
-msgid ""
-"    ps5ui.dll\n"
-"    pscript.hlp\n"
-"    pscript.ntf\n"
-"    pscript5.dll\n"
+msgid "B<CUPS_SERVERBIN>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:99
+#: cups.1:87
 msgid ""
-"B<Note:> Unlike Windows, case is significant - make sure that you use the "
-"lowercase filenames shown above, otherwise B<cupsaddsmb> will fail to export "
-"the drivers."
+"The directory where server helper programs, filters, backend, etc. can be "
+"found."
+msgstr ""
+
+#. type: TP
+#: cups.1:87 filter.7:169
+#, no-wrap
+msgid "B<CUPS_SERVERROOT>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:101
-msgid "B<cupsaddsmb> supports the following options:"
+#: cups.1:90 filter.7:172
+msgid "The root directory of the server."
 msgstr ""
 
 #. type: TP
-#: cupsaddsmb.man.in:101
+#: cups.1:90
 #, no-wrap
-msgid "B<-H >I<samba-server>"
+msgid "B<CUPS_STATEDIR>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:104
-msgid "Specifies the SAMBA server which defaults to the CUPS server."
+#: cups.1:93
+msgid "The directory where state files can be found."
 msgstr ""
 
 #. type: TP
-#: cupsaddsmb.man.in:104
+#: cups.1:93
 #, no-wrap
-msgid "B<-U >I<samba-user>[B<%>I<samba-password>]"
+msgid "B<CUPS_USER>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:108
-msgid ""
-"Specifies the SAMBA print admin username which defaults to your current "
-"username.  If the username contains a percent (%) character, then the text "
-"following the percent is treated as the SAMBA password to use."
+#: cups.1:96
+msgid "Specifies the name of the user for print requests."
+msgstr ""
+
+#. type: TP
+#: cups.1:96
+#, no-wrap
+msgid "B<HOME>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:112
-msgid "Exports all known printers.  Otherwise only the named printers are exported."
+#: cups.1:99
+msgid "Specifies the home directory of the current user."
 msgstr ""
 
 #. type: TP
-#: cupsaddsmb.man.in:112
+#: cups.1:99
 #, no-wrap
-msgid "B<-h >I<cups-server>[B<:>I<port>]"
+msgid "B<IPP_PORT>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:115
-msgid "Specifies a different CUPS server to use."
+#: cups.1:102
+msgid "Specifies the default port number for IPP requests."
 msgstr ""
 
 #. type: TP
-#: cupsaddsmb.man.in:115 cupstestppd.man:105 ipptool.man:182 ppdc.man:79
+#: cups.1:102
 #, no-wrap
-msgid "B<-v>"
+msgid "B<LOCALEDIR>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:119
-msgid ""
-"Specifies that verbose information should be shown.  This is useful for "
-"debugging SAMBA configuration problems."
+#: cups.1:105
+msgid "Specifies the location of localization files."
+msgstr ""
+
+#. type: TP
+#: cups.1:105
+#, no-wrap
+msgid "B<LPDEST>"
 msgstr ""
 
 #. type: Plain text
-#: cupsaddsmb.man.in:125
-msgid ""
-"B<rpcclient>(1), B<smbclient>(1), B<smbd>(8), B<smb.conf>(5), CUPS Online "
-"Help (http://localhost:631/help)"
+#: cups.1:108
+msgid "Specifies the default print queue (System V standard)."
 msgstr ""
 
-#. type: TH
-#: cups-config.man:13
+#. type: TP
+#: cups.1:108 filter.7:184
 #, no-wrap
-msgid "cups-config"
+msgid "B<PRINTER>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:16
-msgid "cups-config - get cups api, compiler, directory, and link information."
+#: cups.1:111
+msgid "Specifies the default print queue (Berkeley standard)."
 msgstr ""
 
-#. type: Plain text
-#: cups-config.man:19
-msgid "B<cups-config> I<--api-version>"
+#. type: TP
+#: cups.1:111
+#, no-wrap
+msgid "B<TMPDIR>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:22
-msgid "B<cups-config> I<--build>"
+#: cups.1:114
+msgid "Specifies the location of temporary files."
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:25
-msgid "B<cups-config> I<--cflags>"
+#: cups.1:118
+#, no-wrap
+msgid ""
+"I<~/.cups/client.conf>\n"
+"I<~/.cups/lpoptions>\n"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:28
+#: cups.1:122
+msgid ""
+"B<CUPS> conforms to the Internet Printing Protocol version 2.1 and "
+"implements the Berkeley and System V UNIX print commands."
+msgstr ""
+
+#. type: Plain text
+#: cups.1:126 cupsd-helper.8:81
+msgid ""
+"CUPS printer drivers, backends, and PPD files are deprecated and will no "
+"longer be supported in a future feature release of CUPS.  Printers that do "
+"not support IPP can be supported using applications such as "
+"B<ippeveprinter>(1)."
+msgstr ""
+
+#. type: Plain text
+#: cups.1:142
+msgid ""
+"B<cancel>(1), B<client.conf>(7), B<cupsctl>(8), B<cupsd>(8), B<lp>(1), "
+"B<lpadmin>(8), B<lpinfo>(8), B<lpoptions>(1), B<lpr>(1), B<lprm>(1), "
+"B<lpq>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help), CUPS "
+"Web Site (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup "
+"(http://www.pwg.org/ipp)"
+msgstr ""
+
+#. type: TH
+#: cupsaccept.8:10
+#, no-wrap
+msgid "cupsaccept"
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:13
+msgid "cupsaccept/cupsreject - accept/reject jobs sent to a destination"
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:25
+msgid ""
+"B<cupsaccept> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] "
+"I<destination(s)>"
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:40
+msgid ""
+"B<cupsreject> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] [ "
+"B<-r> I<reason> ] I<destination(s)>"
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:44
+msgid ""
+"The B<cupsaccept> command instructs the printing system to accept print jobs "
+"to the specified destinations."
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:50
+msgid ""
+"The B<cupsreject> command instructs the printing system to reject print jobs "
+"to the specified destinations.  The I<-r> option sets the reason for "
+"rejecting print jobs. If not specified, the reason defaults to \"Reason "
+"Unknown\"."
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:55
+msgid "The following options are supported by both B<cupsaccept> and B<cupsreject>:"
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:61
+msgid "Sets the username that is sent when connecting to the server."
+msgstr ""
+
+#. type: TP
+#: cupsaccept.8:61
+#, no-wrap
+msgid "B<-h >I<hostname[:port]>"
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:64 lp.1:115
+msgid "Chooses an alternate server."
+msgstr ""
+
+#. type: TP
+#: cupsaccept.8:64
+#, no-wrap
+msgid "B<-r >\"I<reason>\""
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:67
+msgid "Sets the reason string that is shown for a printer that is rejecting jobs."
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:75
+msgid ""
+"The B<cupsaccept> and B<cupsreject> commands correspond to the System V "
+"printing system commands \"accept\" and \"reject\", respectively.  Unlike "
+"the System V printing system, CUPS allows printer names to contain any "
+"printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer and "
+"class names are I<not> case-sensitive."
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:77
+msgid ""
+"Finally, the CUPS versions may ask the user for an access password depending "
+"on the printing system configuration."
+msgstr ""
+
+#. type: Plain text
+#: cupsaccept.8:83
+msgid "B<cancel>(1), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), B<lpstat>(1),"
+msgstr ""
+
+#. type: TH
+#: cups-config.1:10
+#, no-wrap
+msgid "cups-config"
+msgstr ""
+
+#. type: Plain text
+#: cups-config.1:13
+msgid "cups-config - get cups api, compiler, directory, and link information."
+msgstr ""
+
+#. type: Plain text
+#: cups-config.1:16
+msgid "B<cups-config> I<--api-version>"
+msgstr ""
+
+#. type: Plain text
+#: cups-config.1:19
+msgid "B<cups-config> I<--build>"
+msgstr ""
+
+#. type: Plain text
+#: cups-config.1:22
+msgid "B<cups-config> I<--cflags>"
+msgstr ""
+
+#. type: Plain text
+#: cups-config.1:25
 msgid "B<cups-config> I<--datadir>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:31
+#: cups-config.1:28
 msgid "B<cups-config> I<--help>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:34
+#: cups-config.1:31
 msgid "B<cups-config> I<--ldflags>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:42
+#: cups-config.1:39
 msgid "B<cups-config> [ I<--image> ] [ I<--static> ] I<--libs>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:45
+#: cups-config.1:42
 msgid "B<cups-config> I<--serverbin>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:48
+#: cups-config.1:45
 msgid "B<cups-config> I<--serverroot>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:51
+#: cups-config.1:48
 msgid "B<cups-config> I<--version>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:55
+#: cups-config.1:52
 msgid ""
 "The B<cups-config> command allows application developers to determine the "
 "necessary command-line options for the compiler and linker, as well as the "
@@ -1396,198 +1605,203 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:57
+#: cups-config.1:54
 msgid "The B<cups-config> command accepts the following command-line options:"
 msgstr ""
 
 #. type: TP
-#: cups-config.man:57
+#: cups-config.1:54
 #, no-wrap
 msgid "B<--api-version>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:60
+#: cups-config.1:57
 msgid "Reports the current API version (major.minor)."
 msgstr ""
 
 #. type: TP
-#: cups-config.man:60
+#: cups-config.1:57
 #, no-wrap
 msgid "B<--build>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:63
+#: cups-config.1:60
 msgid "Reports a system-specific build number."
 msgstr ""
 
 #. type: TP
-#: cups-config.man:63
+#: cups-config.1:60
 #, no-wrap
 msgid "B<--cflags>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:66
+#: cups-config.1:63
 msgid "Reports the necessary compiler options."
 msgstr ""
 
 #. type: TP
-#: cups-config.man:66
+#: cups-config.1:63
 #, no-wrap
 msgid "B<--datadir>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:69
+#: cups-config.1:66
 msgid "Reports the default CUPS data directory."
 msgstr ""
 
 #. type: TP
-#: cups-config.man:69 ippfind.man:196 ipptool.man:91
+#: cups-config.1:66 ippeveprinter.1:85 ippfind.1:193 ipptool.1:91
 #, no-wrap
 msgid "B<--help>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:72
+#: cups-config.1:69
 msgid "Reports the program usage message."
 msgstr ""
 
 #. type: TP
-#: cups-config.man:72
-#, no-wrap
-msgid "B<--image>"
-msgstr ""
-
-#. type: Plain text
-#: cups-config.man:76
-msgid ""
-"When used with I<--libs>, adds the CUPS imaging library to the list of "
-"libraries."
-msgstr ""
-
-#. type: TP
-#: cups-config.man:76
+#: cups-config.1:69
 #, no-wrap
 msgid "B<--ldflags>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:79
+#: cups-config.1:72
 msgid "Reports the necessary linker options."
 msgstr ""
 
 #. type: TP
-#: cups-config.man:79
+#: cups-config.1:72
 #, no-wrap
 msgid "B<--libs>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:82
+#: cups-config.1:75
 msgid "Reports the necessary libraries to link to."
 msgstr ""
 
 #. type: TP
-#: cups-config.man:82
+#: cups-config.1:75
 #, no-wrap
 msgid "B<--serverbin>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:85
+#: cups-config.1:78
 msgid ""
 "Reports the default CUPS binary directory, where filters and backends are "
 "stored."
 msgstr ""
 
 #. type: TP
-#: cups-config.man:85
+#: cups-config.1:78
 #, no-wrap
 msgid "B<--serverroot>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:88
+#: cups-config.1:81
 msgid "Reports the default CUPS configuration file directory."
 msgstr ""
 
 #. type: TP
-#: cups-config.man:88
+#: cups-config.1:81
 #, no-wrap
 msgid "B<--static>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:91
+#: cups-config.1:84
 msgid ""
 "When used with I<--libs>, reports the static libraries instead of the "
 "default (shared) libraries."
 msgstr ""
 
 #. type: TP
-#: cups-config.man:91 ippfind.man:199 ipptool.man:101
+#: cups-config.1:84 ippeveprinter.1:91 ippfind.1:196 ipptool.1:106
 #, no-wrap
 msgid "B<--version>"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:94
+#: cups-config.1:87
 msgid ""
 "Reports the full version number of the CUPS installation "
 "(major.minor.patch)."
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:96
+#: cups-config.1:89
 msgid "Show the currently installed version of CUPS:"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:99
+#: cups-config.1:92
 #, no-wrap
 msgid "    cups-config --version\n"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:102
+#: cups-config.1:95
 msgid "Compile a simple one-file CUPS filter:"
 msgstr ""
 
 #. type: Plain text
-#: cups-config.man:106
+#: cups-config.1:99
 #, no-wrap
 msgid ""
 "    cc `cups-config --cflags --ldflags` -o filter filter.c \\e\n"
 "        `cups-config --libs`\n"
 msgstr ""
 
+#. type: SH
+#: cups-config.1:100 lpadmin.8:186
+#, no-wrap
+msgid "DEPRECATED OPTIONS"
+msgstr ""
+
 #. type: Plain text
-#: cups-config.man:110
-msgid "B<cups>(1), CUPS Online Help (http://localhost:631/help)"
+#: cups-config.1:102
+msgid ""
+"The following options are deprecated but continue to work for backwards "
+"compatibility:"
 msgstr ""
 
-#. type: TH
-#: cupsctl.man:13
+#. type: TP
+#: cups-config.1:102
 #, no-wrap
-msgid "cupsctl"
+msgid "B<--image>"
+msgstr ""
+
+#. type: Plain text
+#: cups-config.1:105
+msgid "Formerly used to add the CUPS imaging library to the list of libraries."
+msgstr ""
+
+#. type: Plain text
+#: cups-config.1:108
+msgid "B<cups>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: cupsctl.man:13
+#: cupsctl.8:10
 #, no-wrap
-msgid "30 May 2016"
+msgid "cupsctl"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:16
+#: cupsctl.8:13
 msgid "cupsctl - configure cupsd.conf options"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:39
+#: cupsctl.8:36
 msgid ""
 "B<cupsctl> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<server>[B<:>I<port>] ] "
 "[ B<-->[B<no->]B<debug-logging> ] [ B<-->[B<no->]B<remote-admin> ] [ "
@@ -1596,7 +1810,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:43
+#: cupsctl.8:40
 msgid ""
 "B<cupsctl> updates or queries the I<cupsd.conf> file for a server. When no "
 "changes are requested, the current configuration values are written to the "
@@ -1604,391 +1818,578 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:45
+#: cupsctl.8:42
 msgid "The following options are recognized:"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:48
+#: cupsctl.8:45
 msgid "Enables encryption on the connection to the scheduler."
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:51
+#: cupsctl.8:48
 msgid ""
 "Specifies an alternate username to use when authenticating with the "
 "scheduler."
 msgstr ""
 
 #. type: TP
-#: cupsctl.man:51 cupsenable.man:65 lpinfo.man:71 lpmove.man:50 lpoptions.man.in:81 lpq.man:53 lpstat.man:104
+#: cupsctl.8:48 cupsenable.8:62 lpinfo.8:68 lpmove.8:47 lpoptions.1:78 lpq.1:50 lpstat.1:100
 #, no-wrap
 msgid "B<-h >I<server>[B<:>I<port>]"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:54
+#: cupsctl.8:51
 msgid "Specifies the server address."
 msgstr ""
 
 #. type: TP
-#: cupsctl.man:54
+#: cupsctl.8:51
 #, no-wrap
 msgid "B<-->[B<no->]B<debug-logging>"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:57
+#: cupsctl.8:54
 msgid "Enables (disables) debug logging to the I<error_log> file."
 msgstr ""
 
 #. type: TP
-#: cupsctl.man:57
+#: cupsctl.8:54
 #, no-wrap
 msgid "B<-->[B<no->]B<remote-admin>"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:60
+#: cupsctl.8:57
 msgid "Enables (disables) remote administration."
 msgstr ""
 
 #. type: TP
-#: cupsctl.man:60
+#: cupsctl.8:57
 #, no-wrap
 msgid "B<-->[B<no->]B<remote-any>"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:63
+#: cupsctl.8:60
 msgid "Enables (disables) printing from any address, e.g., the Internet."
 msgstr ""
 
 #. type: TP
-#: cupsctl.man:63
+#: cupsctl.8:60
 #, no-wrap
 msgid "B<-->[B<no->]B<share-printers>"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:66
+#: cupsctl.8:63
 msgid "Enables (disables) sharing of local printers with other computers."
 msgstr ""
 
 #. type: TP
-#: cupsctl.man:66
+#: cupsctl.8:63
 #, no-wrap
 msgid "B<-->[B<no->]B<user-cancel-any>"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:69
+#: cupsctl.8:66
 msgid "Allows (prevents) users to cancel jobs owned by others."
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:71
+#: cupsctl.8:68
 msgid "Display the current settings:"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:74
+#: cupsctl.8:71
 #, no-wrap
 msgid "    cupsctl\n"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:77
+#: cupsctl.8:74
 msgid "Enable debug logging:"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:80
+#: cupsctl.8:77
 #, no-wrap
 msgid "    cupsctl --debug-logging\n"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:83
+#: cupsctl.8:80
 msgid "Get the current debug logging state:"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:86
+#: cupsctl.8:83
 #, no-wrap
 msgid "    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'\n"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:89
+#: cupsctl.8:86
 msgid "Disable printer sharing:"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:92
+#: cupsctl.8:89
 #, no-wrap
 msgid "    cupsctl --no-share-printers\n"
 msgstr ""
 
 #. type: SH
-#: cupsctl.man:93
+#: cupsctl.8:90
 #, no-wrap
 msgid "KNOWN ISSUES"
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:95
+#: cupsctl.8:92
 msgid "You cannot set the Listen or Port directives using B<cupsctl>."
 msgstr ""
 
 #. type: Plain text
-#: cupsctl.man:98
+#: cupsctl.8:95
 msgid "B<cupsd.conf>(5), B<cupsd>(8),"
 msgstr ""
 
 #. type: TH
-#: cupsd.conf.man.in:13
-#, no-wrap
-msgid "cupsd.conf"
-msgstr ""
-
-#. type: TH
-#: cupsd.conf.man.in:13
+#: cupsd.8:10
 #, no-wrap
-msgid "2 May 2019"
+msgid "cupsd"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:16
-msgid "cupsd.conf - server configuration file for cups"
+#: cupsd.8:13
+msgid "cupsd - cups scheduler"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:27
+#: cupsd.8:32
 msgid ""
-"The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
-"normally located in the I</etc/cups> directory.  B<Note:> File, directory, "
-"and user configuration directives that used to be allowed in the "
-"B<cupsd.conf> file are now stored in the B<cups-files.conf>(5)  file instead "
-"in order to prevent certain types of privilege escalation attacks."
+"B<cupsd> [ B<-c> I<cupsd.conf> ] [ B<-f> ] [ B<-F> ] [ B<-h> ] [ B<-l> ] [ "
+"B<-s> I<cups-files.conf> ] [ B<-t> ]"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:32 cups-files.conf.man.in:25 mailto.conf.man:23
+#: cupsd.8:37
 msgid ""
-"Each line in the file can be a configuration directive, a blank line, or a "
-"comment.  Configuration directives typically consist of a name and zero or "
-"more values separated by whitespace.  The configuration directive name and "
-"values are case-insensitive.  Comment lines start with the # character."
+"B<cupsd> is the scheduler for CUPS. It implements a printing system based "
+"upon the Internet Printing Protocol, version 2.1, and supports most of the "
+"requirements for IPP Everywhere. If no options are specified on the "
+"command-line then the default configuration file I</etc/cups/cupsd.conf> "
+"will be used."
 msgstr ""
 
-#. type: SS
-#: cupsd.conf.man.in:32 ipptoolfile.man:86
+#. type: TP
+#: cupsd.8:38
 #, no-wrap
-msgid "TOP-LEVEL DIRECTIVES"
+msgid "B<-c>I<\\ cupsd.conf>"
 msgstr ""
 
-#. #AccessLogLevel
 #. type: Plain text
-#: cupsd.conf.man.in:36
-msgid "The following top-level directives are understood by B<cupsd>(8):"
+#: cupsd.8:41
+msgid "Uses the named cupsd.conf configuration file."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:36
+#: cupsd.8:41
 #, no-wrap
-msgid "B<AccessLogLevel config>"
+msgid "B<-f>"
 msgstr ""
 
-#. type: TP
-#: cupsd.conf.man.in:38
-#, no-wrap
-msgid "B<AccessLogLevel actions>"
+#. type: Plain text
+#: cupsd.8:46
+msgid ""
+"Run B<cupsd> in the foreground; the default is to run in the background as a "
+"\"daemon\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:40
+#: cupsd.8:46
 #, no-wrap
-msgid "B<AccessLogLevel all>"
+msgid "B<-F>"
 msgstr ""
 
-#. #AutoPurgeJobs
 #. type: Plain text
-#: cupsd.conf.man.in:48
+#: cupsd.8:54
 msgid ""
-"Specifies the logging level for the AccessLog file.  The \"config\" level "
-"logs when printers and classes are added, deleted, or modified and when "
-"configuration files are accessed or updated.  The \"actions\" level logs "
-"when print jobs are submitted, held, released, modified, or canceled, and "
-"any of the conditions for \"config\".  The \"all\" level logs all requests.  "
-"The default access log level is \"actions\"."
+"Run B<cupsd> in the foreground but detach the process from the controlling "
+"terminal and current directory. This is useful for running B<cupsd> from "
+"B<init>(8)."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:48
+#: cupsd.8:54 ipptool.1:163 lpr.1:88
 #, no-wrap
-msgid "B<AutoPurgeJobs Yes>"
+msgid "B<-h>"
+msgstr ""
+
+#. type: Plain text
+#: cupsd.8:57
+msgid "Shows the program usage."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:50
+#: cupsd.8:57 ippfind.1:74 ipptool.1:172 lpinfo.8:71 lpoptions.1:81 lpq.1:53 lpr.1:91 lpstat.1:103
 #, no-wrap
-msgid "B<AutoPurgeJobs No>"
+msgid "B<-l>"
 msgstr ""
 
-#. #BrowseLocalProtocols
 #. type: Plain text
-#: cupsd.conf.man.in:56
+#: cupsd.8:65
 msgid ""
-"Specifies whether to purge job history data automatically when it is no "
-"longer required for quotas.  The default is \"No\"."
+"This option is passed to B<cupsd> when it is run from B<launchd>(8)  or "
+"B<systemd>(8)."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:56
+#: cupsd.8:65
 #, no-wrap
-msgid "B<BrowseLocalProtocols all>"
+msgid "B<-s>I<\\ cups-files.conf>"
 msgstr ""
 
-#. type: TP
-#: cupsd.conf.man.in:58
-#, no-wrap
-msgid "B<BrowseLocalProtocols dnssd>"
+#. type: Plain text
+#: cupsd.8:68 cupsfilter.8:72
+msgid "Uses the named cups-files.conf configuration file."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:60
+#: cupsd.8:68 ipptool.1:184 lpstat.1:121 ppdc.1:73
 #, no-wrap
-msgid "B<BrowseLocalProtocols none>"
+msgid "B<-t>"
 msgstr ""
 
-#. #BrowseWebIF
 #. type: Plain text
-#: cupsd.conf.man.in:65
-msgid ""
-"Specifies which protocols to use for local printer sharing.  The default is "
-"\"dnssd\" on systems that support Bonjour and \"none\" otherwise."
-msgstr ""
-
-#. type: TP
-#: cupsd.conf.man.in:65
-#, no-wrap
-msgid "B<BrowseWebIF Yes>"
+#: cupsd.8:71
+msgid "Test the configuration file for syntax errors."
 msgstr ""
 
-#. type: TP
-#: cupsd.conf.man.in:67
+#. type: Plain text
+#: cupsd.8:80
 #, no-wrap
-msgid "B<BrowseWebIF No>"
+msgid ""
+"I</etc/cups/classes.conf>\n"
+"I</etc/cups/cups-files.conf>\n"
+"I</etc/cups/cupsd.conf>\n"
+"I</usr/share/cups/mime/mime.convs>\n"
+"I</usr/share/cups/mime/mime.types>\n"
+"I</etc/cups/printers.conf>\n"
+"I</etc/cups/subscriptions.conf>\n"
 msgstr ""
 
-#. #Browsing
 #. type: Plain text
-#: cupsd.conf.man.in:73
+#: cupsd.8:84
 msgid ""
-"Specifies whether the CUPS web interface is advertised.  The default is "
-"\"No\"."
+"B<cupsd> implements all of the required IPP/2.1 attributes and "
+"operations. It also implements several CUPS-specific administrative "
+"operations."
 msgstr ""
 
-#. type: TP
-#: cupsd.conf.man.in:73
-#, no-wrap
-msgid "B<Browsing Yes>"
+#. type: Plain text
+#: cupsd.8:88
+msgid "Run B<cupsd> in the background with the default configuration file:"
 msgstr ""
 
-#. type: TP
-#: cupsd.conf.man.in:75
+#. type: Plain text
+#: cupsd.8:91
 #, no-wrap
-msgid "B<Browsing No>"
+msgid "    cupsd\n"
 msgstr ""
 
-#. #DefaultAuthType
 #. type: Plain text
-#: cupsd.conf.man.in:81
-msgid "Specifies whether shared printers are advertised.  The default is \"No\"."
+#: cupsd.8:95
+msgid "Test a configuration file called I<test.conf>:"
+msgstr ""
+
+#. type: Plain text
+#: cupsd.8:98
+#, no-wrap
+msgid "    cupsd -t -c test.conf\n"
+msgstr ""
+
+#. type: Plain text
+#: cupsd.8:104
+msgid ""
+"Run B<cupsd> in the foreground with a test configuration file called "
+"I<test.conf>:"
+msgstr ""
+
+#. type: Plain text
+#: cupsd.8:107
+#, no-wrap
+msgid "    cupsd -f -c test.conf\n"
+msgstr ""
+
+#. type: Plain text
+#: cupsd.8:125
+msgid ""
+"B<backend>(7), B<classes.conf>(5), B<cups>(1), B<cups-files.conf>(5), "
+"B<cups-lpd>(8), B<cupsd.conf>(5), B<cupsd-helper>(8), B<cupsd-logs>(8), "
+"B<filter>(7), B<launchd>(8), B<mime.convs>(5), B<mime.types>(5), "
+"B<printers.conf>(5), B<systemd>(8), CUPS Online Help "
+"(http://localhost:631/help)"
+msgstr ""
+
+#. type: TH
+#: cupsd.conf.5:10
+#, no-wrap
+msgid "cupsd.conf"
+msgstr ""
+
+#. type: TH
+#: cupsd.conf.5:10
+#, no-wrap
+msgid "16 July 2019"
+msgstr ""
+
+#. type: Plain text
+#: cupsd.conf.5:13
+msgid "cupsd.conf - server configuration file for cups"
+msgstr ""
+
+#. type: Plain text
+#: cupsd.conf.5:25
+msgid ""
+"The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
+"normally located in the I</etc/cups> directory.  Each line in the file can "
+"be a configuration directive, a blank line, or a comment.  Configuration "
+"directives typically consist of a name and zero or more values separated by "
+"whitespace.  The configuration directive name and values are "
+"case-insensitive.  Comment lines start with the # character."
+msgstr ""
+
+#. type: SS
+#: cupsd.conf.5:25 ipptoolfile.5:83
+#, no-wrap
+msgid "TOP-LEVEL DIRECTIVES"
+msgstr ""
+
+#. #AccessLogLevel
+#. type: Plain text
+#: cupsd.conf.5:29
+msgid "The following top-level directives are understood by B<cupsd>(8):"
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:29
+#, no-wrap
+msgid "B<AccessLogLevel config>"
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:31
+#, no-wrap
+msgid "B<AccessLogLevel actions>"
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:33
+#, no-wrap
+msgid "B<AccessLogLevel all>"
+msgstr ""
+
+#. #AutoPurgeJobs
+#. type: Plain text
+#: cupsd.conf.5:41
+msgid ""
+"Specifies the logging level for the AccessLog file.  The \"config\" level "
+"logs when printers and classes are added, deleted, or modified and when "
+"configuration files are accessed or updated.  The \"actions\" level logs "
+"when print jobs are submitted, held, released, modified, or canceled, and "
+"any of the conditions for \"config\".  The \"all\" level logs all requests.  "
+"The default access log level is \"actions\"."
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:41
+#, no-wrap
+msgid "B<AutoPurgeJobs Yes>"
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:43
+#, no-wrap
+msgid "B<AutoPurgeJobs No>"
+msgstr ""
+
+#. #BrowseDNSSDSubTypes
+#. type: Plain text
+#: cupsd.conf.5:49
+msgid ""
+"Specifies whether to purge job history data automatically when it is no "
+"longer required for quotas.  The default is \"No\"."
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:49
+#, no-wrap
+msgid "B<BrowseDNSSDSubTypes>I<_subtype[,...]>"
+msgstr ""
+
+#. #BrowseLocalProtocols
+#. type: Plain text
+#: cupsd.conf.5:55
+msgid ""
+"Specifies a list of Bonjour sub-types to advertise for each shared printer.  "
+"For example, \"BrowseDNSSDSubTypes _cups,_print\" will tell network clients "
+"that both CUPS sharing and IPP Everywhere are supported.  The default is "
+"\"_cups\" which is necessary for printer sharing to work between systems "
+"using CUPS."
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:55
+#, no-wrap
+msgid "B<BrowseLocalProtocols all>"
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:57
+#, no-wrap
+msgid "B<BrowseLocalProtocols dnssd>"
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:59
+#, no-wrap
+msgid "B<BrowseLocalProtocols none>"
+msgstr ""
+
+#. #BrowseWebIF
+#. type: Plain text
+#: cupsd.conf.5:64
+msgid ""
+"Specifies which protocols to use for local printer sharing.  The default is "
+"\"dnssd\" on systems that support Bonjour and \"none\" otherwise."
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:64
+#, no-wrap
+msgid "B<BrowseWebIF Yes>"
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:66
+#, no-wrap
+msgid "B<BrowseWebIF No>"
+msgstr ""
+
+#. #Browsing
+#. type: Plain text
+#: cupsd.conf.5:72
+msgid ""
+"Specifies whether the CUPS web interface is advertised.  The default is "
+"\"No\"."
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:72
+#, no-wrap
+msgid "B<Browsing Yes>"
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:74
+#, no-wrap
+msgid "B<Browsing No>"
+msgstr ""
+
+#. #DefaultAuthType
+#. type: Plain text
+#: cupsd.conf.5:80
+msgid "Specifies whether shared printers are advertised.  The default is \"No\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:81
+#: cupsd.conf.5:80
 #, no-wrap
 msgid "B<DefaultAuthType Basic>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:83
+#: cupsd.conf.5:82
 #, no-wrap
 msgid "B<DefaultAuthType Negotiate>"
 msgstr ""
 
 #. #DefaultEncryption
 #. type: Plain text
-#: cupsd.conf.man.in:89
+#: cupsd.conf.5:88
 msgid ""
 "Specifies the default type of authentication to use.  The default is "
 "\"Basic\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:89
+#: cupsd.conf.5:88
 #, no-wrap
 msgid "B<DefaultEncryption Never>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:91
+#: cupsd.conf.5:90
 #, no-wrap
 msgid "B<DefaultEncryption IfRequested>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:93
+#: cupsd.conf.5:92
 #, no-wrap
 msgid "B<DefaultEncryption Required>"
 msgstr ""
 
 #. #DefaultLanguage
 #. type: Plain text
-#: cupsd.conf.man.in:98
+#: cupsd.conf.5:97
 msgid ""
 "Specifies whether encryption will be used for authenticated requests.  The "
 "default is \"Required\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:98
+#: cupsd.conf.5:97
 #, no-wrap
 msgid "B<DefaultLanguage >I<locale>"
 msgstr ""
 
 #. #DefaultPaperSize
 #. type: Plain text
-#: cupsd.conf.man.in:103
+#: cupsd.conf.5:102
 msgid ""
 "Specifies the default language to use for text and web content.  The default "
 "is \"en\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:103
+#: cupsd.conf.5:102
 #, no-wrap
 msgid "B<DefaultPaperSize Auto>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:105
+#: cupsd.conf.5:104
 #, no-wrap
 msgid "B<DefaultPaperSize None>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:107
+#: cupsd.conf.5:106
 #, no-wrap
 msgid "B<DefaultPaperSize >I<sizename>"
 msgstr ""
 
 #. #DefaultPolicy
 #. type: Plain text
-#: cupsd.conf.man.in:113
+#: cupsd.conf.5:112
 msgid ""
 "Specifies the default paper size for new print queues. \"Auto\" uses a "
 "locale-specific default, while \"None\" specifies there is no default paper "
@@ -1997,48 +2398,48 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:113
+#: cupsd.conf.5:112
 #, no-wrap
 msgid "B<DefaultPolicy >I<policy-name>"
 msgstr ""
 
 #. #DefaultShared
 #. type: Plain text
-#: cupsd.conf.man.in:118
+#: cupsd.conf.5:117
 msgid ""
 "Specifies the default access policy to use.  The default access policy is "
 "\"default\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:118
+#: cupsd.conf.5:117
 #, no-wrap
 msgid "B<DefaultShared Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:120
+#: cupsd.conf.5:119
 #, no-wrap
 msgid "B<DefaultShared No>"
 msgstr ""
 
 #. #DirtyCleanInterval
 #. type: Plain text
-#: cupsd.conf.man.in:125
+#: cupsd.conf.5:124
 msgid ""
 "Specifies whether local printers are shared by default.  The default is "
 "\"Yes\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:125
+#: cupsd.conf.5:124
 #, no-wrap
 msgid "B<DirtyCleanInterval >I<seconds>"
 msgstr ""
 
-#. #ErrorPolicy
+#. #DNSSDHostName
 #. type: Plain text
-#: cupsd.conf.man.in:131
+#: cupsd.conf.5:130
 msgid ""
 "Specifies the delay for updating of configuration and state files.  A value "
 "of 0 causes the update to happen as soon as possible, typically within a few "
@@ -2046,39 +2447,53 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:131
+#: cupsd.conf.5:130
+#, no-wrap
+msgid "B<DNSSDHostName>I<hostname.example.com>"
+msgstr ""
+
+#. #ErrorPolicy
+#. type: Plain text
+#: cupsd.conf.5:135
+msgid ""
+"Specifies the fully-qualified domain name for the server that is used for "
+"Bonjour sharing.  The default is typically the server's \".local\" hostname."
+msgstr ""
+
+#. type: TP
+#: cupsd.conf.5:135
 #, no-wrap
 msgid "B<ErrorPolicy abort-job>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:134
+#: cupsd.conf.5:138
 msgid ""
 "Specifies that a failed print job should be aborted (discarded) unless "
 "otherwise specified for the printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:134
+#: cupsd.conf.5:138
 #, no-wrap
 msgid "B<ErrorPolicy retry-current-job>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:137
+#: cupsd.conf.5:141
 msgid ""
 "Specifies that a failed print job should be retried immediately unless "
 "otherwise specified for the printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:137
+#: cupsd.conf.5:141
 #, no-wrap
 msgid "B<ErrorPolicy retry-job>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:140
+#: cupsd.conf.5:144
 msgid ""
 "Specifies that a failed print job should be retried at a later time unless "
 "otherwise specified for the printer. The 'retry-job' error policy is the "
@@ -2086,28 +2501,28 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:140
+#: cupsd.conf.5:144
 #, no-wrap
 msgid "B<ErrorPolicy stop-printer>"
 msgstr ""
 
 #. #FilterLimit
 #. type: Plain text
-#: cupsd.conf.man.in:144
+#: cupsd.conf.5:148
 msgid ""
 "Specifies that a failed print job should stop the printer unless otherwise "
 "specified for the printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:144
+#: cupsd.conf.5:148
 #, no-wrap
 msgid "B<FilterLimit >I<limit>"
 msgstr ""
 
 #. #FilterNice
 #. type: Plain text
-#: cupsd.conf.man.in:153
+#: cupsd.conf.5:157
 msgid ""
 "Specifies the maximum cost of filters that are run concurrently, which can "
 "be used to minimize disk, memory, and CPU resource problems.  A limit of 0 "
@@ -2119,14 +2534,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:153
+#: cupsd.conf.5:157
 #, no-wrap
 msgid "B<FilterNice >I<nice-value>"
 msgstr ""
 
 #. #GSSServiceName
 #. type: Plain text
-#: cupsd.conf.man.in:161
+#: cupsd.conf.5:165
 msgid ""
 "Specifies the scheduling priority ( B<nice>(8)  value) of filters that are "
 "run to print a job.  The nice value ranges from 0, the highest priority, to "
@@ -2134,7 +2549,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:165
+#: cupsd.conf.5:169
 msgid ""
 "Specifies the service name when using Kerberos authentication.  The default "
 "service name is \"http.\""
@@ -2142,26 +2557,26 @@ msgstr ""
 
 #. #HostNameLookups
 #. type: TP
-#: cupsd.conf.man.in:165
+#: cupsd.conf.5:169
 #, no-wrap
 msgid "B<HostNameLookups On>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:168
+#: cupsd.conf.5:172
 #, no-wrap
 msgid "B<HostNameLookups Off>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:170
+#: cupsd.conf.5:174
 #, no-wrap
 msgid "B<HostNameLookups Double>"
 msgstr ""
 
 #. #IdleExitTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:180
+#: cupsd.conf.5:184
 msgid ""
 "Specifies whether to do reverse lookups on connecting clients.  The "
 "\"Double\" setting causes B<cupsd>(8)  to verify that the hostname resolved "
@@ -2173,14 +2588,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:180
+#: cupsd.conf.5:184
 #, no-wrap
 msgid "B<IdleExitTimeout >I<seconds>"
 msgstr ""
 
 #. #JobKillDelay
 #. type: Plain text
-#: cupsd.conf.man.in:188
+#: cupsd.conf.5:192
 msgid ""
 "Specifies the length of time to wait before shutting down due to "
 "inactivity.  The default is \"60\" seconds.  Note: Only applicable when "
@@ -2188,28 +2603,28 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:188
+#: cupsd.conf.5:192
 #, no-wrap
 msgid "B<JobKillDelay >I<seconds>"
 msgstr ""
 
 #. #JobRetryInterval
 #. type: Plain text
-#: cupsd.conf.man.in:193
+#: cupsd.conf.5:197
 msgid ""
 "Specifies the number of seconds to wait before killing the filters and "
 "backend associated with a canceled or held job.  The default is \"30\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:193
+#: cupsd.conf.5:197
 #, no-wrap
 msgid "B<JobRetryInterval >I<seconds>"
 msgstr ""
 
 #. #JobRetryLimit
 #. type: Plain text
-#: cupsd.conf.man.in:199
+#: cupsd.conf.5:203
 msgid ""
 "Specifies the interval between retries of jobs in seconds.  This is "
 "typically used for fax queues but can also be used with normal print queues "
@@ -2218,14 +2633,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:199
+#: cupsd.conf.5:203
 #, no-wrap
 msgid "B<JobRetryLimit >I<count>"
 msgstr ""
 
 #. #KeepAlive
 #. type: Plain text
-#: cupsd.conf.man.in:205
+#: cupsd.conf.5:209
 msgid ""
 "Specifies the number of retries that are done for jobs.  This is typically "
 "used for fax queues but can also be used with normal print queues whose "
@@ -2234,48 +2649,48 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:205
+#: cupsd.conf.5:209
 #, no-wrap
 msgid "B<KeepAlive Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:207
+#: cupsd.conf.5:211
 #, no-wrap
 msgid "B<KeepAlive No>"
 msgstr ""
 
 #. #KeepAliveTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:212
+#: cupsd.conf.5:216
 msgid ""
 "Specifies whether to support HTTP keep-alive connections.  The default is "
 "\"Yes\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:212
+#: cupsd.conf.5:216
 #, no-wrap
 msgid "B<KeepAliveTimeout >I<seconds>"
 msgstr ""
 
 #. #LimitIPP
 #. type: Plain text
-#: cupsd.conf.man.in:217
+#: cupsd.conf.5:221
 msgid ""
 "Specifies how long an idle client connection remains open.  The default is "
 "\"30\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:217
+#: cupsd.conf.5:221
 #, no-wrap
 msgid "B<E<lt>Limit >I<operation >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 msgstr ""
 
 #. #Limit
 #. type: Plain text
-#: cupsd.conf.man.in:221
+#: cupsd.conf.5:225
 msgid ""
 "Specifies the IPP operations that are being limited inside a Policy "
 "section. IPP operation names are listed below in the section \"IPP OPERATION "
@@ -2283,20 +2698,20 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:221
+#: cupsd.conf.5:225
 #, no-wrap
 msgid "B<E<lt>Limit >I<method >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:224
+#: cupsd.conf.5:228
 #, no-wrap
 msgid "B<E<lt>LimitExcept >I<method >...B<E<gt> >... B<E<lt>/LimitExceptE<gt>>"
 msgstr ""
 
 #. #LimitRequestBody
 #. type: Plain text
-#: cupsd.conf.man.in:228
+#: cupsd.conf.5:232
 msgid ""
 "Specifies the HTTP methods that are being limited inside a Location "
 "section. HTTP method names are listed below in the section \"HTTP METHOD "
@@ -2304,46 +2719,46 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:228
+#: cupsd.conf.5:232
 #, no-wrap
 msgid "B<LimitRequestBody >I<size>"
 msgstr ""
 
 #. #Listen
 #. type: Plain text
-#: cupsd.conf.man.in:233
+#: cupsd.conf.5:237
 msgid ""
 "Specifies the maximum size of print files, IPP requests, and HTML form "
 "data.  The default is \"0\" which disables the limit check."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:233
+#: cupsd.conf.5:237
 #, no-wrap
 msgid "B<Listen >I<ipv4-address>B<:>I<port>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:235
+#: cupsd.conf.5:239
 #, no-wrap
 msgid "B<Listen [>I<ipv6-address>B<]:>I<port>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:237
+#: cupsd.conf.5:241
 #, no-wrap
 msgid "B<Listen *:>I<port>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:239
+#: cupsd.conf.5:243
 #, no-wrap
 msgid "B<Listen >I</path/to/domain/socket>"
 msgstr ""
 
 #. #ListenBackLog
 #. type: Plain text
-#: cupsd.conf.man.in:245
+#: cupsd.conf.5:249
 msgid ""
 "Listens to the specified address and port or domain socket path for "
 "connections.  Multiple Listen directives can be provided to listen on "
@@ -2352,14 +2767,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:245
+#: cupsd.conf.5:249
 #, no-wrap
 msgid "B<ListenBackLog >I<number>"
 msgstr ""
 
 #. #Location
 #. type: Plain text
-#: cupsd.conf.man.in:252
+#: cupsd.conf.5:256
 msgid ""
 "Specifies the number of pending connections that will be allowed.  This "
 "normally only affects very busy servers that have reached the MaxClients "
@@ -2371,28 +2786,28 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:252
+#: cupsd.conf.5:256
 #, no-wrap
 msgid "B<E<lt>Location >I</path>B<E<gt> >... B<E<lt>/LocationE<gt>>"
 msgstr ""
 
 #. #LogDebugHistory
 #. type: Plain text
-#: cupsd.conf.man.in:257
+#: cupsd.conf.5:261
 msgid ""
 "Specifies access control for the named location.  Paths are documented below "
 "in the section \"LOCATION PATHS\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:257
+#: cupsd.conf.5:261
 #, no-wrap
 msgid "B<LogDebugHistory >I<number>"
 msgstr ""
 
 #. #LogLevel
 #. type: Plain text
-#: cupsd.conf.man.in:261
+#: cupsd.conf.5:265
 msgid ""
 "Specifies the number of debugging messages that are retained for logging if "
 "an error occurs in a print job. Debug messages are logged regardless of the "
@@ -2400,68 +2815,68 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:261
+#: cupsd.conf.5:265
 #, no-wrap
 msgid "B<LogLevel >none"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:263
+#: cupsd.conf.5:267
 #, no-wrap
 msgid "B<LogLevel >emerg"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:265
+#: cupsd.conf.5:269
 #, no-wrap
 msgid "B<LogLevel >alert"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:267
+#: cupsd.conf.5:271
 #, no-wrap
 msgid "B<LogLevel >crit"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:269
+#: cupsd.conf.5:273
 #, no-wrap
 msgid "B<LogLevel >error"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:271
+#: cupsd.conf.5:275
 #, no-wrap
 msgid "B<LogLevel >warn"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:273
+#: cupsd.conf.5:277
 #, no-wrap
 msgid "B<LogLevel >notice"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:275
+#: cupsd.conf.5:279
 #, no-wrap
 msgid "B<LogLevel >info"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:277
+#: cupsd.conf.5:281
 #, no-wrap
 msgid "B<LogLevel >debug"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:279
+#: cupsd.conf.5:283
 #, no-wrap
 msgid "B<LogLevel >debug2"
 msgstr ""
 
 #. #LogTimeFormat
 #. type: Plain text
-#: cupsd.conf.man.in:285
+#: cupsd.conf.5:289
 msgid ""
 "Specifies the level of logging for the ErrorLog file.  The value \"none\" "
 "stops all logging while \"debug2\" logs everything.  The default is "
@@ -2469,20 +2884,20 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:285
+#: cupsd.conf.5:289
 #, no-wrap
 msgid "B<LogTimeFormat >standard"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:287
+#: cupsd.conf.5:291
 #, no-wrap
 msgid "B<LogTimeFormat >usecs"
 msgstr ""
 
 #. #MaxClients
 #. type: Plain text
-#: cupsd.conf.man.in:292
+#: cupsd.conf.5:296
 msgid ""
 "Specifies the format of the date and time in the log files.  The value "
 "\"standard\" is the default and logs whole seconds while \"usecs\" logs "
@@ -2490,56 +2905,56 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:292
+#: cupsd.conf.5:296
 #, no-wrap
 msgid "B<MaxClients >I<number>"
 msgstr ""
 
 #. #MaxClientPerHost
 #. type: Plain text
-#: cupsd.conf.man.in:297
+#: cupsd.conf.5:301
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed by the "
 "scheduler.  The default is \"100\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:297
+#: cupsd.conf.5:301
 #, no-wrap
 msgid "B<MaxClientsPerHost >I<number>"
 msgstr ""
 
 #. #MaxCopies
 #. type: Plain text
-#: cupsd.conf.man.in:303
+#: cupsd.conf.5:307
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed from a "
 "single address.  The default is the MaxClients value."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:303
+#: cupsd.conf.5:307
 #, no-wrap
 msgid "B<MaxCopies >I<number>"
 msgstr ""
 
 #. #MaxHoldTime
 #. type: Plain text
-#: cupsd.conf.man.in:308
+#: cupsd.conf.5:312
 msgid ""
 "Specifies the maximum number of copies that a user can print of each job.  "
 "The default is \"9999\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:308
+#: cupsd.conf.5:312
 #, no-wrap
 msgid "B<MaxHoldTime >I<seconds>"
 msgstr ""
 
 #. #MaxJobs
 #. type: Plain text
-#: cupsd.conf.man.in:313
+#: cupsd.conf.5:317
 msgid ""
 "Specifies the maximum time a job may remain in the \"indefinite\" hold state "
 "before it is canceled.  The default is \"0\" which disables cancellation of "
@@ -2547,56 +2962,56 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:313
+#: cupsd.conf.5:317
 #, no-wrap
 msgid "B<MaxJobs >I<number>"
 msgstr ""
 
 #. #MaxJobsPerPrinter
 #. type: Plain text
-#: cupsd.conf.man.in:319
+#: cupsd.conf.5:323
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed.  Set to "
 "\"0\" to allow an unlimited number of jobs.  The default is \"500\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:319
+#: cupsd.conf.5:323
 #, no-wrap
 msgid "B<MaxJobsPerPrinter >I<number>"
 msgstr ""
 
 #. #MaxJobsPerUser
 #. type: Plain text
-#: cupsd.conf.man.in:324
+#: cupsd.conf.5:328
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "printer.  The default is \"0\" which allows up to MaxJobs jobs per printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:324
+#: cupsd.conf.5:328
 #, no-wrap
 msgid "B<MaxJobsPerUser >I<number>"
 msgstr ""
 
 #. #MaxJobTime
 #. type: Plain text
-#: cupsd.conf.man.in:329
+#: cupsd.conf.5:333
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "user.  The default is \"0\" which allows up to MaxJobs jobs per user."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:329
+#: cupsd.conf.5:333
 #, no-wrap
 msgid "B<MaxJobTime >I<seconds>"
 msgstr ""
 
 #. #MaxLogSize
 #. type: Plain text
-#: cupsd.conf.man.in:335
+#: cupsd.conf.5:339
 msgid ""
 "Specifies the maximum time a job may take to print before it is canceled.  "
 "Set to \"0\" to disable cancellation of \"stuck\" jobs.  The default is "
@@ -2604,78 +3019,78 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:335
+#: cupsd.conf.5:339
 #, no-wrap
 msgid "B<MaxLogSize >I<size>"
 msgstr ""
 
 #. #MultipleOperationTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:341
+#: cupsd.conf.5:345
 msgid ""
 "Specifies the maximum size of the log files before they are rotated.  The "
 "value \"0\" disables log rotation.  The default is \"1048576\" (1MB)."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:341
+#: cupsd.conf.5:345
 #, no-wrap
 msgid "B<MultipleOperationTimeout >I<seconds>"
 msgstr ""
 
 #. #Policy
 #. type: Plain text
-#: cupsd.conf.man.in:346
+#: cupsd.conf.5:350
 msgid ""
 "Specifies the maximum amount of time to allow between files in a multiple "
 "file print job.  The default is \"900\" (15 minutes)."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:346
+#: cupsd.conf.5:350
 #, no-wrap
 msgid "B<E<lt>Policy >I<name>B<E<gt> >... B<E<lt>/PolicyE<gt>>"
 msgstr ""
 
 #. #Port
 #. type: Plain text
-#: cupsd.conf.man.in:350
+#: cupsd.conf.5:354
 msgid "Specifies access control for the named policy."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:350
+#: cupsd.conf.5:354
 #, no-wrap
 msgid "B<Port >I<number>"
 msgstr ""
 
 #. #PreserveJobFiles
 #. type: Plain text
-#: cupsd.conf.man.in:354
+#: cupsd.conf.5:358
 msgid "Listens to the specified port number for connections."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:354
+#: cupsd.conf.5:358
 #, no-wrap
 msgid "B<PreserveJobFiles Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:356
+#: cupsd.conf.5:360
 #, no-wrap
 msgid "B<PreserveJobFiles No>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:358
+#: cupsd.conf.5:362
 #, no-wrap
 msgid "B<PreserveJobFiles >I<seconds>"
 msgstr ""
 
 #. #PreserveJobHistory
 #. type: Plain text
-#: cupsd.conf.man.in:364
+#: cupsd.conf.5:368
 msgid ""
 "Specifies whether job files (documents) are preserved after a job is "
 "printed.  If a numeric value is specified, job files are preserved for the "
@@ -2684,26 +3099,26 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:364
+#: cupsd.conf.5:368
 #, no-wrap
 msgid "B<PreserveJobHistory Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:366
+#: cupsd.conf.5:370
 #, no-wrap
 msgid "B<PreserveJobHistory No>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:368
+#: cupsd.conf.5:372
 #, no-wrap
 msgid "B<PreserveJobHistory >I<seconds>"
 msgstr ""
 
 #. #ReloadTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:375
+#: cupsd.conf.5:379
 msgid ""
 "Specifies whether the job history is preserved after a job is printed.  If a "
 "numeric value is specified, the job history is preserved for the indicated "
@@ -2712,48 +3127,48 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:375
+#: cupsd.conf.5:379
 #, no-wrap
 msgid "B<ReloadTimeout >I<seconds>"
 msgstr ""
 
 #. #ServerAdmin
 #. type: Plain text
-#: cupsd.conf.man.in:380
+#: cupsd.conf.5:384
 msgid ""
 "Specifies the amount of time to wait for job completion before restarting "
 "the scheduler.  The default is \"30\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:380
+#: cupsd.conf.5:384
 #, no-wrap
 msgid "B<ServerAdmin >I<email-address>"
 msgstr ""
 
 #. #ServerAlias
 #. type: Plain text
-#: cupsd.conf.man.in:385
+#: cupsd.conf.5:389
 msgid ""
 "Specifies the email address of the server administrator.  The default value "
 "is \"root@ServerName\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:385
+#: cupsd.conf.5:389
 #, no-wrap
 msgid "B<ServerAlias >I<hostname >[ ... I<hostname >]"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:387
+#: cupsd.conf.5:391
 #, no-wrap
 msgid "B<ServerAlias *>"
 msgstr ""
 
 #. #ServerName
 #. type: Plain text
-#: cupsd.conf.man.in:393
+#: cupsd.conf.5:397
 msgid ""
 "The ServerAlias directive is used for HTTP Host header validation when "
 "clients connect to the scheduler from external interfaces.  Using the "
@@ -2764,1090 +3179,1080 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:393
+#: cupsd.conf.5:397
 #, no-wrap
 msgid "B<ServerName >I<hostname>"
 msgstr ""
 
 #. #ServerTokens
 #. type: Plain text
-#: cupsd.conf.man.in:400
+#: cupsd.conf.5:404
 msgid ""
 "Specifies the fully-qualified hostname of the server.  The default is the "
 "value reported by the B<hostname>(1)  command."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:400
+#: cupsd.conf.5:404
 #, no-wrap
 msgid "B<ServerTokens None>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:402
+#: cupsd.conf.5:406
 #, no-wrap
 msgid "B<ServerTokens ProductOnly>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:404
+#: cupsd.conf.5:408
 #, no-wrap
 msgid "B<ServerTokens Major>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:406
+#: cupsd.conf.5:410
 #, no-wrap
 msgid "B<ServerTokens Minor>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:408
+#: cupsd.conf.5:412
 #, no-wrap
 msgid "B<ServerTokens Minimal>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:410
+#: cupsd.conf.5:414
 #, no-wrap
 msgid "B<ServerTokens OS>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:412
+#: cupsd.conf.5:416
 #, no-wrap
 msgid "B<ServerTokens Full>"
 msgstr ""
 
 #. #SSLListen
 #. type: Plain text
-#: cupsd.conf.man.in:426
+#: cupsd.conf.5:428
 msgid ""
 "Specifies what information is included in the Server header of HTTP "
 "responses.  \"None\" disables the Server header.  \"ProductOnly\" reports "
-"\"CUPS\".  \"Major\" reports \"CUPS 2\".  \"Minor\" reports \"CUPS 2.0\".  "
-"\"Minimal\" reports \"CUPS 2.0.0\".  \"OS\" reports \"CUPS 2.0.0 (UNAME)\" "
-"where UNAME is the output of the B<uname>(1)  command.  \"Full\" reports "
-"\"CUPS 2.0.0 (UNAME) IPP/2.0\".  The default is \"Minimal\"."
+"\"CUPS\".  \"Major\" reports \"CUPS/major IPP/2\".  \"Minor\" reports "
+"\"CUPS/major.minor IPP/2.1\".  \"Minimal\" reports \"CUPS/major.minor.patch "
+"IPP/2.1\".  \"OS\" reports \"CUPS/major.minor.path (osname osversion) "
+"IPP/2.1\".  \"Full\" reports \"CUPS/major.minor.path (osname osversion; "
+"architecture) IPP/2.1\".  The default is \"Minimal\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:426
+#: cupsd.conf.5:428
 #, no-wrap
 msgid "B<SSLListen >I<ipv4-address>B<:>I<port>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:428
+#: cupsd.conf.5:430
 #, no-wrap
 msgid "B<SSLListen [>I<ipv6-address>B<]:>I<port>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:430
+#: cupsd.conf.5:432
 #, no-wrap
 msgid "B<SSLListen *:>I<port>"
 msgstr ""
 
 #. #SSLOptions
 #. type: Plain text
-#: cupsd.conf.man.in:434
+#: cupsd.conf.5:436
 msgid "Listens on the specified address and port for encrypted connections."
 msgstr ""
 
-#. #SSLPort
-#. type: Plain text
-#: cupsd.conf.man.in:448
-msgid ""
-"Sets encryption options.  By default, CUPS only supports encryption using "
-"TLS v1.0 or higher using known secure cipher suites.  Security is reduced "
-"when I<Allow> options are used.  Security is enhanced when I<Deny> options "
-"are used.  The I<AllowDH> option enables cipher suites using plain "
-"Diffie-Hellman key negotiation (not supported on systems using GNU TLS).  "
-"The I<AllowRC4> option enables the 128-bit RC4 cipher suites, which are "
-"required for some older clients.  The I<AllowSSL3> option enables SSL v3.0, "
-"which is required for some older clients that do not support TLS v1.0.  The "
-"I<DenyCBC> option disables all CBC cipher suites.  The I<DenyTLS1.0> option "
-"disables TLS v1.0 support - this sets the minimum protocol version to TLS "
-"v1.1."
-msgstr ""
-
 #. type: TP
-#: cupsd.conf.man.in:448
+#: cupsd.conf.5:454
 #, no-wrap
 msgid "B<SSLPort >I<port>"
 msgstr ""
 
 #. #StrictConformance
 #. type: Plain text
-#: cupsd.conf.man.in:452
+#: cupsd.conf.5:458
 msgid "Listens on the specified port for encrypted connections."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:452
+#: cupsd.conf.5:458
 #, no-wrap
 msgid "B<StrictConformance Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:454
+#: cupsd.conf.5:460
 #, no-wrap
 msgid "B<StrictConformance No>"
 msgstr ""
 
 #. #Timeout
 #. type: Plain text
-#: cupsd.conf.man.in:459
+#: cupsd.conf.5:465
 msgid ""
 "Specifies whether the scheduler requires clients to strictly adhere to the "
 "IPP specifications.  The default is \"No\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:459
+#: cupsd.conf.5:465
 #, no-wrap
 msgid "B<Timeout >I<seconds>"
 msgstr ""
 
 #. #WebInterface
 #. type: Plain text
-#: cupsd.conf.man.in:464
+#: cupsd.conf.5:470
 msgid "Specifies the HTTP request timeout.  The default is \"900\" (15 minutes)."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:464
+#: cupsd.conf.5:470
 #, no-wrap
 msgid "B<WebInterface yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:466
+#: cupsd.conf.5:472
 #, no-wrap
 msgid "B<WebInterface no>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:470
+#: cupsd.conf.5:476
 msgid "Specifies whether the web interface is enabled.  The default is \"No\"."
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.man.in:470
+#: cupsd.conf.5:476
 #, no-wrap
 msgid "HTTP METHOD NAMES"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:473
+#: cupsd.conf.5:479
 msgid "The following HTTP methods are supported by B<cupsd>(8):"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:473
+#: cupsd.conf.5:479
 #, no-wrap
 msgid "GET"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:476
+#: cupsd.conf.5:482
 msgid ""
 "Used by a client to download icons and other printer resources and to access "
 "the CUPS web interface."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:476
+#: cupsd.conf.5:482
 #, no-wrap
 msgid "HEAD"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:479
+#: cupsd.conf.5:485
 msgid "Used by a client to get the type, size, and modification date of resources."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:482
+#: cupsd.conf.5:488
 msgid "Used by a client to establish a secure (SSL/TLS) connection."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:482
+#: cupsd.conf.5:488
 #, no-wrap
 msgid "POST"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:485
+#: cupsd.conf.5:491
 msgid ""
 "Used by a client to submit IPP requests and HTML forms from the CUPS web "
 "interface."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:485
+#: cupsd.conf.5:491
 #, no-wrap
 msgid "PUT"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:488
+#: cupsd.conf.5:494
 msgid "Used by a client to upload configuration files."
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.man.in:488
+#: cupsd.conf.5:494
 #, no-wrap
 msgid "IPP OPERATION NAMES"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:491
+#: cupsd.conf.5:497
 msgid "The following IPP operations are supported by B<cupsd>(8):"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:491
+#: cupsd.conf.5:497
 #, no-wrap
 msgid "CUPS-Accept-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:494
+#: cupsd.conf.5:500
 msgid "Allows a printer to accept new jobs."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:494
+#: cupsd.conf.5:500
 #, no-wrap
 msgid "CUPS-Add-Modify-Class"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:497
+#: cupsd.conf.5:503
 msgid "Adds or modifies a printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:497
+#: cupsd.conf.5:503
 #, no-wrap
 msgid "CUPS-Add-Modify-Printer"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:500
+#: cupsd.conf.5:506
 msgid "Adds or modifies a printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:500
+#: cupsd.conf.5:506
 #, no-wrap
 msgid "CUPS-Authenticate-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:503
+#: cupsd.conf.5:509
 msgid "Releases a job that is held for authentication."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:503
+#: cupsd.conf.5:509
 #, no-wrap
 msgid "CUPS-Delete-Class"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:506
+#: cupsd.conf.5:512
 msgid "Deletes a printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:506
+#: cupsd.conf.5:512
 #, no-wrap
 msgid "CUPS-Delete-Printer"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:509
+#: cupsd.conf.5:515
 msgid "Deletes a printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:509
+#: cupsd.conf.5:515
 #, no-wrap
 msgid "CUPS-Get-Classes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:512
+#: cupsd.conf.5:518
 msgid "Gets a list of printer classes."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:512
+#: cupsd.conf.5:518
 #, no-wrap
 msgid "CUPS-Get-Default"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:515
+#: cupsd.conf.5:521
 msgid "Gets the server default printer or printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:515
+#: cupsd.conf.5:521
 #, no-wrap
 msgid "CUPS-Get-Devices"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:518
+#: cupsd.conf.5:524
 msgid "Gets a list of devices that are currently available."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:518
+#: cupsd.conf.5:524
 #, no-wrap
 msgid "CUPS-Get-Document"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:521
+#: cupsd.conf.5:527
 msgid "Gets a document file for a job."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:521
+#: cupsd.conf.5:527
 #, no-wrap
 msgid "CUPS-Get-PPD"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:524
+#: cupsd.conf.5:530
 msgid "Gets a PPD file."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:524
+#: cupsd.conf.5:530
 #, no-wrap
 msgid "CUPS-Get-PPDs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:527
+#: cupsd.conf.5:533
 msgid "Gets a list of installed PPD files."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:527
+#: cupsd.conf.5:533
 #, no-wrap
 msgid "CUPS-Get-Printers"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:530
+#: cupsd.conf.5:536
 msgid "Gets a list of printers."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:530
+#: cupsd.conf.5:536
 #, no-wrap
 msgid "CUPS-Move-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:533
+#: cupsd.conf.5:539
 msgid "Moves a job."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:533
+#: cupsd.conf.5:539
 #, no-wrap
 msgid "CUPS-Reject-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:536
+#: cupsd.conf.5:542
 msgid "Prevents a printer from accepting new jobs."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:536
+#: cupsd.conf.5:542
 #, no-wrap
 msgid "CUPS-Set-Default"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:539
+#: cupsd.conf.5:545
 msgid "Sets the server default printer or printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:539
+#: cupsd.conf.5:545
 #, no-wrap
 msgid "Cancel-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:542
+#: cupsd.conf.5:548
 msgid "Cancels a job."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:542
+#: cupsd.conf.5:548
 #, no-wrap
 msgid "Cancel-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:545
+#: cupsd.conf.5:551
 msgid "Cancels one or more jobs."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:545
+#: cupsd.conf.5:551
 #, no-wrap
 msgid "Cancel-My-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:548
+#: cupsd.conf.5:554
 msgid "Cancels one or more jobs creates by a user."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:548
+#: cupsd.conf.5:554
 #, no-wrap
 msgid "Cancel-Subscription"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:551
+#: cupsd.conf.5:557
 msgid "Cancels a subscription."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:551
+#: cupsd.conf.5:557
 #, no-wrap
 msgid "Close-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:554
+#: cupsd.conf.5:560
 msgid "Closes a job that is waiting for more documents."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:554
+#: cupsd.conf.5:560
 #, no-wrap
 msgid "Create-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:557
+#: cupsd.conf.5:563
 msgid "Creates a new job with no documents."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:557
+#: cupsd.conf.5:563
 #, no-wrap
 msgid "Create-Job-Subscriptions"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:560
+#: cupsd.conf.5:566
 msgid "Creates a subscription for job events."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:560
+#: cupsd.conf.5:566
 #, no-wrap
 msgid "Create-Printer-Subscriptions"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:563
+#: cupsd.conf.5:569
 msgid "Creates a subscription for printer events."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:563
+#: cupsd.conf.5:569
 #, no-wrap
 msgid "Get-Job-Attributes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:566
+#: cupsd.conf.5:572
 msgid "Gets information about a job."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:566
+#: cupsd.conf.5:572
 #, no-wrap
 msgid "Get-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:569
+#: cupsd.conf.5:575
 msgid "Gets a list of jobs."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:569
+#: cupsd.conf.5:575
 #, no-wrap
 msgid "Get-Notifications"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:572
+#: cupsd.conf.5:578
 msgid "Gets a list of event notifications for a subscription."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:572
+#: cupsd.conf.5:578
 #, no-wrap
 msgid "Get-Printer-Attributes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:575
+#: cupsd.conf.5:581
 msgid "Gets information about a printer or printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:575
+#: cupsd.conf.5:581
 #, no-wrap
 msgid "Get-Subscription-Attributes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:578
+#: cupsd.conf.5:584
 msgid "Gets information about a subscription."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:578
+#: cupsd.conf.5:584
 #, no-wrap
 msgid "Get-Subscriptions"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:581
+#: cupsd.conf.5:587
 msgid "Gets a list of subscriptions."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:581
+#: cupsd.conf.5:587
 #, no-wrap
 msgid "Hold-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:584
+#: cupsd.conf.5:590
 msgid "Holds a job from printing."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:584
+#: cupsd.conf.5:590
 #, no-wrap
 msgid "Hold-New-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:587
+#: cupsd.conf.5:593
 msgid "Holds all new jobs from printing."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:587
+#: cupsd.conf.5:593
 #, no-wrap
 msgid "Pause-Printer"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:590
+#: cupsd.conf.5:596
 msgid "Stops processing of jobs by a printer or printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:590
+#: cupsd.conf.5:596
 #, no-wrap
 msgid "Pause-Printer-After-Current-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:593
+#: cupsd.conf.5:599
 msgid ""
 "Stops processing of jobs by a printer or printer class after the current job "
 "is finished."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:593
+#: cupsd.conf.5:599
 #, no-wrap
 msgid "Print-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:596
+#: cupsd.conf.5:602
 msgid "Creates a new job with a single document."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:596
+#: cupsd.conf.5:602
 #, no-wrap
 msgid "Purge-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:599
+#: cupsd.conf.5:605
 msgid "Cancels one or more jobs and deletes the job history."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:599
+#: cupsd.conf.5:605
 #, no-wrap
 msgid "Release-Held-New-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:602
+#: cupsd.conf.5:608
 msgid "Allows previously held jobs to print."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:602
+#: cupsd.conf.5:608
 #, no-wrap
 msgid "Release-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:605
+#: cupsd.conf.5:611
 msgid "Allows a job to print."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:605
+#: cupsd.conf.5:611
 #, no-wrap
 msgid "Renew-Subscription"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:608
+#: cupsd.conf.5:614
 msgid "Renews a subscription."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:608
+#: cupsd.conf.5:614
 #, no-wrap
 msgid "Restart-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:611
+#: cupsd.conf.5:617
 msgid "Reprints a job, if possible."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:611
+#: cupsd.conf.5:617
 #, no-wrap
 msgid "Send-Document"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:614
+#: cupsd.conf.5:620
 msgid "Adds a document to a job."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:614
+#: cupsd.conf.5:620
 #, no-wrap
 msgid "Set-Job-Attributes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:617
+#: cupsd.conf.5:623
 msgid "Changes job information."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:617
+#: cupsd.conf.5:623
 #, no-wrap
 msgid "Set-Printer-Attributes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:620
+#: cupsd.conf.5:626
 msgid "Changes printer or printer class information."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:620
+#: cupsd.conf.5:626
 #, no-wrap
 msgid "Validate-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:623
+#: cupsd.conf.5:629
 msgid "Validates options for a new job."
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.man.in:623
+#: cupsd.conf.5:629
 #, no-wrap
 msgid "LOCATION PATHS"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:626
+#: cupsd.conf.5:632
 msgid "The following paths are commonly used when configuring B<cupsd>(8):"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:626
+#: cupsd.conf.5:632
 #, no-wrap
 msgid "/"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:629
+#: cupsd.conf.5:635
 msgid "The path for all get operations (get-printers, get-jobs, etc.)"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:629
+#: cupsd.conf.5:635
 #, no-wrap
 msgid "/admin"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:632
+#: cupsd.conf.5:638
 msgid ""
 "The path for all administration operations (add-printer, delete-printer, "
 "start-printer, etc.)"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:632
+#: cupsd.conf.5:638
 #, no-wrap
 msgid "/admin/conf"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:635
+#: cupsd.conf.5:641
 msgid ""
 "The path for access to the CUPS configuration files (cupsd.conf, "
 "client.conf, etc.)"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:635
+#: cupsd.conf.5:641
 #, no-wrap
 msgid "/admin/log"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:638
+#: cupsd.conf.5:644
 msgid "The path for access to the CUPS log files (access_log, error_log, page_log)"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:638
+#: cupsd.conf.5:644
 #, no-wrap
 msgid "/classes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:641
+#: cupsd.conf.5:647
 msgid "The path for all printer classes"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:641
+#: cupsd.conf.5:647
 #, no-wrap
 msgid "/classes/name"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:644
+#: cupsd.conf.5:650
 msgid "The resource for the named printer class"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:644
+#: cupsd.conf.5:650
 #, no-wrap
 msgid "/jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:647
+#: cupsd.conf.5:653
 msgid "The path for all jobs (hold-job, release-job, etc.)"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:647
+#: cupsd.conf.5:653
 #, no-wrap
 msgid "/jobs/id"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:650
+#: cupsd.conf.5:656
 msgid "The path for the specified job"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:650
+#: cupsd.conf.5:656
 #, no-wrap
 msgid "/printers"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:653
+#: cupsd.conf.5:659
 msgid "The path for all printers"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:653
+#: cupsd.conf.5:659
 #, no-wrap
 msgid "/printers/name"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:656
+#: cupsd.conf.5:662
 msgid "The path for the named printer"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:656
+#: cupsd.conf.5:662
 #, no-wrap
 msgid "/printers/name.png"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:659
+#: cupsd.conf.5:665
 msgid "The icon file path for the named printer"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:659
+#: cupsd.conf.5:665
 #, no-wrap
 msgid "/printers/name.ppd"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:662
+#: cupsd.conf.5:668
 msgid "The PPD file path for the named printer"
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.man.in:662
+#: cupsd.conf.5:668
 #, no-wrap
 msgid "DIRECTIVES VALID WITHIN LOCATION AND LIMIT SECTIONS"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:664
+#: cupsd.conf.5:670
 msgid ""
 "The following directives may be placed inside Location and Limit sections in "
 "the B<cupsd.conf> file:"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:664
+#: cupsd.conf.5:670
 #, no-wrap
 msgid "B<Allow all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:666
+#: cupsd.conf.5:672
 #, no-wrap
 msgid "B<Allow none>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:668
+#: cupsd.conf.5:674
 #, no-wrap
 msgid "B<Allow >I<host.domain.com>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:670
+#: cupsd.conf.5:676
 #, no-wrap
 msgid "B<Allow *.>I<domain.com>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:672
+#: cupsd.conf.5:678
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:674
+#: cupsd.conf.5:680
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>B</>I<netmask>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:676
+#: cupsd.conf.5:682
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>B</>I<mm>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:678
+#: cupsd.conf.5:684
 #, no-wrap
 msgid "B<Allow [>I<ipv6-address>B<]>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:680
+#: cupsd.conf.5:686
 #, no-wrap
 msgid "B<Allow [>I<ipv6-address>B<]/>I<mm>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:682
+#: cupsd.conf.5:688
 #, no-wrap
 msgid "B<Allow @IF(>I<name>B<)>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:684
+#: cupsd.conf.5:690
 #, no-wrap
 msgid "B<Allow @LOCAL>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:688
+#: cupsd.conf.5:696
 msgid ""
 "Allows access from the named hosts, domains, addresses, or interfaces.  The "
-"Order directive controls whether Allow lines are evaluated before or after "
-"Deny lines."
+"@IF(name) form uses the current subnets configured for the named interface.  "
+"The @LOCAL form uses the current subnets configured for all interfaces that "
+"are not point-to-point, for example Ethernet and Wi-Fi interfaces are used "
+"but DSL and VPN interfaces are not.  The Order directive controls whether "
+"Allow lines are evaluated before or after Deny lines."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:688
+#: cupsd.conf.5:696
 #, no-wrap
 msgid "B<AuthType None>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:690
+#: cupsd.conf.5:698
 #, no-wrap
 msgid "B<AuthType Basic>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:692
+#: cupsd.conf.5:700
 #, no-wrap
 msgid "B<AuthType Default>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:694
+#: cupsd.conf.5:702
 #, no-wrap
 msgid "B<AuthType Negotiate>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:698
+#: cupsd.conf.5:706
 msgid ""
 "Specifies the type of authentication required.  The value \"Default\" "
 "corresponds to the DefaultAuthType value."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:698
+#: cupsd.conf.5:706
 #, no-wrap
 msgid "B<Deny all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:700
+#: cupsd.conf.5:708
 #, no-wrap
 msgid "B<Deny none>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:702
+#: cupsd.conf.5:710
 #, no-wrap
 msgid "B<Deny >I<host.domain.com>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:704
+#: cupsd.conf.5:712
 #, no-wrap
 msgid "B<Deny *.>I<domain.com>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:706
+#: cupsd.conf.5:714
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:708
+#: cupsd.conf.5:716
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>B</>I<netmask>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:710
+#: cupsd.conf.5:718
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>B</>I<mm>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:712
+#: cupsd.conf.5:720
 #, no-wrap
 msgid "B<Deny [>I<ipv6-address>B<]>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:714
+#: cupsd.conf.5:722
 #, no-wrap
 msgid "B<Deny [>I<ipv6-address>B<]/>I<mm>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:716
+#: cupsd.conf.5:724
 #, no-wrap
 msgid "B<Deny @IF(>I<name>B<)>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:718
+#: cupsd.conf.5:726
 #, no-wrap
 msgid "B<Deny @LOCAL>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:722
+#: cupsd.conf.5:732
 msgid ""
 "Denies access from the named hosts, domains, addresses, or interfaces.  The "
-"Order directive controls whether Deny lines are evaluated before or after "
-"Allow lines."
+"@IF(name) form uses the current subnets configured for the named interface.  "
+"The @LOCAL form uses the current subnets configured for all interfaces that "
+"are not point-to-point, for example Ethernet and Wi-Fi interfaces are used "
+"but DSL and VPN interfaces are not.  The Order directive controls whether "
+"Deny lines are evaluated before or after Allow lines."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:730
+#: cupsd.conf.5:740
 msgid ""
 "Specifies the level of encryption that is required for a particular "
 "location.  The default value is \"IfRequested\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:730
+#: cupsd.conf.5:740
 #, no-wrap
 msgid "B<Order allow,deny>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:733
+#: cupsd.conf.5:743
 msgid ""
 "Specifies that access is denied by default. Allow lines are then processed "
 "followed by Deny lines to determine whether a client may access a particular "
@@ -3855,13 +4260,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:733
+#: cupsd.conf.5:743
 #, no-wrap
 msgid "B<Order deny,allow>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:736
+#: cupsd.conf.5:746
 msgid ""
 "Specifies that access is allowed by default. Deny lines are then processed "
 "followed by Allow lines to determine whether a client may access a "
@@ -3869,26 +4274,26 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:736
+#: cupsd.conf.5:746
 #, no-wrap
 msgid "B<Require group >I<group-name >[ I<group-name >... ]"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:739
+#: cupsd.conf.5:749
 msgid ""
 "Specifies that an authenticated user must be a member of one of the named "
 "groups."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:739
+#: cupsd.conf.5:749
 #, no-wrap
 msgid "B<Require user {>I<user-name>|B<@>I<group-name>} ..."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:747
+#: cupsd.conf.5:757
 msgid ""
 "Specifies that an authenticated user must match one of the named users or be "
 "a member of one of the named groups.  The group name \"@SYSTEM\" corresponds "
@@ -3900,37 +4305,37 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:747
+#: cupsd.conf.5:757
 #, no-wrap
 msgid "B<Require valid-user>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:750
+#: cupsd.conf.5:760
 msgid "Specifies that any authenticated user is acceptable."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:750
+#: cupsd.conf.5:760
 #, no-wrap
 msgid "B<Satisfy all>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:753
+#: cupsd.conf.5:763
 msgid ""
 "Specifies that all Allow, AuthType, Deny, Order, and Require conditions must "
 "be satisfied to allow access."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:753
+#: cupsd.conf.5:763
 #, no-wrap
 msgid "B<Satisfy any>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:757
+#: cupsd.conf.5:767
 msgid ""
 "Specifies that any a client may access a resource if either the "
 "authentication (AuthType/Require) or address (Allow/Deny/Order) conditions "
@@ -3939,38 +4344,38 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.man.in:757
+#: cupsd.conf.5:767
 #, no-wrap
 msgid "DIRECTIVES VALID WITHIN POLICY SECTIONS"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:759
+#: cupsd.conf.5:769
 msgid ""
 "The following directives may be placed inside Policy sections in the "
 "B<cupsd.conf> file:"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:759
+#: cupsd.conf.5:769
 #, no-wrap
 msgid "B<JobPrivateAccess all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:761
+#: cupsd.conf.5:771
 #, no-wrap
 msgid "B<JobPrivateAccess default>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:763
+#: cupsd.conf.5:773
 #, no-wrap
 msgid "B<JobPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:772
+#: cupsd.conf.5:782
 msgid ""
 "Specifies an access list for a job's private values.  The \"default\" access "
 "list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's "
@@ -3980,31 +4385,31 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:772
+#: cupsd.conf.5:782
 #, no-wrap
 msgid "B<JobPrivateValues all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:774
+#: cupsd.conf.5:784
 #, no-wrap
 msgid "B<JobPrivateValues default>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:776
+#: cupsd.conf.5:786
 #, no-wrap
 msgid "B<JobPrivateValues none>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:778
+#: cupsd.conf.5:788
 #, no-wrap
 msgid "B<JobPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:782
+#: cupsd.conf.5:792
 msgid ""
 "Specifies the list of job values to make private.  The \"default\" values "
 "are \"job-name\", \"job-originating-host-name\", "
@@ -4012,19 +4417,19 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:782
+#: cupsd.conf.5:792
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:784
+#: cupsd.conf.5:794
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess default>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:786
+#: cupsd.conf.5:796
 #, no-wrap
 msgid ""
 "B<SubscriptionPrivateAccess "
@@ -4032,7 +4437,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:795
+#: cupsd.conf.5:805
 msgid ""
 "Specifies an access list for a subscription's private values.  The "
 "\"default\" access list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the "
@@ -4042,31 +4447,31 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:795
+#: cupsd.conf.5:805
 #, no-wrap
 msgid "B<SubscriptionPrivateValues all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:797
+#: cupsd.conf.5:807
 #, no-wrap
 msgid "B<SubscriptionPrivateValues default>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:799
+#: cupsd.conf.5:809
 #, no-wrap
 msgid "B<SubscriptionPrivateValues none>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:801
+#: cupsd.conf.5:811
 #, no-wrap
 msgid "B<SubscriptionPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:805
+#: cupsd.conf.5:815
 msgid ""
 "Specifies the list of subscription values to make private.  The \"default\" "
 "values are \"notify-events\", \"notify-pull-method\", "
@@ -4075,28 +4480,28 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.man.in:805 cups-files.conf.man.in:233
+#: cupsd.conf.5:815 cups-files.conf.5:230
 #, no-wrap
 msgid "DEPRECATED DIRECTIVES"
 msgstr ""
 
 #. #Classification
 #. type: Plain text
-#: cupsd.conf.man.in:808
+#: cupsd.conf.5:818
 msgid ""
 "The following directives are deprecated and will be removed in a future "
 "release of CUPS:"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:808
+#: cupsd.conf.5:818
 #, no-wrap
 msgid "B<Classification >I<banner>"
 msgstr ""
 
 #. #ClassifyOverride
 #. type: Plain text
-#: cupsd.conf.man.in:815
+#: cupsd.conf.5:825
 msgid ""
 "Specifies the security classification of the server.  Any valid banner name "
 "can be used, including \"classified\", \"confidential\", \"secret\", "
@@ -4105,20 +4510,20 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:815
+#: cupsd.conf.5:825
 #, no-wrap
 msgid "B<ClassifyOverride Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:817
+#: cupsd.conf.5:827
 #, no-wrap
 msgid "B<ClassifyOverride No>"
 msgstr ""
 
 #. #PageLogFormat
 #. type: Plain text
-#: cupsd.conf.man.in:823
+#: cupsd.conf.5:833
 msgid ""
 "Specifies whether users may override the classification (cover page) of "
 "individual print jobs using the \"job-sheets\" option.  The default is "
@@ -4126,13 +4531,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:823
+#: cupsd.conf.5:833
 #, no-wrap
 msgid "B<PageLogFormat >I<format-string>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:828
+#: cupsd.conf.5:838
 msgid ""
 "Specifies the format of PageLog lines.  Sequences beginning with percent (%) "
 "characters are replaced with the corresponding information, while all other "
@@ -4141,7 +4546,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:838
+#: cupsd.conf.5:848
 #, no-wrap
 msgid ""
 "    \"%%\" inserts a single percent character.\n"
@@ -4156,40 +4561,67 @@ msgstr ""
 
 #. #RIPCache
 #. type: Plain text
-#: cupsd.conf.man.in:843
+#: cupsd.conf.5:854
 msgid ""
 "The default is the empty string, which disables page logging.  The string "
 "\"%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} "
-"%{media} %{sides}\" creates a page log with the standard items."
+"%{media} %{sides}\" creates a page log with the standard items.  Use "
+"\"%{job-impressions-completed}\" to insert the number of pages (sides) that "
+"were printed, or \"%{job-media-sheets-completed}\" to insert the number of "
+"sheets that were printed."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.man.in:843
+#: cupsd.conf.5:854
 #, no-wrap
 msgid "B<RIPCache >I<size>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:847
+#: cupsd.conf.5:858
 msgid ""
 "Specifies the maximum amount of memory to use when converting documents into "
 "bitmaps for a printer.  The default is \"128m\"."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:849
+#: cupsd.conf.5:862
+msgid ""
+"File, directory, and user configuration directives that used to be allowed "
+"in the B<cupsd.conf> file are now stored in the B<cups-files.conf>(5)  file "
+"instead in order to prevent certain types of privilege escalation attacks."
+msgstr ""
+
+#. type: Plain text
+#: cupsd.conf.5:869
+msgid ""
+"The scheduler MUST be restarted manually after making changes to the "
+"B<cupsd.conf> file.  On Linux this is typically done using the "
+"B<systemctl>(8)  command, while on macOS the B<launchctl>(8)  command is "
+"used instead."
+msgstr ""
+
+#. type: Plain text
+#: cupsd.conf.5:873
+msgid ""
+"The @LOCAL macro name can be confusing since the system running B<cupsd> "
+"often belongs to a different set of subnets from its clients."
+msgstr ""
+
+#. type: Plain text
+#: cupsd.conf.5:875
 msgid ""
 "The B<cupsd.conf> file format is based on the Apache HTTP Server "
 "configuration file format."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:851
+#: cupsd.conf.5:877
 msgid "Log everything with a maximum log file size of 32 megabytes:"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:856
+#: cupsd.conf.5:882
 #, no-wrap
 msgid ""
 "    AccessLogLevel all\n"
@@ -4198,12 +4630,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:859
+#: cupsd.conf.5:885
 msgid "Require authentication for accesses from outside the 10. network:"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:868
+#: cupsd.conf.5:894
 #, no-wrap
 msgid ""
 "    E<lt>Location /E<gt>\n"
@@ -4216,53 +4648,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.man.in:878
+#: cupsd.conf.5:904
 msgid ""
 "B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<mime.convs>(5), "
 "B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), CUPS Online "
 "Help (http://localhost:631/help)"
 msgstr ""
 
-#. type: Plain text
-#: cupsd.conf.man.in:879 ipptoolfile.man:652
-msgid "Copyright \\[co] 2007-2019 by Apple Inc."
-msgstr ""
-
 #. type: TH
-#: cupsd-helper.man:13
+#: cupsd-helper.8:10
 #, no-wrap
 msgid "cupsd-helper"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:16
-msgid "cupsd-helper - cupsd helper programs"
+#: cupsd-helper.8:13
+msgid "cupsd-helper - cupsd helper programs (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:22
+#: cupsd-helper.8:19
 msgid "B<cups-deviced> I<request-id> I<limit> I<user-id> I<options>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:26
+#: cupsd-helper.8:23
 msgid "B<cups-driverd> B<cat> I<ppd-name>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:32
+#: cupsd-helper.8:29
 msgid "B<cups-driverd> B<list> I<request_id> I<limit> I<options>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:49
+#: cupsd-helper.8:46
 msgid ""
 "B<cups-exec> I<sandbox-profile> [ I<-g> I<group-id> ] [ I<-n> I<nice-value> "
 "] [ I<-u> I<user-id> ] I</path/to/program> I<argv0> I<...> I<argvN>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:55
+#: cupsd-helper.8:52
 msgid ""
 "The B<cupsd-helper> programs perform long-running operations on behalf of "
 "the scheduler, B<cupsd>(8).  The B<cups-deviced> helper program runs each "
@@ -4271,7 +4698,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:57
+#: cupsd-helper.8:54
 msgid ""
 "The B<cups-driverd> helper program lists all available printer drivers, a "
 "subset of \"matching\" printer drivers, or a copy of a specific driver PPD "
@@ -4279,21 +4706,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:59
+#: cupsd-helper.8:56
 msgid ""
 "The B<cups-exec> helper program runs backends, filters, and other "
 "programs. On macOS these programs are run in a secure sandbox."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:61
+#: cupsd-helper.8:58
 msgid ""
 "The B<cups-driverd> program looks for PPD and driver information files in "
 "the following directories:"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:70
+#: cupsd-helper.8:67
 #, no-wrap
 msgid ""
 "    I</Library/Printers>\n"
@@ -4306,45 +4733,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:77
+#: cupsd-helper.8:74
 msgid ""
 "PPD files can be compressed using the B<gzip>(1)  program or placed in "
 "compressed B<tar>(1)  archives to further reduce their size."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:80
+#: cupsd-helper.8:77
 msgid ""
 "Driver information files must conform to the format defined in "
 "B<ppdcfile>(5)."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-helper.man:88
+#: cupsd-helper.8:89
 msgid ""
 "B<backend>(7), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), B<filter>(7), "
 "B<ppdcfile>(5), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: cupsd-logs.man:13
+#: cupsd-logs.5:10
 #, no-wrap
 msgid "cupsd-logs"
 msgstr ""
 
-#. type: TH
-#: cupsd-logs.man:13
-#, no-wrap
-msgid "8 November 2017"
-msgstr ""
-
 #. type: Plain text
-#: cupsd-logs.man:16
+#: cupsd-logs.5:13
 msgid "cupsd-logs - cupsd log files (access_log, error_log, and page_log)"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:24
+#: cupsd-logs.5:21
 msgid ""
 "B<cupsd>(8)  normally maintains three log files: I<access_log> to track "
 "requests that are submitted to the scheduler, I<error_log> to track progress "
@@ -4354,13 +4775,13 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: cupsd-logs.man:24
+#: cupsd-logs.5:21
 #, no-wrap
 msgid "ACCESS LOG FILE FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:27
+#: cupsd-logs.5:24
 msgid ""
 "The I<access_log> file lists each HTTP resource that is accessed by a web "
 "browser or client.  Each line is in an extended version of the so-called "
@@ -4368,7 +4789,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:31
+#: cupsd-logs.5:28
 #, no-wrap
 msgid ""
 "    I<host group user date-time >\"I<method resource version>\" I<status "
@@ -4377,12 +4798,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:34 cupsd-logs.man:129
+#: cupsd-logs.5:31 cupsd-logs.5:126
 msgid "For example:"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:47
+#: cupsd-logs.5:44
 #, no-wrap
 msgid ""
 "    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] \"POST / HTTP/1.1\" 200 317\n"
@@ -4399,7 +4820,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:50
+#: cupsd-logs.5:47
 msgid ""
 "The I<host> field will normally only be an IP address unless you have "
 "enabled the HostNameLookups directive in the I<cupsd.conf> file or if the IP "
@@ -4407,12 +4828,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:52
+#: cupsd-logs.5:49
 msgid "The I<group> field always contains \"-\"."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:55
+#: cupsd-logs.5:52
 msgid ""
 "The I<user> field is the authenticated username of the requesting user.  If "
 "no username and password is supplied for the request then this field "
@@ -4420,14 +4841,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:57
+#: cupsd-logs.5:54
 msgid ""
 "The I<date-time> field is the date and time of the request in local time and "
 "is in the format \"[DD/MON/YYYY:HH:MM:SS +ZZZZ]\"."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:64
+#: cupsd-logs.5:61
 msgid ""
 "The I<method> field is the HTTP method used: \"GET\", \"HEAD\", \"OPTIONS\", "
 "\"POST\", or \"PUT\".  \"GET\" requests are used to get files from the "
@@ -4439,183 +4860,183 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:66
+#: cupsd-logs.5:63
 msgid "The I<resource> field is the filename of the requested resource."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:69
+#: cupsd-logs.5:66
 msgid ""
 "The I<version> field is the HTTP specification version used by the client.  "
 "For CUPS clients this will always be \"HTTP/1.1\"."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:71
+#: cupsd-logs.5:68
 msgid ""
 "The I<status> field contains the HTTP result status of the request, as "
 "follows:"
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:72
+#: cupsd-logs.5:69
 #, no-wrap
 msgid "200"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:75
+#: cupsd-logs.5:72
 msgid "Successful operation."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:75
+#: cupsd-logs.5:72
 #, no-wrap
 msgid "201"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:78
+#: cupsd-logs.5:75
 msgid "File created/modified successfully."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:78
+#: cupsd-logs.5:75
 #, no-wrap
 msgid "304"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:81
+#: cupsd-logs.5:78
 msgid "The requested file has not changed."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:81
+#: cupsd-logs.5:78
 #, no-wrap
 msgid "400"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:84
+#: cupsd-logs.5:81
 msgid ""
 "Bad HTTP request; typically this means that you have a malicious program "
 "trying to access your server."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:84
+#: cupsd-logs.5:81
 #, no-wrap
 msgid "401"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:87
+#: cupsd-logs.5:84
 msgid "Unauthorized, authentication (username + password) is required."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:87
+#: cupsd-logs.5:84
 #, no-wrap
 msgid "403"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:90
+#: cupsd-logs.5:87
 msgid ""
 "Access is forbidden; typically this means that a client tried to access a "
 "file or resource they do not have permission to access."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:90
+#: cupsd-logs.5:87
 #, no-wrap
 msgid "404"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:93
+#: cupsd-logs.5:90
 msgid "The file or resource does not exist."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:93
+#: cupsd-logs.5:90
 #, no-wrap
 msgid "405"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:96
+#: cupsd-logs.5:93
 msgid ""
 "URL access method is not allowed; typically this means you have a web "
 "browser using your server as a proxy."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:96
+#: cupsd-logs.5:93
 #, no-wrap
 msgid "413"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:99
+#: cupsd-logs.5:96
 msgid ""
 "Request too large; typically this means that a client tried to print a file "
 "larger than the MaxRequestSize allows."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:99
+#: cupsd-logs.5:96
 #, no-wrap
 msgid "426"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:102
+#: cupsd-logs.5:99
 msgid "Upgrading to TLS-encrypted connection."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:102
+#: cupsd-logs.5:99
 #, no-wrap
 msgid "500"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:105
+#: cupsd-logs.5:102
 msgid ""
 "Server error; typically this happens when the server is unable to "
 "open/create a file - consult the error_log file for details."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:105
+#: cupsd-logs.5:102
 #, no-wrap
 msgid "501"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:108
+#: cupsd-logs.5:105
 msgid ""
 "The client requested encryption but encryption support is not "
 "enabled/compiled in."
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:108
+#: cupsd-logs.5:105
 #, no-wrap
 msgid "505"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:111
+#: cupsd-logs.5:108
 msgid ""
 "HTTP version number not supported; typically this means that you have a "
 "malicious program trying to access your server."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:115
+#: cupsd-logs.5:112
 msgid ""
 "The I<bytes> field contains the number of bytes in the request.  For POST "
 "requests the bytes field contains the number of bytes of non-IPP data that "
@@ -4623,27 +5044,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:117
+#: cupsd-logs.5:114
 msgid ""
 "The I<ipp-operation> field contains either \"-\" for non-IPP requests or the "
 "IPP operation name for POST requests containing an IPP request."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:119
+#: cupsd-logs.5:116
 msgid ""
 "The I<ipp-status> field contains either \"-\" for non-IPP requests or the "
 "IPP status code name for POST requests containing an IPP response."
 msgstr ""
 
 #. type: SS
-#: cupsd-logs.man:119
+#: cupsd-logs.5:116
 #, no-wrap
 msgid "ERROR LOG FILE FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:123
+#: cupsd-logs.5:120
 msgid ""
 "The I<error_log> file lists messages from the scheduler - errors, warnings, "
 "etc. The LogLevel directive in the B<cupsd.conf>(5)  file controls which "
@@ -4651,13 +5072,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:126
+#: cupsd-logs.5:123
 #, no-wrap
 msgid "    level date-time message\n"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:143
+#: cupsd-logs.5:140
 #, no-wrap
 msgid ""
 "    I [20/May/1999:19:18:28 +0000] [Job 1] Queued on 'DeskJet' by 'mike'.\n"
@@ -4675,111 +5096,111 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:146
+#: cupsd-logs.5:143
 msgid "The I<level> field contains the type of message:"
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:146
+#: cupsd-logs.5:143
 #, no-wrap
 msgid "A"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:149
+#: cupsd-logs.5:146
 msgid "Alert message (LogLevel alert)"
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:149
+#: cupsd-logs.5:146
 #, no-wrap
 msgid "C"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:152
+#: cupsd-logs.5:149
 msgid "Critical error message (LogLevel crit)"
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:152
+#: cupsd-logs.5:149
 #, no-wrap
 msgid "D"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:155
+#: cupsd-logs.5:152
 msgid "Debugging message (LogLevel debug)"
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:155
+#: cupsd-logs.5:152
 #, no-wrap
 msgid "d"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:158
+#: cupsd-logs.5:155
 msgid "Detailed debugging message (LogLevel debug2)"
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:158
+#: cupsd-logs.5:155
 #, no-wrap
 msgid "E"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:161
+#: cupsd-logs.5:158
 msgid "Normal error message (LogLevel error)"
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:161
+#: cupsd-logs.5:158
 #, no-wrap
 msgid "I"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:164
+#: cupsd-logs.5:161
 msgid "Informational message (LogLevel info)"
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:164
+#: cupsd-logs.5:161
 #, no-wrap
 msgid "N"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:167
+#: cupsd-logs.5:164
 msgid "Notice message (LogLevel notice)"
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:167
+#: cupsd-logs.5:164
 #, no-wrap
 msgid "W"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:170
+#: cupsd-logs.5:167
 msgid "Warning message (LogLevel warn)"
 msgstr ""
 
 #. type: TP
-#: cupsd-logs.man:170
+#: cupsd-logs.5:167
 #, no-wrap
 msgid "X"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:173
+#: cupsd-logs.5:170
 msgid "Emergency error message (LogLevel emerg)"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:175
+#: cupsd-logs.5:172
 msgid ""
 "The I<date-time> field contains the date and time of when the page started "
 "printing. The format of this field is identical to the data-time field in "
@@ -4787,27 +5208,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:178
+#: cupsd-logs.5:175
 msgid ""
 "The I<message> field contains a free-form textual message.  Messages from "
 "job filters are prefixed with \"[Job NNN]\" where \"NNN\" is the job ID."
 msgstr ""
 
 #. type: SS
-#: cupsd-logs.man:178
+#: cupsd-logs.5:175
 #, no-wrap
 msgid "PAGE LOG FILE FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:181
+#: cupsd-logs.5:178
 msgid ""
 "The I<page_log> file lists the total number of pages (sheets) that are "
 "printed.  By default, each line contains the following information:"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:185
+#: cupsd-logs.5:182
 #, no-wrap
 msgid ""
 "    I<printer user job-id date-time >B<total >I<num-sheets job-billing\n"
@@ -4815,12 +5236,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:188
+#: cupsd-logs.5:185
 msgid "For example the entry for a two page job called \"myjob\" might look like:"
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:192
+#: cupsd-logs.5:189
 #, no-wrap
 msgid ""
 "    DeskJet root 1 [20/May/1999:19:21:06 +0000] total 2 acme-123\n"
@@ -4828,14 +5249,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:197
+#: cupsd-logs.5:194
 msgid ""
 "The PageLogFormat directive in the B<cupsd.conf>(5)  file can be used to "
 "change this information."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:200
+#: cupsd-logs.5:197
 msgid ""
 "The I<printer> field contains the name of the printer that printed the "
 "page.  If you send a job to a printer class, this field will contain the "
@@ -4843,19 +5264,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:202
+#: cupsd-logs.5:199
 msgid ""
 "The I<user> field contains the name of the user (the IPP "
 "requesting-user-name attribute) that submitted this file for printing."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:204
+#: cupsd-logs.5:201
 msgid "The I<job-id> field contains the job number of the page being printed."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:207
+#: cupsd-logs.5:204
 msgid ""
 "The I<date-time> field contains the date and time of when the page started "
 "printing.  The format of this field is identical to the data-time field in "
@@ -4863,14 +5284,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:209
+#: cupsd-logs.5:206
 msgid ""
 "The I<num-sheets> field provides the total number of pages (sheets) that "
 "have been printed on for the job."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:211
+#: cupsd-logs.5:208
 msgid ""
 "The I<job-billing> field contains a copy of the job-billing or "
 "job-account-id attributes provided with the IPP Create-Job or Print-Job "
@@ -4878,21 +5299,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:213
+#: cupsd-logs.5:210
 msgid ""
 "The I<job-originating-host-name> field contains the hostname or IP address "
 "of the client that printed the job."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:215
+#: cupsd-logs.5:212
 msgid ""
 "The I<job-name> field contains a copy of the job-name attribute provided "
 "with the IPP Create-Job or Print-Job requests or \"-\" if none was provided."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:217
+#: cupsd-logs.5:214
 msgid ""
 "The I<media> field contains a copy of the media or media-col/media-size "
 "attribute provided with the IPP Create-Job or Print-Job requests or \"-\" if "
@@ -4900,313 +5321,124 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:219
+#: cupsd-logs.5:216
 msgid ""
 "The I<sides> field contains a copy of the sides attribute provided with the "
 "IPP Create-Job or Print-Job requests or \"-\" if none was provided."
 msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:224
+#: cupsd-logs.5:221
 msgid ""
 "B<cupsd>(8), B<cupsd.conf>(5), B<cups-files.conf>(5), CUPS Online Help "
 "(http://localhost:631/help)"
 msgstr ""
 
-#. type: Plain text
-#: cupsd-logs.man:225 cups-files.conf.man.in:287 lpadmin.man:217 lpoptions.man.in:121
-msgid "Copyright \\[co] 2007-2018 by Apple Inc."
-msgstr ""
-
 #. type: TH
-#: cupsd.man.in:13
+#: cupsenable.8:10
 #, no-wrap
-msgid "cupsd"
+msgid "cupsenable"
 msgstr ""
 
-#. type: TH
-#: cupsd.man.in:13
-#, no-wrap
-msgid "12 February 2016"
+#. type: Plain text
+#: cupsenable.8:13
+msgid "cupsdisable, cupsenable - stop/start printers and classes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.man.in:16
-msgid "cupsd - cups scheduler"
+#: cupsenable.8:31
+msgid ""
+"B<cupsdisable> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h "
+">I<server>[B<:>I<port>] ] [ B<-r> I<reason> ] [ B<--hold> ] "
+"I<destination(s)>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.man.in:35
+#: cupsenable.8:46
 msgid ""
-"B<cupsd> [ B<-c> I<cupsd.conf> ] [ B<-f> ] [ B<-F> ] [ B<-h> ] [ B<-l> ] [ "
-"B<-s> I<cups-files.conf> ] [ B<-t> ]"
+"B<cupsenable> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h "
+">I<server>[B<:>I<port>] ] [ B<--release> ] I<destination(s)>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.man.in:40
+#: cupsenable.8:51
 msgid ""
-"B<cupsd> is the scheduler for CUPS. It implements a printing system based "
-"upon the Internet Printing Protocol, version 2.1, and supports most of the "
-"requirements for IPP Everywhere. If no options are specified on the "
-"command-line then the default configuration file I</etc/cups/cupsd.conf> "
-"will be used."
+"B<cupsenable> starts the named printers or classes while B<cupsdisable> "
+"stops the named printers or classes."
 msgstr ""
 
-#. type: TP
-#: cupsd.man.in:41
-#, no-wrap
-msgid "B<-c>I<\\ cupsd.conf>"
+#. type: Plain text
+#: cupsenable.8:53
+msgid "The following options may be used:"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.man.in:44
-msgid "Uses the named cupsd.conf configuration file."
+#: cupsenable.8:56
+msgid "Forces encryption of the connection to the server."
+msgstr ""
+
+#. type: Plain text
+#: cupsenable.8:59
+msgid "Uses the specified username when connecting to the server."
 msgstr ""
 
 #. type: TP
-#: cupsd.man.in:44
+#: cupsenable.8:59 ipptool.1:154 lp.1:105
 #, no-wrap
-msgid "B<-f>"
+msgid "B<-c>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.man.in:49
-msgid ""
-"Run B<cupsd> in the foreground; the default is to run in the background as a "
-"\"daemon\"."
+#: cupsenable.8:62
+msgid "Cancels all jobs on the named destination."
+msgstr ""
+
+#. type: Plain text
+#: cupsenable.8:65
+msgid "Uses the specified server and port."
 msgstr ""
 
 #. type: TP
-#: cupsd.man.in:49
+#: cupsenable.8:65
 #, no-wrap
-msgid "B<-F>"
+msgid "B<--hold>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.man.in:57
+#: cupsenable.8:69
 msgid ""
-"Run B<cupsd> in the foreground but detach the process from the controlling "
-"terminal and current directory. This is useful for running B<cupsd> from "
-"B<init>(8)."
+"Holds remaining jobs on the named printer.  Useful for allowing the current "
+"job to complete before performing maintenance."
 msgstr ""
 
 #. type: TP
-#: cupsd.man.in:57 ../test/ippserver.man:89 ipptool.man:158 lpr.man:91
+#: cupsenable.8:69
 #, no-wrap
-msgid "B<-h>"
+msgid "B<-r \">I<reason>B<\">"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.man.in:60
-msgid "Shows the program usage."
+#: cupsenable.8:73
+msgid ""
+"Sets the message associated with the stopped state.  If no reason is "
+"specified then the message is set to \"Reason Unknown\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.man.in:60 ippfind.man:77 ipptool.man:167 lpinfo.man:74 lpoptions.man.in:84 lpq.man:56 lpr.man:94 lpstat.man:107
+#: cupsenable.8:73
 #, no-wrap
-msgid "B<-l>"
+msgid "B<--release>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.man.in:68
-msgid ""
-"This option is passed to B<cupsd> when it is run from B<launchd>(8)  or "
-"B<systemd>(8)."
-msgstr ""
-
-#. type: TP
-#: cupsd.man.in:68
-#, no-wrap
-msgid "B<-s>I<\\ cups-files.conf>"
-msgstr ""
-
-#. type: Plain text
-#: cupsd.man.in:71 cupsfilter.man:75
-msgid "Uses the named cups-files.conf configuration file."
-msgstr ""
-
-#. type: TP
-#: cupsd.man.in:71 ipptool.man:179 lpstat.man:125 ppdc.man:76
-#, no-wrap
-msgid "B<-t>"
-msgstr ""
-
-#. type: Plain text
-#: cupsd.man.in:74
-msgid "Test the configuration file for syntax errors."
-msgstr ""
-
-#. type: Plain text
-#: cupsd.man.in:83
-#, no-wrap
-msgid ""
-"I</etc/cups/classes.conf>\n"
-"I</etc/cups/cups-files.conf>\n"
-"I</etc/cups/cupsd.conf>\n"
-"I</usr/share/cups/mime/mime.convs>\n"
-"I</usr/share/cups/mime/mime.types>\n"
-"I</etc/cups/printers.conf>\n"
-"I</etc/cups/subscriptions.conf>\n"
-msgstr ""
-
-#. type: Plain text
-#: cupsd.man.in:87
-msgid ""
-"B<cupsd> implements all of the required IPP/2.1 attributes and "
-"operations. It also implements several CUPS-specific administrative "
-"operations."
-msgstr ""
-
-#. type: Plain text
-#: cupsd.man.in:91
-msgid "Run B<cupsd> in the background with the default configuration file:"
-msgstr ""
-
-#. type: Plain text
-#: cupsd.man.in:94
-#, no-wrap
-msgid "    cupsd\n"
-msgstr ""
-
-#. type: Plain text
-#: cupsd.man.in:98
-msgid "Test a configuration file called I<test.conf>:"
-msgstr ""
-
-#. type: Plain text
-#: cupsd.man.in:101
-#, no-wrap
-msgid "    cupsd -t -c test.conf\n"
-msgstr ""
-
-#. type: Plain text
-#: cupsd.man.in:107
-msgid ""
-"Run B<cupsd> in the foreground with a test configuration file called "
-"I<test.conf>:"
-msgstr ""
-
-#. type: Plain text
-#: cupsd.man.in:110
-#, no-wrap
-msgid "    cupsd -f -c test.conf\n"
-msgstr ""
-
-#. type: Plain text
-#: cupsd.man.in:128
-msgid ""
-"B<backend>(7), B<classes.conf>(5), B<cups>(1), B<cups-files.conf>(5), "
-"B<cups-lpd>(8), B<cupsd.conf>(5), B<cupsd-helper>(8), B<cupsd-logs>(8), "
-"B<filter>(7), B<launchd>(8), B<mime.convs>(5), B<mime.types>(5), "
-"B<printers.conf>(5), B<systemd>(8), CUPS Online Help "
-"(http://localhost:631/help)"
-msgstr ""
-
-#. type: TH
-#: cupsenable.man:13
-#, no-wrap
-msgid "cupsenable"
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:16
-msgid "cupsdisable, cupsenable - stop/start printers and classes"
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:34
-msgid ""
-"B<cupsdisable> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h "
-">I<server>[B<:>I<port>] ] [ B<-r> I<reason> ] [ B<--hold> ] "
-"I<destination(s)>"
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:49
-msgid ""
-"B<cupsenable> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h "
-">I<server>[B<:>I<port>] ] [ B<--release> ] I<destination(s)>"
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:54
-msgid ""
-"B<cupsenable> starts the named printers or classes while B<cupsdisable> "
-"stops the named printers or classes."
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:56
-msgid "The following options may be used:"
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:59
-msgid "Forces encryption of the connection to the server."
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:62
-msgid "Uses the specified username when connecting to the server."
-msgstr ""
-
-#. type: TP
-#: cupsenable.man:62 ipptool.man:149 lp.man:108
-#, no-wrap
-msgid "B<-c>"
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:65
-msgid "Cancels all jobs on the named destination."
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:68
-msgid "Uses the specified server and port."
-msgstr ""
-
-#. type: TP
-#: cupsenable.man:68
-#, no-wrap
-msgid "B<--hold>"
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:72
-msgid ""
-"Holds remaining jobs on the named printer.  Useful for allowing the current "
-"job to complete before performing maintenance."
-msgstr ""
-
-#. type: TP
-#: cupsenable.man:72
-#, no-wrap
-msgid "B<-r \">I<reason>B<\">"
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:76
-msgid ""
-"Sets the message associated with the stopped state.  If no reason is "
-"specified then the message is set to \"Reason Unknown\"."
-msgstr ""
-
-#. type: TP
-#: cupsenable.man:76
-#, no-wrap
-msgid "B<--release>"
-msgstr ""
-
-#. type: Plain text
-#: cupsenable.man:80
+#: cupsenable.8:77
 msgid ""
 "Releases pending jobs for printing.  Use after running B<cupsdisable> with "
 "the I<--hold> option to resume printing."
 msgstr ""
 
 #. type: Plain text
-#: cupsenable.man:83 lp.man:235
+#: cupsenable.8:80 lp.1:199 lpadmin.8:200
 msgid ""
 "Unlike the System V printing system, CUPS allows printer names to contain "
 "any printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer "
@@ -5214,7 +5446,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsenable.man:88
+#: cupsenable.8:85
 msgid ""
 "The System V versions of these commands are B<disable> and B<enable>, "
 "respectively.  They have been renamed to avoid conflicts with the B<bash>(1)  "
@@ -5222,7 +5454,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsenable.man:91
+#: cupsenable.8:88
 msgid ""
 "The CUPS versions of B<disable> and B<enable> may ask the user for an access "
 "password depending on the printing system configuration.  This differs from "
@@ -5230,69 +5462,72 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsenable.man:99
+#: cupsenable.8:96
 msgid ""
 "B<cupsaccept>(8), B<cupsreject>(8), B<cancel>(1), B<lp>(1), B<lpadmin>(8), "
 "B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: cups-files.conf.man.in:13
+#: cups-files.conf.5:10
 #, no-wrap
 msgid "cups-files.conf"
 msgstr ""
 
-#. type: TH
-#: cups-files.conf.man.in:13
-#, no-wrap
-msgid "25 February 2018 "
-msgstr ""
-
 #. type: Plain text
-#: cups-files.conf.man.in:16
+#: cups-files.conf.5:13
 msgid "cups-files.conf - file and directory configuration file for cups"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:20
+#: cups-files.conf.5:17
 msgid ""
 "The B<cups-files.conf> file configures the files and directories used by the "
 "CUPS scheduler, B<cupsd>(8).  It is normally located in the I</etc/cups> "
 "directory."
 msgstr ""
 
+#. type: Plain text
+#: cups-files.conf.5:22 mailto.conf.5:20
+msgid ""
+"Each line in the file can be a configuration directive, a blank line, or a "
+"comment.  Configuration directives typically consist of a name and zero or "
+"more values separated by whitespace.  The configuration directive name and "
+"values are case-insensitive.  Comment lines start with the # character."
+msgstr ""
+
 #. #AccessLog
 #. type: Plain text
-#: cups-files.conf.man.in:29
+#: cups-files.conf.5:26
 msgid "The following directives are understood by B<cupsd>(8):"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:29
+#: cups-files.conf.5:26
 #, no-wrap
 msgid "B<AccessLog>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:31
+#: cups-files.conf.5:28
 #, no-wrap
 msgid "B<AccessLog >I<filename>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:33
+#: cups-files.conf.5:30
 #, no-wrap
 msgid "B<AccessLog stderr>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:35
+#: cups-files.conf.5:32
 #, no-wrap
 msgid "B<AccessLog syslog>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:42
+#: cups-files.conf.5:39
 msgid ""
 "Defines the access log filename.  Specifying a blank filename disables "
 "access log generation.  The value \"stderr\" causes log entries to be sent "
@@ -5304,26 +5539,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:45
+#: cups-files.conf.5:42
 #, no-wrap
 msgid "    AccessLog /var/log/cups/%s-access_log\n"
 msgstr ""
 
 #. #CacheDir
 #. type: Plain text
-#: cups-files.conf.man.in:49
+#: cups-files.conf.5:46
 msgid "The default is \"/var/log/cups/access_log\"."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:49
+#: cups-files.conf.5:46
 #, no-wrap
 msgid "B<CacheDir >I<directory>"
 msgstr ""
 
 #. #ConfigFilePerm
 #. type: Plain text
-#: cups-files.conf.man.in:54
+#: cups-files.conf.5:51
 msgid ""
 "Specifies the directory to use for long-lived temporary (cache) files.  The "
 "default is \"/var/spool/cups/cache\" or \"/var/cache/cups\" depending on the "
@@ -5331,13 +5566,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:54
+#: cups-files.conf.5:51
 #, no-wrap
 msgid "B<ConfigFilePerm >I<mode>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:58
+#: cups-files.conf.5:55
 msgid ""
 "Specifies the permissions for all configuration files that the scheduler "
 "writes.  The default is \"0644\" on macOS and \"0640\" on all other "
@@ -5346,7 +5581,7 @@ msgstr ""
 
 #. #CreateSelfSignedCerts
 #. type: Plain text
-#: cups-files.conf.man.in:63
+#: cups-files.conf.5:60
 msgid ""
 "B<Note:> The permissions for the I<printers.conf> file are currently masked "
 "to only allow access from the scheduler user (typically root).  This is done "
@@ -5356,79 +5591,79 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:63
+#: cups-files.conf.5:60
 #, no-wrap
 msgid "B<CreateSelfSignedCerts yes>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:65
+#: cups-files.conf.5:62
 #, no-wrap
 msgid "B<CreateSelfSignedCerts no>"
 msgstr ""
 
 #. #DataDir
 #. type: Plain text
-#: cups-files.conf.man.in:70
+#: cups-files.conf.5:67
 msgid ""
 "Specifies whether the scheduler automatically creates self-signed "
 "certificates for client connections using TLS.  The default is yes."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:70
+#: cups-files.conf.5:67
 #, no-wrap
 msgid "B<DataDir >I<path>"
 msgstr ""
 
 #. #DocumentRoot
 #. type: Plain text
-#: cups-files.conf.man.in:75
+#: cups-files.conf.5:72
 msgid ""
 "Specifies the directory where data files can be found.  The default is "
 "usually \"/usr/share/cups\"."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:75
+#: cups-files.conf.5:72
 #, no-wrap
 msgid "B<DocumentRoot >I<directory>"
 msgstr ""
 
 #. #ErrorLog
 #. type: Plain text
-#: cups-files.conf.man.in:80
+#: cups-files.conf.5:77
 msgid ""
 "Specifies the root directory for the CUPS web interface content.  The "
 "default is usually \"/usr/share/doc/cups\"."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:80
+#: cups-files.conf.5:77
 #, no-wrap
 msgid "B<ErrorLog>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:82
+#: cups-files.conf.5:79
 #, no-wrap
 msgid "B<ErrorLog >I<filename>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:84
+#: cups-files.conf.5:81
 #, no-wrap
 msgid "B<ErrorLog stderr>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:86
+#: cups-files.conf.5:83
 #, no-wrap
 msgid "B<ErrorLog syslog>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:93
+#: cups-files.conf.5:90
 msgid ""
 "Defines the error log filename.  Specifying a blank filename disables error "
 "log generation.  The value \"stderr\" causes log entries to be sent to the "
@@ -5439,134 +5674,134 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:96
+#: cups-files.conf.5:93
 #, no-wrap
 msgid "    ErrorLog /var/log/cups/%s-error_log\n"
 msgstr ""
 
 #. #FatalErrors
 #. type: Plain text
-#: cups-files.conf.man.in:100
+#: cups-files.conf.5:97
 msgid "The default is \"/var/log/cups/error_log\"."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:100
+#: cups-files.conf.5:97
 #, no-wrap
 msgid "B<FatalErrors none>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:102
+#: cups-files.conf.5:99
 #, no-wrap
 msgid "B<FatalErrors all >I<-kind >[ ... I<-kind >]"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:104
+#: cups-files.conf.5:101
 #, no-wrap
 msgid "B<FatalErrors >I<kind >[ ... I<kind >]"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:109
+#: cups-files.conf.5:106
 msgid ""
 "Specifies which errors are fatal, causing the scheduler to exit.  The "
 "default is \"config\".  The I<kind> strings are:"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:110
+#: cups-files.conf.5:107
 #, no-wrap
 msgid "B<none>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:113
+#: cups-files.conf.5:110
 msgid "No errors are fatal."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:113
+#: cups-files.conf.5:110
 #, no-wrap
 msgid "B<all>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:116
+#: cups-files.conf.5:113
 msgid "All of the errors below are fatal."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:116
+#: cups-files.conf.5:113
 #, no-wrap
 msgid "B<browse>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:119
+#: cups-files.conf.5:116
 msgid ""
 "Browsing initialization errors are fatal, for example failed connections to "
 "the DNS-SD daemon."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:119
+#: cups-files.conf.5:116
 #, no-wrap
 msgid "B<config>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:122
+#: cups-files.conf.5:119
 msgid "Configuration file syntax errors are fatal."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:122
+#: cups-files.conf.5:119
 #, no-wrap
 msgid "B<listen>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:125
+#: cups-files.conf.5:122
 msgid ""
 "Listen or Port errors are fatal, except for IPv6 failures on the loopback or "
 "\"any\" addresses."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:125
+#: cups-files.conf.5:122
 #, no-wrap
 msgid "B<log>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:128
+#: cups-files.conf.5:125
 msgid "Log file creation or write errors are fatal."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:128
+#: cups-files.conf.5:125
 #, no-wrap
 msgid "B<permissions>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:131
+#: cups-files.conf.5:128
 msgid ""
 "Bad startup file permissions are fatal, for example shared TLS certificate "
 "and key files with world-read permissions."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:133
+#: cups-files.conf.5:130
 #, no-wrap
 msgid "B<Group >I<group-name-or-number>"
 msgstr ""
 
 #. #LogFilePerm
 #. type: Plain text
-#: cups-files.conf.man.in:138
+#: cups-files.conf.5:135
 msgid ""
 "Specifies the group name or ID that will be used when executing external "
 "programs.  The default group is operating system specific but is usually "
@@ -5574,39 +5809,39 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:138
+#: cups-files.conf.5:135
 #, no-wrap
 msgid "B<LogFilePerm >I<mode>"
 msgstr ""
 
 #. #PageLog
 #. type: Plain text
-#: cups-files.conf.man.in:143
+#: cups-files.conf.5:140
 msgid ""
 "Specifies the permissions of all log files that the scheduler writes.  The "
 "default is \"0644\"."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:143
+#: cups-files.conf.5:140
 #, no-wrap
 msgid "B<PageLog >[ I<filename> ]"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:145
+#: cups-files.conf.5:142
 #, no-wrap
 msgid "B<PageLog stderr>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:147
+#: cups-files.conf.5:144
 #, no-wrap
 msgid "B<PageLog syslog>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:154
+#: cups-files.conf.5:151
 msgid ""
 "Defines the page log filename.  The value \"stderr\" causes log entries to "
 "be sent to the standard error file when the scheduler is running in the "
@@ -5617,26 +5852,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:157
+#: cups-files.conf.5:154
 #, no-wrap
 msgid "    PageLog /var/log/cups/%s-page_log\n"
 msgstr ""
 
 #. #PassEnv
 #. type: Plain text
-#: cups-files.conf.man.in:161
+#: cups-files.conf.5:158
 msgid "The default is \"/var/log/cups/page_log\"."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:161
+#: cups-files.conf.5:158
 #, no-wrap
 msgid "B<PassEnv >I<variable >[ ... I<variable >]"
 msgstr ""
 
 #. #RemoteRoot
 #. type: Plain text
-#: cups-files.conf.man.in:166
+#: cups-files.conf.5:163
 msgid ""
 "Passes the specified environment variable(s) to child processes.  Note: the "
 "standard CUPS filter and backend environment variables cannot be overridden "
@@ -5644,48 +5879,48 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:166
+#: cups-files.conf.5:163
 #, no-wrap
 msgid "B<RemoteRoot >I<username>"
 msgstr ""
 
 #. #RequestRoot
 #. type: Plain text
-#: cups-files.conf.man.in:171
+#: cups-files.conf.5:168
 msgid ""
 "Specifies the username that is associated with unauthenticated accesses by "
 "clients claiming to be the root user.  The default is \"remroot\"."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:171
+#: cups-files.conf.5:168
 #, no-wrap
 msgid "B<RequestRoot >I<directory>"
 msgstr ""
 
 #. #Sandboxing
 #. type: Plain text
-#: cups-files.conf.man.in:176
+#: cups-files.conf.5:173
 msgid ""
 "Specifies the directory that contains print jobs and other HTTP request "
 "data.  The default is \"/var/spool/cups\"."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:176
+#: cups-files.conf.5:173
 #, no-wrap
 msgid "B<Sandboxing relaxed>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:178
+#: cups-files.conf.5:175
 #, no-wrap
 msgid "B<Sandboxing strict>"
 msgstr ""
 
 #. #ServerBin
 #. type: Plain text
-#: cups-files.conf.man.in:184
+#: cups-files.conf.5:181
 msgid ""
 "Specifies the level of security sandboxing that is applied to print filters, "
 "backends, and other child processes of the scheduler.  The default is "
@@ -5693,14 +5928,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:184
+#: cups-files.conf.5:181
 #, no-wrap
 msgid "B<ServerBin >I<directory>"
 msgstr ""
 
 #. #ServerKeychain
 #. type: Plain text
-#: cups-files.conf.man.in:189
+#: cups-files.conf.5:186
 msgid ""
 "Specifies the directory containing the backends, CGI programs, filters, "
 "helper programs, notifiers, and port monitors.  The default is "
@@ -5708,14 +5943,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:189
+#: cups-files.conf.5:186
 #, no-wrap
 msgid "B<ServerKeychain >I<path>"
 msgstr ""
 
 #. #ServerRoot
 #. type: Plain text
-#: cups-files.conf.man.in:195
+#: cups-files.conf.5:192
 msgid ""
 "Specifies the location of TLS certificates and private keys.  The default is "
 "\"/Library/Keychains/System.keychain\" on macOS and \"/etc/cups/ssl\" on all "
@@ -5726,28 +5961,28 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:195
+#: cups-files.conf.5:192
 #, no-wrap
 msgid "B<ServerRoot >I<directory>"
 msgstr ""
 
 #. #SetEnv
 #. type: Plain text
-#: cups-files.conf.man.in:200
+#: cups-files.conf.5:197
 msgid ""
 "Specifies the directory containing the server configuration files.  The "
 "default is \"/etc/cups\"."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:200
+#: cups-files.conf.5:197
 #, no-wrap
 msgid "B<SetEnv >I<variable value>"
 msgstr ""
 
 #. #StateDir
 #. type: Plain text
-#: cups-files.conf.man.in:205
+#: cups-files.conf.5:202
 msgid ""
 "Set the specified environment variable to be passed to child processes.  "
 "Note: the standard CUPS filter and backend environment variables cannot be "
@@ -5755,48 +5990,48 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:205
+#: cups-files.conf.5:202
 #, no-wrap
 msgid "B<StateDir >I<directory>"
 msgstr ""
 
 #. #SyncOnClose
 #. type: Plain text
-#: cups-files.conf.man.in:210
+#: cups-files.conf.5:207
 msgid ""
 "Specifies the directory to use for PID and local certificate files.  The "
 "default is \"/var/run/cups\" or \"/etc/cups\" depending on the platform."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:210
+#: cups-files.conf.5:207
 #, no-wrap
 msgid "B<SyncOnClose Yes>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:212
+#: cups-files.conf.5:209
 #, no-wrap
 msgid "B<SyncOnClose No>"
 msgstr ""
 
 #. #SystemGroup
 #. type: Plain text
-#: cups-files.conf.man.in:219
+#: cups-files.conf.5:216
 msgid ""
 "Specifies whether the scheduler calls B<fsync>(2)  after writing "
 "configuration or state files.  The default is \"Yes\"."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:219
+#: cups-files.conf.5:216
 #, no-wrap
 msgid "B<SystemGroup >I<group-name >[ ... I<group-name> ]"
 msgstr ""
 
 #. #TempDir
 #. type: Plain text
-#: cups-files.conf.man.in:224
+#: cups-files.conf.5:221
 msgid ""
 "Specifies the group(s) to use for I<@SYSTEM> group authentication.  The "
 "default contains \"admin\", \"lpadmin\", \"root\", \"sys\", and/or "
@@ -5804,27 +6039,27 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:224
+#: cups-files.conf.5:221
 #, no-wrap
 msgid "B<TempDir >I<directory>"
 msgstr ""
 
 #. #User
 #. type: Plain text
-#: cups-files.conf.man.in:229
+#: cups-files.conf.5:226
 msgid ""
 "Specifies the directory where short-term temporary files are stored.  The "
 "default is \"/var/spool/cups/tmp\"."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:229
+#: cups-files.conf.5:226
 #, no-wrap
 msgid "B<User >I<username>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:233
+#: cups-files.conf.5:230
 msgid ""
 "Specifies the user name or ID that is used when running external programs.  "
 "The default is \"lp\"."
@@ -5832,27 +6067,27 @@ msgstr ""
 
 #. #FileDevice
 #. type: Plain text
-#: cups-files.conf.man.in:236
+#: cups-files.conf.5:233
 msgid ""
 "The following directives are deprecated and will be removed from a future "
 "version of CUPS:"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:236
+#: cups-files.conf.5:233
 #, no-wrap
 msgid "B<FileDevice Yes>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:238
+#: cups-files.conf.5:235
 #, no-wrap
 msgid "B<FileDevice No>"
 msgstr ""
 
 #. #FontPath
 #. type: Plain text
-#: cups-files.conf.man.in:246
+#: cups-files.conf.5:243
 msgid ""
 "Specifies whether the file pseudo-device can be used for new printer "
 "queues.  The URI \"file:///dev/null\" is always allowed.  File devices "
@@ -5862,14 +6097,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:246
+#: cups-files.conf.5:243
 #, no-wrap
 msgid "B<FontPath >I<directory[:...:directoryN]>"
 msgstr ""
 
 #. #LPDConfigFile
 #. type: Plain text
-#: cups-files.conf.man.in:254
+#: cups-files.conf.5:251
 msgid ""
 "Specifies a colon separated list of directories where fonts can be found.  "
 "On Linux the B<font-config>(1)  mechanism is used instead.  On macOS the "
@@ -5877,50 +6112,50 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:254
+#: cups-files.conf.5:251
 #, no-wrap
 msgid " B<LPDConfigFile >I<filename>"
 msgstr ""
 
 #. #Printcap
 #. type: Plain text
-#: cups-files.conf.man.in:258
+#: cups-files.conf.5:255
 msgid "Specifies the LPD service configuration file to update."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:258
+#: cups-files.conf.5:255
 #, no-wrap
 msgid "B<Printcap >I<filename>"
 msgstr ""
 
 #. #PrintcapFormat
 #. type: Plain text
-#: cups-files.conf.man.in:262
+#: cups-files.conf.5:259
 msgid "Specifies a file that is filled with a list of local print queues."
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:262
+#: cups-files.conf.5:259
 #, no-wrap
 msgid "B<PrintcapFormat bsd>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:264
+#: cups-files.conf.5:261
 #, no-wrap
 msgid "B<PrintcapFormat plist>"
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:266
+#: cups-files.conf.5:263
 #, no-wrap
 msgid "B<PrintcapFormat solaris>"
 msgstr ""
 
 #. #SMBConfigFile
 #. type: Plain text
-#: cups-files.conf.man.in:273
+#: cups-files.conf.5:270
 msgid ""
 "Specifies the format to use for the Printcap file.  \"bsd\" is the "
 "historical LPD printcap file format.  \"plist\" is the Apple plist file "
@@ -5928,18 +6163,27 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-files.conf.man.in:273
+#: cups-files.conf.5:270
 #, no-wrap
 msgid "B<SMBConfigFile >I<filename>"
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:276
+#: cups-files.conf.5:273
 msgid "Specifies the SMB service configuration file to update."
 msgstr ""
 
 #. type: Plain text
-#: cups-files.conf.man.in:286
+#: cups-files.conf.5:280
+msgid ""
+"The scheduler MUST be restarted manually after making changes to the "
+"B<cups-files.conf> file.  On Linux this is typically done using the "
+"B<systemctl>(8)  command, while on macOS the B<launchctl>(8)  command is "
+"used instead."
+msgstr ""
+
+#. type: Plain text
+#: cups-files.conf.5:290
 msgid ""
 "B<classes.conf>(5), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), "
 "B<mime.convs>(5), B<mime.types>(5), B<printers.conf>(5), "
@@ -5947,18 +6191,20 @@ msgid ""
 msgstr ""
 
 #. type: TH
-#: cupsfilter.man:12
+#: cupsfilter.8:9
 #, no-wrap
 msgid "cupsfilter"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:15
-msgid "cupsfilter - convert a file to another format using cups filters"
+#: cupsfilter.8:12
+msgid ""
+"cupsfilter - convert a file to another format using cups filters "
+"(deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:57
+#: cupsfilter.8:54
 msgid ""
 "B<cupsfilter> [ B<--list-filters> ] [ B<-D> ] [ B<-U> I<user> ] [ B<-c> "
 "I<config-file> ] [ B<-d> I<printer> ] [ B<-e> ] [ B<-i> I<mime/type> ] [ "
@@ -5968,7 +6214,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:62
+#: cupsfilter.8:59
 msgid ""
 "B<cupsfilter> is a front-end to the CUPS filter subsystem which allows you "
 "to convert a file to a specific format, just as if you had printed the file "
@@ -5977,102 +6223,102 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:63
+#: cupsfilter.8:60
 #, no-wrap
 msgid "B<--list-filters>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:66
+#: cupsfilter.8:63
 msgid "Do not actually run the filters, just print the filters used to stdout."
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:66
+#: cupsfilter.8:63
 #, no-wrap
 msgid "B<-D>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:69
+#: cupsfilter.8:66
 msgid "Delete the input file after conversion."
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:69
+#: cupsfilter.8:66
 #, no-wrap
 msgid "B<-U >I<user>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:72
+#: cupsfilter.8:69
 msgid ""
 "Specifies the username passed to the filters. The default is the name of the "
 "current user."
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:72
+#: cupsfilter.8:69
 #, no-wrap
 msgid "B<-c >I<config-file>"
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:75
+#: cupsfilter.8:72
 #, no-wrap
 msgid "B<-d >I<printer>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:78
+#: cupsfilter.8:75
 msgid "Uses information from the named printer."
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:78 lpstat.man:101
+#: cupsfilter.8:75 lpstat.1:97
 #, no-wrap
 msgid "B<-e>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:81
+#: cupsfilter.8:78
 msgid "Use every filter from the PPD file."
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:81
+#: cupsfilter.8:78
 #, no-wrap
 msgid "B<-i >I<mime/type>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:84
+#: cupsfilter.8:81
 msgid ""
 "Specifies the source file type. The default file type is guessed using the "
 "filename and contents of the file."
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:84
+#: cupsfilter.8:81
 #, no-wrap
 msgid "B<-j >I<job-id[,N]>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:87
+#: cupsfilter.8:84
 msgid ""
 "Converts document N from the specified job. If N is omitted, document 1 is "
 "converted."
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:87
+#: cupsfilter.8:84
 #, no-wrap
 msgid "B<-m >I<mime/type>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:90
+#: cupsfilter.8:87
 msgid ""
 "Specifies the destination file type. The default file type is "
 "application/pdf. Use printer/foo to convert to the printer format defined by "
@@ -6080,74 +6326,74 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:90 lp.man:124
+#: cupsfilter.8:87 lp.1:121
 #, no-wrap
 msgid "B<-n >I<copies>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:93
+#: cupsfilter.8:90
 msgid "Specifies the number of copies to generate."
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:93 cups-lpd.man.in:44
+#: cupsfilter.8:90 cups-lpd.8:41
 #, no-wrap
 msgid "B<-o >I<name=value>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:96
+#: cupsfilter.8:93
 msgid "Specifies options to pass to the CUPS filters."
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:96
+#: cupsfilter.8:93
 #, no-wrap
 msgid "B<-p >I<filename.ppd>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:99
+#: cupsfilter.8:96
 msgid "Specifies the PPD file to use."
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:99
+#: cupsfilter.8:96
 #, no-wrap
 msgid "B<-t >I<title>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:102
+#: cupsfilter.8:99
 msgid "Specifies the document title."
 msgstr ""
 
 #. type: TP
-#: cupsfilter.man:102
+#: cupsfilter.8:99
 #, no-wrap
 msgid "B<-u>"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:105
+#: cupsfilter.8:102
 msgid "Delete the PPD file after conversion."
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:108
+#: cupsfilter.8:105
 msgid "B<cupsfilter> returns a non-zero exit status on any error."
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:113
+#: cupsfilter.8:110
 msgid ""
 "All of the standard B<cups>(1)  environment variables affect the operation "
 "of B<cupsfilter>."
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:120
+#: cupsfilter.8:117
 #, no-wrap
 msgid ""
 "/etc/cups/cups-files.conf\n"
@@ -6158,7 +6404,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:124
+#: cupsfilter.8:121
+msgid ""
+"CUPS printer drivers, filters, and backends are deprecated and will no "
+"longer be supported in a future feature release of CUPS.  Printers that do "
+"not support IPP can be supported using applications such as "
+"B<ippeveprinter>(1)."
+msgstr ""
+
+#. type: Plain text
+#: cupsfilter.8:125
 msgid ""
 "Unlike when printing, filters run using the B<cupsfilter> command use the "
 "current user and security session. This may result in different output or "
@@ -6166,57 +6421,53 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: cupsfilter.man:124 cups-lpd.man.in:86 lpadmin.man:203
+#: cupsfilter.8:125 cups-lpd.8:86 lpadmin.8:217
 #, no-wrap
 msgid "EXAMPLE"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:126
+#: cupsfilter.8:127
 msgid ""
 "The following command will generate a PDF preview of job 42 for a printer "
 "named \"myprinter\" and save it to a file named \"preview.pdf\":"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:129
+#: cupsfilter.8:130
 #, no-wrap
 msgid "    cupsfilter -m application/pdf -d myprinter -j 42 E<gt>preview.pdf\n"
 msgstr ""
 
 #. type: Plain text
-#: cupsfilter.man:137
+#: cupsfilter.8:138
 msgid ""
 "B<cups>(1), B<cupsd.conf>(5), B<filter(7),> B<mime.convs>(7), "
 "B<mime.types>(7), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: cups-lpd.man.in:13
+#: cups-lpd.8:10
 #, no-wrap
 msgid "cups-lpd"
 msgstr ""
 
-#. type: TH
-#: cups-lpd.man.in:13
-#, no-wrap
-msgid "3 June 2014"
-msgstr ""
-
 #. type: Plain text
-#: cups-lpd.man.in:16
-msgid "cups-lpd - receive print jobs and report printer status to lpd clients"
+#: cups-lpd.8:13
+msgid ""
+"cups-lpd - receive print jobs and report printer status to lpd clients "
+"(deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:26
+#: cups-lpd.8:23
 msgid ""
 "B<cups-lpd> [ B<-h >I<hostname>[B<:>I<port>] ] [ B<-n> ] [ B<-o> "
 "I<option=value> ]"
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:35
+#: cups-lpd.8:32
 msgid ""
 "B<cups-lpd> is the CUPS Line Printer Daemon (\"LPD\") mini-server that "
 "supports legacy client systems that use the LPD protocol.  B<cups-lpd> does "
@@ -6226,31 +6477,31 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-lpd.man.in:36 lp.man:115
+#: cups-lpd.8:33 lp.1:112
 #, no-wrap
 msgid "B<-h >I<hostname>[B<:>I<port>]"
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:39
+#: cups-lpd.8:36
 msgid "Sets the CUPS server (and port) to use."
 msgstr ""
 
 #. type: TP
-#: cups-lpd.man.in:39
+#: cups-lpd.8:36
 #, no-wrap
 msgid "B<-n>"
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:44
+#: cups-lpd.8:41
 msgid ""
 "Disables reverse address lookups; normally B<cups-lpd> will try to discover "
 "the hostname of the client via a reverse DNS lookup."
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:49
+#: cups-lpd.8:46
 msgid ""
 "Inserts options for all print queues. Most often this is used to disable the "
 "\"l\" filter so that remote print jobs are filtered as needed for printing; "
@@ -6260,7 +6511,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:53
+#: cups-lpd.8:50
 msgid ""
 "B<cups-lpd> does not enforce the restricted source port number specified in "
 "RFC 1179, as using restricted ports does not prevent users from submitting "
@@ -6269,7 +6520,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:55
+#: cups-lpd.8:52
 msgid ""
 "The output of the status requests follows RFC 2569, Mapping between LPD and "
 "IPP Protocols. Since many LPD implementations stray from this definition, "
@@ -6277,18 +6528,18 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: cups-lpd.man.in:55
+#: cups-lpd.8:52
 #, no-wrap
 msgid "ERRORS"
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:57
+#: cups-lpd.8:54
 msgid "Errors are sent to the system log."
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:62
+#: cups-lpd.8:59
 #, no-wrap
 msgid ""
 "I</etc/inetd.conf>\n"
@@ -6296,14 +6547,21 @@ msgid ""
 "I</System/Library/LaunchDaemons/org.cups.cups-lpd.plist>\n"
 msgstr ""
 
+#. type: Plain text
+#: cups-lpd.8:64
+msgid ""
+"The B<cups-lpd> program is deprecated and will no longer be supported in a "
+"future feature release of CUPS."
+msgstr ""
+
 #. type: SS
-#: cups-lpd.man.in:64
+#: cups-lpd.8:64
 #, no-wrap
 msgid "PERFORMANCE"
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:69
+#: cups-lpd.8:69
 msgid ""
 "B<cups-lpd> performs well with small numbers of clients and printers.  "
 "However, since a new process is created for each connection and since each "
@@ -6313,13 +6571,13 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: cups-lpd.man.in:69
+#: cups-lpd.8:69
 #, no-wrap
 msgid "SECURITY"
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:76
+#: cups-lpd.8:76
 msgid ""
 "B<cups-lpd> currently does not perform any access control based on the "
 "settings in I<cupsd.conf(5)> or in the I<hosts.allow(5)> or I<hosts.deny(5)> "
@@ -6329,7 +6587,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:82
+#: cups-lpd.8:82
 msgid ""
 "While B<xinetd>(8)  has built-in access control support, you should use the "
 "TCP wrappers package with B<inetd>(8)  to limit access to only those "
@@ -6337,7 +6595,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:86
+#: cups-lpd.8:86
 msgid ""
 "B<cups-lpd> is not enabled by the standard CUPS distribution.  Please "
 "consult with your operating system vendor to determine whether it is enabled "
@@ -6345,14 +6603,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:92
+#: cups-lpd.8:92
 msgid ""
 "If you are using B<inetd>(8), add the following line to the I<inetd.conf> "
 "file to enable the B<cups-lpd> mini-server:"
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:96
+#: cups-lpd.8:96
 #, no-wrap
 msgid ""
 "    printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd "
@@ -6361,14 +6619,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:102
+#: cups-lpd.8:102
 msgid ""
 "I<Note:> If you are using Solaris 10 or higher, you must run the "
 "B<inetdconv>(1m)  program to register the changes to the I<inetd.conf> file."
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:111
+#: cups-lpd.8:111
 msgid ""
 "CUPS includes configuration files for B<launchd>(8), B<systemd>(8), and "
 "B<xinetd>(8).  Simply enable the B<cups-lpd> service using the corresponding "
@@ -6376,1616 +6634,1797 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cups-lpd.man.in:118
+#: cups-lpd.8:118
 msgid ""
 "B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), CUPS Online Help "
 "(http://localhost:631/help), RFC 2569"
 msgstr ""
 
 #. type: TH
-#: cups.man:13
+#: cups-snmp.8:9
 #, no-wrap
-msgid "cups"
+msgid "cups-snmp"
 msgstr ""
 
-#. type: TH
-#: cups.man:13
-#, no-wrap
-msgid "16 April 2014"
+#. type: Plain text
+#: cups-snmp.8:12
+msgid "snmp - cups snmp backend (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:16
-msgid "cups - a standards-based, open source printing system"
+#: cups-snmp.8:15
+msgid "B</usr/lib/cups/backend/snmp> I<ip-address-or-hostname>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:19
-msgid ""
-"B<CUPS> is the software you use to print from applications like word "
-"processors, email readers, photo editors, and web browsers. It converts the "
-"page descriptions produced by your application (put a paragraph here, draw a "
-"line there, and so forth) into something your printer can understand and "
-"then sends the information to the printer for printing."
+#: cups-snmp.8:18
+msgid "B</usr/libexec/cups/backend/snmp> I<ip-address-or-hostname>"
+msgstr ""
+
+#. type: Plain text
+#: cups-snmp.8:23
+msgid "B<lpinfo> B<-v> B<--include-schemes> snmp"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:25
+#: cups-snmp.8:27
 msgid ""
-"Now, since every printer manufacturer does things differently, printing can "
-"be very complicated.  B<CUPS> does its best to hide this from you and your "
-"application so that you can concentrate on printing and less on how to "
-"print. Generally, the only time you need to know anything about your printer "
-"is when you use it for the first time, and even then B<CUPS> can often "
-"figure things out on its own."
+"The B<DEPRECATED> CUPS SNMP backend provides legacy discovery and "
+"identification of network printers using SNMPv1.  When used for discovery "
+"through the scheduler, the backend will list all printers that respond to a "
+"broadcast SNMPv1 query with the \"public\" community name.  Additional "
+"queries are then sent to printers that respond in order to determine the "
+"correct device URI, make and model, and other information needed for "
+"printing."
 msgstr ""
 
-#. type: SS
-#: cups.man:25
-#, no-wrap
-msgid "HOW DOES IT WORK?"
+#. type: Plain text
+#: cups-snmp.8:30
+msgid ""
+"In the first form, the SNMP backend is run directly by the user to look up "
+"the device URI and other information when you have an IP address or "
+"hostname.  This can be used for programs that need to configure print queues "
+"where the user has supplied an address but nothing else."
 msgstr ""
 
 #. type: Plain text
-#: cups.man:29
+#: cups-snmp.8:37
 msgid ""
-"The first time you print to a printer, B<CUPS> creates a queue to keep track "
-"of the current status of the printer (everything OK, out of paper, etc.) and "
-"any pages you have printed. Most of the time the queue points to a printer "
-"connected directly to your computer via a USB port, however it can also "
-"point to a printer on your network, a printer on the Internet, or multiple "
-"printers depending on the configuration. Regardless of where the queue "
-"points, it will look like any other printer to you and your applications."
+"In the second form, the SNMP backend is run indirectly using the "
+"B<lpinfo>(8)  command.  The output provides all printers detected via SNMP "
+"on the configured broadcast addresses.  I<Note: no broadcast addresses are "
+"configured by default.>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:35
+#: cups-snmp.8:40
 msgid ""
-"Every time you print something, B<CUPS> creates a job which contains the "
-"queue you are sending the print to, the name of the document you are "
-"printing, and the page descriptions. Job are numbered (queue-1, queue-2, and "
-"so forth) so you can monitor the job as it is printed or cancel it if you "
-"see a mistake. When B<CUPS> gets a job for printing, it determines the best "
-"programs (filters, printer drivers, port monitors, and backends) to convert "
-"the pages into a printable format and then runs them to actually print the "
-"job."
+"The DebugLevel value can be overridden using the CUPS_DEBUG_LEVEL "
+"environment variable.  The MaxRunTime value can be overridden using the "
+"CUPS_MAX_RUN_TIME environment variable."
 msgstr ""
 
 #. type: Plain text
-#: cups.man:39
+#: cups-snmp.8:44
 msgid ""
-"When the print job is completely printed, B<CUPS> removes the job from the "
-"queue and moves on to any other jobs you have submitted. You can also be "
-"notified when the job is finished, or if there are any errors during "
-"printing, in several different ways."
+"The SNMP backend reads the I</etc/cups/snmp.conf> configuration file, if "
+"present, to set the default broadcast address, community name, and logging "
+"level."
 msgstr ""
 
-#. type: SS
-#: cups.man:39
-#, no-wrap
-msgid "WHERE DO I BEGIN?"
+#. type: Plain text
+#: cups-snmp.8:47
+msgid ""
+"The CUPS SNMP backend is deprecated and will no longer be supported in a "
+"future version of CUPS."
 msgstr ""
 
 #. type: Plain text
-#: cups.man:41
+#: cups-snmp.8:49
 msgid ""
-"The easiest way to start is by using the web interface to configure your "
-"printer. Go to \"http://localhost:631\" and choose the Administration tab at "
-"the top of the page. Click/press on the Add Printer button and follow the "
-"prompts."
+"The CUPS SNMP backend uses the information from the Host, Printer, and Port "
+"Monitor MIBs along with some vendor private MIBs and intelligent port probes "
+"to determine the correct device URI and make and model for each printer."
 msgstr ""
 
 #. type: Plain text
-#: cups.man:43
+#: cups-snmp.8:55
 msgid ""
-"When you are asked for a username and password, enter your login username "
-"and password or the \"root\" username and password."
+"B<backend>(7), B<cups-snmp.conf>(5), B<cupsd>(8), B<lpinfo>(8), CUPS Online "
+"Help (http://localhost:631/help)"
 msgstr ""
 
-#. type: Plain text
-#: cups.man:45
-msgid ""
-"After the printer is added you will be asked to set the default printer "
-"options (paper size, output mode, etc.) for the printer. Make any changes as "
-"needed and then click/press on the Set Default Options button to save "
-"them. Some printers also support auto-configuration - click/press on the "
-"Query Printer for Default Options button to update the options "
-"automatically."
+#. type: TH
+#: cups-snmp.conf.5:10
+#, no-wrap
+msgid "snmp.conf"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:47
-msgid ""
-"Once you have added the printer, you can print to it from any "
-"application. You can also choose Print Test Page from the maintenance menu "
-"to print a simple test page and verify that everything is working properly."
+#: cups-snmp.conf.5:13
+msgid "snmp.conf - snmp configuration file for cups (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:55
+#: cups-snmp.conf.5:18
 msgid ""
-"You can also use the B<lpadmin>(8)  and B<lpinfo>(8)  commands to add "
-"printers to B<CUPS>.  Additionally, your operating system may include "
-"graphical user interfaces or automatically create printer queues when you "
-"connect a printer to your computer."
-msgstr ""
-
-#. type: SS
-#: cups.man:55
-#, no-wrap
-msgid "HOW DO I GET HELP?"
+"The B<snmp.conf> file configures how the standard CUPS network backends "
+"(http, https, ipp, ipps, lpd, snmp, and socket) access printer information "
+"using SNMPv1 and is normally located in the I</etc/cups> directory.  Each "
+"line in the file can be a configuration directive, a blank line, or a "
+"comment. Comment lines start with the # character."
 msgstr ""
 
 #. type: Plain text
-#: cups.man:63
+#: cups-snmp.conf.5:21
 msgid ""
-"The B<CUPS> web site (http://www.CUPS.org) provides access to the I<cups> "
-"and I<cups-devel> mailing lists, additional documentation and resources, and "
-"a bug report database. Most vendors also provide online discussion forums to "
-"ask printing questions for your operating system of choice."
+"The Community and DebugLevel directives are used by all backends. The "
+"remainder apply only to the SNMP backend - B<cups-snmp>(8)."
 msgstr ""
 
 #. type: Plain text
-#: cups.man:66
-msgid ""
-"B<CUPS> commands use the following environment variables to override the "
-"default locations of files and so forth. For security reasons, these "
-"environment variables are ignored for setuid programs:"
+#: cups-snmp.conf.5:23
+msgid "The following directives are understood by the CUPS network backends:"
 msgstr ""
 
 #. type: TP
-#: cups.man:66
+#: cups-snmp.conf.5:23
 #, no-wrap
-msgid "B<CUPS_ANYROOT>"
+msgid "B<Address @IF(>I<name>B<)>"
 msgstr ""
 
-#. type: Plain text
-#: cups.man:69
-msgid "Whether to allow any X.509 certificate root (Y or N)."
+#. type: TP
+#: cups-snmp.conf.5:25
+#, no-wrap
+msgid "B<Address @LOCAL>"
 msgstr ""
 
 #. type: TP
-#: cups.man:69 filter.man:159
+#: cups-snmp.conf.5:27
 #, no-wrap
-msgid "B<CUPS_CACHEDIR>"
+msgid "B<Address >I<address>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:72
-msgid "The directory where semi-persistent cache files can be found."
+#: cups-snmp.conf.5:31
+msgid ""
+"Sends SNMP broadcast queries (for discovery) to the specified address(es).  "
+"There is no default for the broadcast address."
 msgstr ""
 
 #. type: TP
-#: cups.man:72 filter.man:162
+#: cups-snmp.conf.5:31
 #, no-wrap
-msgid "B<CUPS_DATADIR>"
+msgid "B<Community >I<name>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:75 filter.man:165
-msgid "The directory where data files can be found."
+#: cups-snmp.conf.5:37
+msgid ""
+"Specifies the community name to use.  Only a single community name may be "
+"specified.  The default community name is \"public\".  If no name is "
+"specified, all SNMP functions are disabled."
 msgstr ""
 
 #. type: TP
-#: cups.man:75
+#: cups-snmp.conf.5:37
 #, no-wrap
-msgid "B<CUPS_ENCRYPTION>"
+msgid "B<DebugLevel >I<number>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:78
-msgid "The default level of encryption (Always, IfRequested, Never, Required)."
+#: cups-snmp.conf.5:42
+msgid ""
+"Specifies the logging level from 0 (none) to 3 (everything).  Typically only "
+"used for debugging (thus the name).  The default debug level is 0."
 msgstr ""
 
 #. type: TP
-#: cups.man:78
+#: cups-snmp.conf.5:42
 #, no-wrap
-msgid "B<CUPS_EXPIREDCERTS>"
+msgid "B<DeviceURI \">I<regular expression>B<\" >I<device-uri >[... I<device-uri>]"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:81
-msgid "Whether to allow expired X.509 certificates (Y or N)."
+#: cups-snmp.conf.5:47
+msgid ""
+"Specifies one or more device URIs that should be used for a given make and "
+"model string.  The regular expression is used to match the detected make and "
+"model, and the device URI strings must be of the form "
+"\"scheme://%s[:port]/[path]\", where \"%s\" represents the detected address "
+"or hostname.  There are no default device URI matching rules."
 msgstr ""
 
 #. type: TP
-#: cups.man:81
+#: cups-snmp.conf.5:47
 #, no-wrap
-msgid "B<CUPS_GSSSERVICENAME>"
-msgstr ""
-
-#. type: Plain text
-#: cups.man:84
-msgid "The Kerberos service name used for authentication."
+msgid "B<HostNameLookups on>"
 msgstr ""
 
 #. type: TP
-#: cups.man:84
+#: cups-snmp.conf.5:49
 #, no-wrap
-msgid "B<CUPS_SERVER>"
+msgid "B<HostNameLookups off>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:87
+#: cups-snmp.conf.5:53
 msgid ""
-"The hostname/IP address and port number of the CUPS scheduler (hostname:port "
-"or ipaddress:port)."
+"Specifies whether the addresses of printers should be converted to hostnames "
+"or left as numeric IP addresses.  The default is \"off\"."
 msgstr ""
 
 #. type: TP
-#: cups.man:87
+#: cups-snmp.conf.5:53
 #, no-wrap
-msgid "B<CUPS_SERVERBIN>"
+msgid "B<MaxRunTime >I<seconds>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:90
+#: cups-snmp.conf.5:58
 msgid ""
-"The directory where server helper programs, filters, backend, etc. can be "
-"found."
+"Specifies the maximum number of seconds that the SNMP backend will scan the "
+"network for printers.  The default is 120 seconds (2 minutes)."
 msgstr ""
 
-#. type: TP
-#: cups.man:90 filter.man:172
-#, no-wrap
-msgid "B<CUPS_SERVERROOT>"
+#. type: Plain text
+#: cups-snmp.conf.5:62
+msgid ""
+"CUPS backends are deprecated and will no longer be supported in a future "
+"feature release of CUPS.  Printers that do not support IPP can be supported "
+"using applications such as B<ippeveprinter>(1)."
 msgstr ""
 
 #. type: Plain text
-#: cups.man:93 filter.man:175
-msgid "The root directory of the server."
+#: cups-snmp.conf.5:65
+msgid "B<cups-snmp>(8), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
-#. type: TP
-#: cups.man:93
+#. type: TH
+#: cupstestppd.1:10
 #, no-wrap
-msgid "B<CUPS_STATEDIR>"
+msgid "cupstestppd"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:96
-msgid "The directory where state files can be found."
-msgstr ""
-
-#. type: TP
-#: cups.man:96
-#, no-wrap
-msgid "B<CUPS_USER>"
+#: cupstestppd.1:13
+msgid "cupstestppd - test conformance of ppd files"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:99
-msgid "Specifies the name of the user for print requests."
+#: cupstestppd.1:35
+msgid ""
+"B<cupstestppd> [ B<-I> I<category> ] [ B<-R> I<rootdir> ] [ B<-W> "
+"I<category> ] [ B<-q> ] [ B<-r> ] [ B<-v>[B<v>] ] I<filename.ppd[.gz]> [ "
+"...  I<filename.ppd[.gz]> ]"
 msgstr ""
 
-#. type: TP
-#: cups.man:99
-#, no-wrap
-msgid "B<HOME>"
+#. type: Plain text
+#: cupstestppd.1:51
+msgid ""
+"B<cupstestppd> [ B<-R> I<rootdir> ] [ B<-W> I<category> ] [ B<-q> ] [ B<-r> "
+"] [ B<-v>[B<v>] ] B<->"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:102
-msgid "Specifies the home directory of the current user."
+#: cupstestppd.1:55
+msgid ""
+"B<cupstestppd> tests the conformance of PPD files to the Adobe PostScript "
+"Printer Description file format specification version 4.3.  It can also be "
+"used to list the supported options and available fonts in a PPD file.  The "
+"results of testing and any other output are sent to the standard output."
 msgstr ""
 
-#. type: TP
-#: cups.man:102
-#, no-wrap
-msgid "B<IPP_PORT>"
+#. type: Plain text
+#: cupstestppd.1:58
+msgid ""
+"The first form of B<cupstestppd> tests one or more PPD files on the "
+"command-line.  The second form tests the PPD file provided on the standard "
+"input."
 msgstr ""
 
 #. type: Plain text
-#: cups.man:105
-msgid "Specifies the default port number for IPP requests."
+#: cupstestppd.1:60
+msgid "B<cupstestppd> supports the following options:"
 msgstr ""
 
 #. type: TP
-#: cups.man:105
+#: cupstestppd.1:60
 #, no-wrap
-msgid "B<LOCALEDIR>"
+msgid "B<-I filename>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:108
-msgid "Specifies the location of localization files."
+#: cupstestppd.1:63
+msgid "Ignores all PCFileName warnings."
 msgstr ""
 
 #. type: TP
-#: cups.man:108
+#: cupstestppd.1:63
 #, no-wrap
-msgid "B<LPDEST>"
+msgid "B<-I filters>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:111
-msgid "Specifies the default print queue (System V standard)."
+#: cupstestppd.1:66
+msgid "Ignores all filter errors."
 msgstr ""
 
 #. type: TP
-#: cups.man:111 filter.man:187
+#: cupstestppd.1:66
 #, no-wrap
-msgid "B<PRINTER>"
+msgid "B<-I profiles>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:114
-msgid "Specifies the default print queue (Berkeley standard)."
+#: cupstestppd.1:69
+msgid "Ignores all profile errors."
 msgstr ""
 
 #. type: TP
-#: cups.man:114
+#: cupstestppd.1:69
 #, no-wrap
-msgid "B<TMPDIR>"
-msgstr ""
-
-#. type: Plain text
-#: cups.man:117
-msgid "Specifies the location of temporary files."
+msgid "B<-R >I<rootdir>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:121
-#, no-wrap
+#: cupstestppd.1:72
 msgid ""
-"I<~/.cups/client.conf>\n"
-"I<~/.cups/lpoptions>\n"
+"Specifies an alternate root directory for the filter, pre-filter, and other "
+"support file checks."
 msgstr ""
 
-#. type: Plain text
-#: cups.man:125
-msgid ""
-"B<CUPS> conforms to the Internet Printing Protocol version 2.1 and "
-"implements the Berkeley and System V UNIX print commands."
+#. type: TP
+#: cupstestppd.1:72
+#, no-wrap
+msgid "B<-W constraints>"
 msgstr ""
 
 #. type: Plain text
-#: cups.man:141
-msgid ""
-"B<cancel>(1), B<client.conf>(7), B<cupsctl>(8), B<cupsd>(8), B<lp>(1), "
-"B<lpadmin>(8), B<lpinfo>(8), B<lpoptions>(1), B<lpr>(1), B<lprm>(1), "
-"B<lpq>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help), CUPS "
-"Web Site (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup "
-"(http://www.pwg.org/ipp)"
+#: cupstestppd.1:75
+msgid "Report all UIConstraint errors as warnings."
 msgstr ""
 
-#. type: TH
-#: cups-snmp.conf.man:13
+#. type: TP
+#: cupstestppd.1:75
 #, no-wrap
-msgid "snmp.conf"
-msgstr ""
-
-#. type: Plain text
-#: cups-snmp.conf.man:16
-msgid "snmp.conf - snmp configuration file for cups"
+msgid "B<-W defaults>"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.conf.man:21
+#: cupstestppd.1:78
 msgid ""
-"The B<snmp.conf> file configures how the standard CUPS network backends "
-"(http, https, ipp, ipps, lpd, snmp, and socket) access printer information "
-"using SNMPv1 and is normally located in the I</etc/cups> directory.  Each "
-"line in the file can be a configuration directive, a blank line, or a "
-"comment. Comment lines start with the # character."
+"Except for size-related options, report all default option errors as "
+"warnings."
 msgstr ""
 
-#. type: Plain text
-#: cups-snmp.conf.man:24
-msgid ""
-"The Community and DebugLevel directives are used by all backends. The "
-"remainder apply only to the SNMP backend - B<cups-snmp>(8)."
+#. type: TP
+#: cupstestppd.1:78
+#, no-wrap
+msgid "B<-W filters>"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.conf.man:26
-msgid "The following directives are understood by the CUPS network backends:"
+#: cupstestppd.1:81
+msgid "Report all filter errors as warnings."
 msgstr ""
 
 #. type: TP
-#: cups-snmp.conf.man:26
+#: cupstestppd.1:81
 #, no-wrap
-msgid "B<Address @IF(>I<name>B<)>"
+msgid "B<-W profiles>"
 msgstr ""
 
-#. type: TP
-#: cups-snmp.conf.man:28
-#, no-wrap
-msgid "B<Address @LOCAL>"
+#. type: Plain text
+#: cupstestppd.1:84
+msgid "Report all profile errors as warnings."
 msgstr ""
 
 #. type: TP
-#: cups-snmp.conf.man:30
+#: cupstestppd.1:84
 #, no-wrap
-msgid "B<Address >I<address>"
+msgid "B<-W sizes>"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.conf.man:34
-msgid ""
-"Sends SNMP broadcast queries (for discovery) to the specified address(es).  "
-"There is no default for the broadcast address."
+#: cupstestppd.1:87
+msgid "Report all media size errors as warnings."
 msgstr ""
 
 #. type: TP
-#: cups-snmp.conf.man:34
+#: cupstestppd.1:87
 #, no-wrap
-msgid "B<Community >I<name>"
+msgid "B<-W translations>"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.conf.man:39
-msgid ""
-"Specifies the community name to use.  Only a single community name may be "
-"specified.  The default community name is \"public\"."
+#: cupstestppd.1:90
+msgid "Report all translation errors as warnings."
 msgstr ""
 
 #. type: TP
-#: cups-snmp.conf.man:39
+#: cupstestppd.1:90
 #, no-wrap
-msgid "B<DebugLevel >I<number>"
+msgid "B<-W all>"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.conf.man:44
-msgid ""
-"Specifies the logging level from 0 (none) to 3 (everything).  Typically only "
-"used for debugging (thus the name).  The default debug level is 0."
+#: cupstestppd.1:93
+msgid "Report all of the previous errors as warnings."
 msgstr ""
 
 #. type: TP
-#: cups-snmp.conf.man:44
+#: cupstestppd.1:93
 #, no-wrap
-msgid "B<DeviceURI \">I<regular expression>B<\" >I<device-uri >[... I<device-uri>]"
+msgid "B<-W none>"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.conf.man:49
-msgid ""
-"Specifies one or more device URIs that should be used for a given make and "
-"model string.  The regular expression is used to match the detected make and "
-"model, and the device URI strings must be of the form "
-"\"scheme://%s[:port]/[path]\", where \"%s\" represents the detected address "
-"or hostname.  There are no default device URI matching rules."
+#: cupstestppd.1:96
+msgid "Report all of the previous errors as errors."
 msgstr ""
 
 #. type: TP
-#: cups-snmp.conf.man:49
+#: cupstestppd.1:96 ippfind.1:107 ipptool.1:181 lpr.1:106
 #, no-wrap
-msgid "B<HostNameLookups on>"
+msgid "B<-q>"
+msgstr ""
+
+#. type: Plain text
+#: cupstestppd.1:99
+msgid "Specifies that no information should be displayed."
 msgstr ""
 
 #. type: TP
-#: cups-snmp.conf.man:51
+#: cupstestppd.1:99 ippfind.1:112 lpr.1:109 lpstat.1:114
 #, no-wrap
-msgid "B<HostNameLookups off>"
+msgid "B<-r>"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.conf.man:55
+#: cupstestppd.1:102
 msgid ""
-"Specifies whether the addresses of printers should be converted to hostnames "
-"or left as numeric IP addresses.  The default is \"off\"."
+"Relaxes the PPD conformance requirements so that common whitespace, control "
+"character, and formatting problems are not treated as hard errors."
 msgstr ""
 
 #. type: TP
-#: cups-snmp.conf.man:55
+#: cupstestppd.1:102 ipptool.1:187 ppdc.1:76
 #, no-wrap
-msgid "B<MaxRunTime >I<seconds>"
+msgid "B<-v>"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.conf.man:60
+#: cupstestppd.1:105
 msgid ""
-"Specifies the maximum number of seconds that the SNMP backend will scan the "
-"network for printers.  The default is 120 seconds (2 minutes)."
+"Specifies that detailed conformance testing results should be displayed "
+"rather than the concise PASS/FAIL/ERROR status."
+msgstr ""
+
+#. type: TP
+#: cupstestppd.1:105
+#, no-wrap
+msgid "B<-vv>"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.conf.man:63
-msgid "B<cups-snmp>(8), CUPS Online Help (http://localhost:631/help)"
+#: cupstestppd.1:108
+msgid ""
+"Specifies that all information in the PPD file should be displayed in "
+"addition to the detailed conformance testing results."
 msgstr ""
 
-#. type: TH
-#: cups-snmp.man.in:12
-#, no-wrap
-msgid "cups-snmp"
+#. type: Plain text
+#: cupstestppd.1:110
+msgid "The I<-q>, I<-v>, and I<-vv> options are mutually exclusive."
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.man.in:15
-msgid "snmp - cups snmp backend"
+#: cupstestppd.1:113
+msgid ""
+"B<cupstestppd> returns zero on success and non-zero on error.  The error "
+"codes are as follows:"
+msgstr ""
+
+#. type: TP
+#: cupstestppd.1:113
+#, no-wrap
+msgid "1"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.man.in:18
-msgid "B</usr/lib/cups/backend/snmp> I<ip-address-or-hostname>"
+#: cupstestppd.1:116
+msgid "Bad command-line arguments or missing PPD filename."
+msgstr ""
+
+#. type: TP
+#: cupstestppd.1:116
+#, no-wrap
+msgid "2"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.man.in:21
-msgid "B</usr/libexec/cups/backend/snmp> I<ip-address-or-hostname>"
+#: cupstestppd.1:119
+msgid "Unable to open or read PPD file."
+msgstr ""
+
+#. type: TP
+#: cupstestppd.1:119
+#, no-wrap
+msgid "3"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.man.in:26
-msgid "B<lpinfo> B<-v> B<--include-schemes> snmp"
+#: cupstestppd.1:122
+msgid "The PPD file contains format errors that cannot be skipped."
+msgstr ""
+
+#. type: TP
+#: cupstestppd.1:122
+#, no-wrap
+msgid "4"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.man.in:30
-msgid ""
-"The CUPS SNMP backend provides legacy discovery and identification of "
-"network printers using SNMPv1.  When used for discovery through the "
-"scheduler, the backend will list all printers that respond to a broadcast "
-"SNMPv1 query with the \"public\" community name.  Additional queries are "
-"then sent to printers that respond in order to determine the correct device "
-"URI, make and model, and other information needed for printing."
+#: cupstestppd.1:125
+msgid "The PPD file does not conform to the Adobe PPD specification."
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.man.in:33
+#: cupstestppd.1:127
 msgid ""
-"In the first form, the SNMP backend is run directly by the user to look up "
-"the device URI and other information when you have an IP address or "
-"hostname.  This can be used for programs that need to configure print queues "
-"where the user has supplied an address but nothing else."
+"The following command will test all PPD files under the current directory "
+"and print the names of each file that does not conform:"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.man.in:40
-msgid ""
-"In the second form, the SNMP backend is run indirectly using the "
-"B<lpinfo>(8)  command.  The output provides all printers detected via SNMP "
-"on the configured broadcast addresses.  I<Note: no broadcast addresses are "
-"configured by default.>"
+#: cupstestppd.1:130
+#, no-wrap
+msgid "    find . -name \\e*.ppd \\e! -exec cupstestppd -q '{}' \\e; -print\n"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.man.in:43
+#: cupstestppd.1:133
 msgid ""
-"The DebugLevel value can be overridden using the CUPS_DEBUG_LEVEL "
-"environment variable.  The MaxRunTime value can be overridden using the "
-"CUPS_MAX_RUN_TIME environment variable."
+"The next command tests all PPD files under the current directory and print "
+"detailed conformance testing results for the files that do not conform:"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.man.in:47
+#: cupstestppd.1:137
+#, no-wrap
 msgid ""
-"The SNMP backend reads the I</etc/cups/snmp.conf> configuration file, if "
-"present, to set the default broadcast address, community name, and logging "
-"level."
+"    find . -name \\e*.ppd \\e! -exec cupstestppd -q '{}' \\e; \\e\n"
+"        -exec cupstestppd -v '{}' \\e;\n"
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.man.in:49
+#: cupstestppd.1:142 ppdc.1:94 ppdcfile.5:153 ppdhtml.1:39 ppdi.1:46 ppdmerge.1:39 ppdpo.1:46
 msgid ""
-"The CUPS SNMP backend uses the information from the Host, Printer, and Port "
-"Monitor MIBs along with some vendor private MIBs and intelligent port probes "
-"to determine the correct device URI and make and model for each printer."
+"PPD files are deprecated and will no longer be supported in a future feature "
+"release of CUPS.  Printers that do not support IPP can be supported using "
+"applications such as B<ippeveprinter>(1)."
 msgstr ""
 
 #. type: Plain text
-#: cups-snmp.man.in:55
+#: cupstestppd.1:146
 msgid ""
-"B<backend>(7), B<cups-snmp.conf>(5), B<cupsd>(8), B<lpinfo>(8), CUPS Online "
-"Help (http://localhost:631/help)"
+"B<lpadmin>(8), CUPS Online Help (http://localhost:631/help), Adobe "
+"PostScript Printer Description File Format Specification, Version 4.3."
 msgstr ""
 
 #. type: TH
-#: cupstestdsc.man:13
+#: filter.7:10
 #, no-wrap
-msgid "cupstestdsc"
+msgid "filter"
 msgstr ""
 
 #. type: Plain text
-#: cupstestdsc.man:16
-msgid "cupstestdsc - test conformance of postscript files (deprecated)"
+#: filter.7:13
+msgid "filter - cups file conversion filter interface"
 msgstr ""
 
 #. type: Plain text
-#: cupstestdsc.man:25
-msgid "B<cupstestdsc> [ B<-h> ] I<filename.ps> [ ...  I<filenameN.ps> ]"
+#: filter.7:23
+msgid "B<filter> I<job> I<user> I<title> I<num-copies> I<options> [ I<filename> ]"
 msgstr ""
 
 #. type: Plain text
-#: cupstestdsc.man:31
-msgid "B<cupstestdsc> [ B<-h> ] B<->"
+#: filter.7:29
+#, no-wrap
+msgid ""
+"B<ssize_t cupsBackChannelRead>(B<char *>I<buffer>, B<size_t >I<bytes>,\n"
+"                            B<double >I<timeout>);\n"
 msgstr ""
 
 #. type: Plain text
-#: cupstestdsc.man:35
+#: filter.7:33
+#, no-wrap
 msgid ""
-"B<cupstestdsc> tests the conformance of PostScript files to the Adobe "
-"PostScript Language Document Structuring Conventions Specification version "
-"3.0.  The results of testing and any other output are sent to the standard "
-"output.  The second form of the command reads PostScript from the standard "
-"input."
+"B<cups_sc_status_t cupsSideChannelDoRequest>(B<cups_sc_command_t "
+">I<command>,\n"
+"                                          B<char *>I<data>, B<int "
+"*>I<datalen>,\n"
+"                                          B<double >I<timeout>);\n"
+msgstr ""
+
+#. type: Plain text
+#: filter.7:35
+#, no-wrap
+msgid "B<#include E<lt>cups/ppd.hE<gt>>\n"
 msgstr ""
 
 #. type: Plain text
-#: cupstestdsc.man:37
+#: filter.7:38
+#, no-wrap
 msgid ""
-"I<This program is deprecated and will be removed in a future release of "
-"CUPS.>"
+"B<const char *cupsGetOption>(B<const char *>I<name>, B<int "
+">I<num_options>,\n"
+"                 B<cups_option_t *>I<options>);\n"
 msgstr ""
 
 #. type: Plain text
-#: cupstestdsc.man:41
+#: filter.7:41
+#, no-wrap
 msgid ""
-"B<cupstestdsc> only validates the DSC comments in a PostScript file and does "
-"not attempt to validate the PostScript code itself.  Developers must ensure "
-"that the PostScript they generate follows the rules defined by Adobe.  "
-"Specifically, all pages must be independent of each other, code outside page "
-"descriptions may not affect the graphics state (current font, color, "
-"transform matrix, etc.), and device-specific commands such as setpagedevice "
-"should not be used."
+"B<int cupsMarkOptions>(B<ppd_file_t *>I<ppd>, B<int >I<num_options>,\n"
+"                    B<cups_option_t *>I<options>);\n"
 msgstr ""
 
 #. type: Plain text
-#: cupstestdsc.man:45
+#: filter.7:44
+#, no-wrap
 msgid ""
-"CUPS Online Help (http://localhost:631/help), Adobe PostScript Language "
-"Document Structuring Conventions Specification, Version 3.0."
+"B<int cupsParseOptions>(B<const char *>I<arg>, B<int >I<num_options>,\n"
+"                     B<cups_option_t **>I<options>);\n"
 msgstr ""
 
-#. type: TH
-#: cupstestppd.man:13
+#. type: Plain text
+#: filter.7:46
 #, no-wrap
-msgid "cupstestppd"
+msgid ""
+"B<ppd_choice_t *ppdFindMarkedChoice>(B<ppd_file_t *>I<ppd>, B<const char "
+"*>I<keyword>);\n"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:16
-msgid "cupstestppd - test conformance of ppd files"
+#: filter.7:48
+#, no-wrap
+msgid "B<void ppdMarkDefaults>(B<ppd_file_t *>I<ppd>);\n"
+msgstr ""
+
+#. type: Plain text
+#: filter.7:50
+#, no-wrap
+msgid "B<ppd_file_t *ppdOpenFile>(B<const char *>I<filename>);\n"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:38
+#: filter.7:54
 msgid ""
-"B<cupstestppd> [ B<-I> I<category> ] [ B<-R> I<rootdir> ] [ B<-W> "
-"I<category> ] [ B<-q> ] [ B<-r> ] [ B<-v>[B<v>] ] I<filename.ppd[.gz]> [ "
-"...  I<filename.ppd[.gz]> ]"
+"The CUPS filter interface provides a standard method for adding support for "
+"new document types or printers to CUPS.  Each filter is capable of "
+"converting from one or more input formats to another format that can either "
+"be printed directly or piped into another filter to get it to a printable "
+"format."
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:54
+#: filter.7:58
 msgid ""
-"B<cupstestppd> [ B<-R> I<rootdir> ] [ B<-W> I<category> ] [ B<-q> ] [ B<-r> "
-"] [ B<-v>[B<v>] ] B<->"
+"Filters B<MUST> be capable of reading from a filename on the command-line or "
+"from the standard input, copying the standard input to a temporary file as "
+"required by the file format.  All output B<MUST> be sent to the standard "
+"output.  Filters B<MUST NOT> attempt to communicate directly with the "
+"printer, other processes, or other services."
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:58
+#: filter.7:60
 msgid ""
-"B<cupstestppd> tests the conformance of PPD files to the Adobe PostScript "
-"Printer Description file format specification version 4.3.  It can also be "
-"used to list the supported options and available fonts in a PPD file.  The "
-"results of testing and any other output are sent to the standard output."
+"The command name (I<argv[0]>) is set to the name of the destination printer "
+"but is also available in the B<PRINTER>I< environment variable.>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:61
+#: filter.7:67
 msgid ""
-"The first form of B<cupstestppd> tests one or more PPD files on the "
-"command-line.  The second form tests the PPD file provided on the standard "
-"input."
+"Options are passed in I<argv[5]> and are encoded from the corresponding IPP "
+"attributes used when the job was submitted. Use the B<cupsParseOptions>()  "
+"function to load the options into a B<cups_option_t> array and the "
+"B<cupsGetOption>()  function to get the value of a specific attribute.  Be "
+"careful to look for common aliases of IPP attributes such as \"landscape\" "
+"for the IPP \"orientation-requested\" attribute."
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:63
-msgid "B<cupstestppd> supports the following options:"
+#: filter.7:76
+msgid ""
+"Options passed on the command-line typically do not include the default "
+"choices the printer's PPD file. Use the B<ppdMarkDefaults>()  and "
+"B<cupsMarkOptions>()  functions in the CUPS library to apply the options to "
+"the PPD defaults and map any IPP attributes to the corresponding PPD "
+"options.  Use B<ppdFindMarkedChoice>()  to get the user-selected choice for "
+"a PPD option. For example, a filter might use the following code to "
+"determine the current value of the B<Duplex> PPD option:"
 msgstr ""
 
-#. type: TP
-#: cupstestppd.man:63
+#. type: Plain text
+#: filter.7:81
 #, no-wrap
-msgid "B<-I filename>"
+msgid ""
+"    ppd_file_t *ppd = ppdOpenFile(getenv(\"PPD\"));\n"
+"    cups_option_t *options = NULL;\n"
+"    int num_options = cupsParseOptions(argv[5], 0, &options);\n"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:66
-msgid "Ignores all PCFileName warnings."
+#: filter.7:84
+#, no-wrap
+msgid ""
+"    ppdMarkDefaults(ppd);\n"
+"    cupsMarkOptions(ppd, num_options, options);\n"
 msgstr ""
 
-#. type: TP
-#: cupstestppd.man:66
+#. type: Plain text
+#: filter.7:86
 #, no-wrap
-msgid "B<-I filters>"
+msgid "    ppd_choice_t *choice = ppdFindMarkedChoice(ppd, \"Duplex\");\n"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:69
-msgid "Ignores all filter errors."
+#: filter.7:90
+msgid ""
+"Raster filters should use option choices set through the raster page header, "
+"as those reflect the options in effect for a given page.  Options specified "
+"on the command-line determine the default values for the entire job, which "
+"can be overridden on a per-page basis."
 msgstr ""
 
-#. type: TP
-#: cupstestppd.man:69
+#. type: SH
+#: filter.7:90
 #, no-wrap
-msgid "B<-I profiles>"
+msgid "LOG MESSAGES"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:72
-msgid "Ignores all profile errors."
+#: filter.7:93
+msgid ""
+"Messages sent to the standard error are generally stored in the printer's "
+"\"printer-state-message\" attribute and the current B<ErrorLog> file.  Each "
+"line begins with a standard prefix:"
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:72
+#: filter.7:93
 #, no-wrap
-msgid "B<-R >I<rootdir>"
+msgid "B<ALERT: >I<message>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:75
+#: filter.7:96
 msgid ""
-"Specifies an alternate root directory for the filter, pre-filter, and other "
-"support file checks."
+"Sets the \"printer-state-message\" attribute and adds the specified message "
+"to the current B<ErrorLog> using the \"alert\" log level."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:75
+#: filter.7:96
 #, no-wrap
-msgid "B<-W constraints>"
+msgid "B<ATTR: >I<attribute=value >[ I<... attribute=value>]"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:78
-msgid "Report all UIConstraint errors as warnings."
+#: filter.7:102
+msgid ""
+"Sets the named job or printer attribute(s). The following job attributes can "
+"be set: \"job-media-progress\". The following printer attributes can be set: "
+"\"auth-info-required\", \"marker-colors\", \"marker-high-levels\", "
+"\"marker-levels\", \"marker-low-levels\", \"marker-message\", "
+"\"marker-names\", \"marker-types\", \"printer-alert\", and "
+"\"printer-alert-description\"."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:78
+#: filter.7:102
 #, no-wrap
-msgid "B<-W defaults>"
+msgid "B<CRIT: >I<message>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:81
+#: filter.7:105
 msgid ""
-"Except for size-related options, report all default option errors as "
-"warnings."
+"Sets the \"printer-state-message\" attribute and adds the specified message "
+"to the current B<ErrorLog> using the \"critical\" log level."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:81
+#: filter.7:105
 #, no-wrap
-msgid "B<-W filters>"
+msgid "B<DEBUG: >I<message>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:84
-msgid "Report all filter errors as warnings."
+#: filter.7:109
+msgid ""
+"Adds the specified message to the current B<ErrorLog> using the \"debug\" "
+"log level.  B<DEBUG> messages are never stored in the "
+"\"printer-state-message\" attribute."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:84
+#: filter.7:109
 #, no-wrap
-msgid "B<-W profiles>"
+msgid "B<DEBUG2: >I<message>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:87
-msgid "Report all profile errors as warnings."
+#: filter.7:114
+msgid ""
+"Adds the specified message to the current B<ErrorLog> using the \"debug2\" "
+"log level.  B<DEBUG2> messages are never stored in the "
+"\"printer-state-message\" attribute."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:87
+#: filter.7:114
 #, no-wrap
-msgid "B<-W sizes>"
+msgid "B<EMERG: >I<message>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:90
-msgid "Report all media size errors as warnings."
+#: filter.7:117
+msgid ""
+"Sets the \"printer-state-message\" attribute and adds the specified message "
+"to the current B<ErrorLog> using the \"emergency\" log level."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:90
+#: filter.7:117
 #, no-wrap
-msgid "B<-W translations>"
+msgid "B<ERROR:>I< message>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:93
-msgid "Report all translation errors as warnings."
+#: filter.7:120
+msgid ""
+"Sets the \"printer-state-message\" attribute and adds the specified message "
+"to the current B<ErrorLog> using the \"error\" log level."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:93
+#: filter.7:120
 #, no-wrap
-msgid "B<-W all>"
+msgid "B<INFO:>I< message>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:96
-msgid "Report all of the previous errors as warnings."
+#: filter.7:123
+msgid ""
+"Sets the \"printer-state-message\" attribute. If the current B<LogLevel> is "
+"set to \"debug2\", also adds the specified message to the current "
+"B<ErrorLog> using the \"info\" log level."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:96
+#: filter.7:123
 #, no-wrap
-msgid "B<-W none>"
+msgid "B<NOTICE:>I< message>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:99
-msgid "Report all of the previous errors as errors."
+#: filter.7:126
+msgid ""
+"Sets the \"printer-state-message\" attribute and adds the specified message "
+"to the current B<ErrorLog> using the \"notice\" log level."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:99 ippfind.man:110 ipptool.man:176 lpr.man:109
+#: filter.7:126
 #, no-wrap
-msgid "B<-q>"
+msgid "B<PAGE:>I< page-number #-copies>"
 msgstr ""
 
-#. type: Plain text
-#: cupstestppd.man:102
-msgid "Specifies that no information should be displayed."
+#. type: TP
+#: filter.7:128
+#, no-wrap
+msgid "B<PAGE:>I< total #-pages>"
+msgstr ""
+
+#. type: Plain text
+#: filter.7:131
+msgid ""
+"Adds an entry to the current B<PageLog>. The first form adds I<#-copies> to "
+"the \"job-media-sheets-completed\" attribute. The second form sets the "
+"\"job-media-sheets-completed\" attribute to I<#-pages>."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:102 ippfind.man:115 lpr.man:112 lpstat.man:118
+#: filter.7:131
 #, no-wrap
-msgid "B<-r>"
+msgid "B<PPD:>I< Keyword=Value> [ I<... KeywordN=Value> ]"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:105
+#: filter.7:134
 msgid ""
-"Relaxes the PPD conformance requirements so that common whitespace, control "
-"character, and formatting problems are not treated as hard errors."
+"Sets the named keywords in the printer's PPD file. This is typically used to "
+"update default option keywords such as B<DefaultPageSize> and the various "
+"installable options in the PPD file."
+msgstr ""
+
+#. type: TP
+#: filter.7:134
+#, no-wrap
+msgid "B<STATE:>I< printer-state-reason >[ I<... printer-state-reason> ]"
+msgstr ""
+
+#. type: TP
+#: filter.7:136
+#, no-wrap
+msgid "B<STATE: +>I< printer-state-reason >[ I<... printer-state-reason> ]"
+msgstr ""
+
+#. type: TP
+#: filter.7:138
+#, no-wrap
+msgid "B<STATE: ->I< printer-state-reason >[ I<... printer-state-reason> ]"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:108
+#: filter.7:141
 msgid ""
-"Specifies that detailed conformance testing results should be displayed "
-"rather than the concise PASS/FAIL/ERROR status."
+"Sets, adds, or removes \"printer-state-reason\" keywords for the current "
+"queue. Typically this is used to indicate media, ink, and toner conditions "
+"on a printer."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:108
+#: filter.7:141
 #, no-wrap
-msgid "B<-vv>"
+msgid "B<WARNING:>I< message>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:111
+#: filter.7:144
 msgid ""
-"Specifies that all information in the PPD file should be displayed in "
-"addition to the detailed conformance testing results."
+"Sets the \"printer-state-message\" attribute and adds the specified message "
+"to the current B<ErrorLog> using the \"warning\" log level."
 msgstr ""
 
-#. type: Plain text
-#: cupstestppd.man:113
-msgid "The I<-q>, I<-v>, and I<-vv> options are mutually exclusive."
+#. type: SH
+#: filter.7:144
+#, no-wrap
+msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:116
+#: filter.7:147
 msgid ""
-"B<cupstestppd> returns zero on success and non-zero on error.  The error "
-"codes are as follows:"
+"The following environment variables are defined by the CUPS server when "
+"executing the filter:"
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:116
+#: filter.7:147
 #, no-wrap
-msgid "1"
+msgid "B<CHARSET>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:119
-msgid "Bad command-line arguments or missing PPD filename."
+#: filter.7:150
+msgid "The default text character set, typically \"utf-8\"."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:119
+#: filter.7:150
 #, no-wrap
-msgid "2"
+msgid "B<CLASS>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:122
-msgid "Unable to open or read PPD file."
+#: filter.7:153
+msgid ""
+"When a job is submitted to a printer class, contains the name of the "
+"destination printer class. Otherwise this environment variable will not be "
+"set."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:122
+#: filter.7:153
 #, no-wrap
-msgid "3"
+msgid "B<CONTENT_TYPE>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:125
-msgid "The PPD file contains format errors that cannot be skipped."
+#: filter.7:156
+msgid ""
+"The MIME media type associated with the submitted job file, for example "
+"\"application/postscript\"."
+msgstr ""
+
+#. type: Plain text
+#: filter.7:159
+msgid "The directory where semi-persistent cache files can be found and stored."
 msgstr ""
 
 #. type: TP
-#: cupstestppd.man:125
+#: filter.7:162
 #, no-wrap
-msgid "4"
+msgid "B<CUPS_FILETYPE>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:128
-msgid "The PPD file does not conform to the Adobe PPD specification."
+#: filter.7:166
+msgid ""
+"The type of file being printed: \"job-sheet\" for a banner page and "
+"\"document\" for a regular print file."
+msgstr ""
+
+#. type: TP
+#: filter.7:166
+#, no-wrap
+msgid "B<CUPS_MAX_MESSAGE>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:130
+#: filter.7:169
 msgid ""
-"The following command will test all PPD files under the current directory "
-"and print the names of each file that does not conform:"
+"The maximum size of a message sent to I<stderr>, including any leading "
+"prefix and the trailing newline."
 msgstr ""
 
-#. type: Plain text
-#: cupstestppd.man:133
+#. type: TP
+#: filter.7:172
 #, no-wrap
-msgid "    find . -name \\e*.ppd \\e! -exec cupstestppd -q '{}' \\e; -print\n"
+msgid "B<FINAL_CONTENT_TYPE>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:136
+#: filter.7:175
 msgid ""
-"The next command tests all PPD files under the current directory and print "
-"detailed conformance testing results for the files that do not conform:"
+"The MIME media type associated with the output destined for the printer, for "
+"example \"application/vnd.cups-postscript\"."
 msgstr ""
 
-#. type: Plain text
-#: cupstestppd.man:140
+#. type: TP
+#: filter.7:175
 #, no-wrap
-msgid ""
-"    find . -name \\e*.ppd \\e! -exec cupstestppd -q '{}' \\e; \\e\n"
-"        -exec cupstestppd -v '{}' \\e;\n"
+msgid "B<LANG>"
 msgstr ""
 
 #. type: Plain text
-#: cupstestppd.man:145
-msgid ""
-"B<lpadmin>(8), CUPS Online Help (http://localhost:631/help), Adobe "
-"PostScript Printer Description File Format Specification, Version 4.3."
+#: filter.7:178
+msgid "The default language locale (typically C or en)."
 msgstr ""
 
-#. type: TH
-#: filter.man:13
+#. type: TP
+#: filter.7:178
 #, no-wrap
-msgid "filter"
+msgid "B<PATH>"
 msgstr ""
 
-#. type: TH
-#: filter.man:13
+#. type: Plain text
+#: filter.7:181
+msgid ""
+"The standard execution path for external programs that may be run by the "
+"filter."
+msgstr ""
+
+#. type: TP
+#: filter.7:181
 #, no-wrap
-msgid "19 October 2015"
+msgid "B<PPD>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:16
-msgid "filter - cups file conversion filter interface"
+#: filter.7:184
+msgid ""
+"The full pathname of the PostScript Printer Description (PPD) file for this "
+"printer."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:26
-msgid "B<filter> I<job> I<user> I<title> I<num-copies> I<options> [ I<filename> ]"
+#: filter.7:187
+msgid "The name of the printer."
 msgstr ""
 
-#. type: Plain text
-#: filter.man:32
+#. type: TP
+#: filter.7:187
 #, no-wrap
-msgid ""
-"B<ssize_t cupsBackChannelRead>(B<char *>I<buffer>, B<size_t >I<bytes>,\n"
-"                            B<double >I<timeout>);\n"
+msgid "B<RIP_CACHE>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:36
+#: filter.7:190
+msgid "The recommended amount of memory to use for Raster Image Processors (RIPs)."
+msgstr ""
+
+#. type: TP
+#: filter.7:190
 #, no-wrap
-msgid ""
-"B<cups_sc_status_t cupsSideChannelDoRequest>(B<cups_sc_command_t "
-">I<command>,\n"
-"                                          B<char *>I<data>, B<int "
-"*>I<datalen>,\n"
-"                                          B<double >I<timeout>);\n"
+msgid "B<SOFTWARE>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:38
+#: filter.7:193
+msgid "The name and version number of the server (typically CUPS/I<major.minor>)."
+msgstr ""
+
+#. type: TP
+#: filter.7:193
 #, no-wrap
-msgid "B<#include E<lt>cups/ppd.hE<gt>>\n"
+msgid "B<TZ>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:41
+#: filter.7:196
+msgid "The timezone of the server."
+msgstr ""
+
+#. type: TP
+#: filter.7:196
 #, no-wrap
-msgid ""
-"B<const char *cupsGetOption>(B<const char *>I<name>, B<int "
-">I<num_options>,\n"
-"                 B<cups_option_t *>I<options>);\n"
+msgid "B<USER>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:44
-#, no-wrap
+#: filter.7:199
 msgid ""
-"B<int cupsMarkOptions>(B<ppd_file_t *>I<ppd>, B<int >I<num_options>,\n"
-"                    B<cups_option_t *>I<options>);\n"
+"The user executing the filter, typically \"lp\" or \"root\"; consult the "
+"I<cups-files.conf> file for the current setting."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:47
-#, no-wrap
+#: filter.7:201
 msgid ""
-"B<int cupsParseOptions>(B<const char *>I<arg>, B<int >I<num_options>,\n"
-"                     B<cups_option_t **>I<options>);\n"
+"While the filter interface is compatible with System V interface scripts, "
+"CUPS does not support System V interface scripts."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:49
-#, no-wrap
+#: filter.7:212
 msgid ""
-"B<ppd_choice_t *ppdFindMarkedChoice>(B<ppd_file_t *>I<ppd>, B<const char "
-"*>I<keyword>);\n"
+"CUPS filters are not meant to be run directly by the user.  Aside from the "
+"legacy System V interface issues (I<argv[0]> is the printer name), CUPS "
+"filters also expect specific environment variables and file descriptors, and "
+"typically run in a user session that (on macOS) has additional restrictions "
+"that affect how it runs.  Unless you are a developer and know what you are "
+"doing, please do not run filters directly.  Instead, use the "
+"B<cupsfilter>(8)  program to use the appropriate filters to do the "
+"conversions you need."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:51
+#: filter.7:218
+msgid ""
+"B<backend>(7), B<cups>(1), B<cups-files.conf>(5), B<cupsd>(8), "
+"B<cupsfilter>(8),"
+msgstr ""
+
+#. type: TH
+#: ippevepcl.7:9
 #, no-wrap
-msgid "B<void ppdMarkDefaults>(B<ppd_file_t *>I<ppd>);\n"
+msgid "ippevepcl/ps"
 msgstr ""
 
-#. type: Plain text
-#: filter.man:53
+#. type: TH
+#: ippevepcl.7:9
 #, no-wrap
-msgid "B<ppd_file_t *ppdOpenFile>(B<const char *>I<filename>);\n"
+msgid "24 April 2019"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:57
-msgid ""
-"The CUPS filter interface provides a standard method for adding support for "
-"new document types or printers to CUPS.  Each filter is capable of "
-"converting from one or more input formats to another format that can either "
-"be printed directly or piped into another filter to get it to a printable "
-"format."
+#: ippevepcl.7:12
+msgid "ippevepcl/ps - pcl and postscript print commands for ippeveprinter"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:61
-msgid ""
-"Filters B<MUST> be capable of reading from a filename on the command-line or "
-"from the standard input, copying the standard input to a temporary file as "
-"required by the file format.  All output B<MUST> be sent to the standard "
-"output.  Filters B<MUST NOT> attempt to communicate directly with the "
-"printer, other processes, or other services."
+#: ippevepcl.7:17
+msgid "B<ippevepcl> [ I<filename> ]"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:63
-msgid ""
-"The command name (I<argv[0]>) is set to the name of the destination printer "
-"but is also available in the B<PRINTER>I< environment variable.>"
+#: ippevepcl.7:22
+msgid "B<ippeveps> [ I<filename> ]"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:70
+#: ippevepcl.7:31
 msgid ""
-"Options are passed in I<argv[5]> and are encoded from the corresponding IPP "
-"attributes used when the job was submitted. Use the B<cupsParseOptions>()  "
-"function to load the options into a B<cups_option_t> array and the "
-"B<cupsGetOption>()  function to get the value of a specific attribute.  Be "
-"careful to look for common aliases of IPP attributes such as \"landscape\" "
-"for the IPP \"orientation-requested\" attribute."
+"B<ippevepcl> and B<ippeveps> are print commands for B<ippeveprinter>(1).  As "
+"with all print commands, these commands read either the filename specified "
+"on the command-line or from the standard input.  Output is sent to the "
+"standard output.  Status and progress messages are sent to the standard "
+"error."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:79
+#: ippevepcl.7:34
 msgid ""
-"Options passed on the command-line typically do not include the default "
-"choices the printer's PPD file. Use the B<ppdMarkDefaults>()  and "
-"B<cupsMarkOptions>()  functions in the CUPS library to apply the options to "
-"the PPD defaults and map any IPP attributes to the corresponding PPD "
-"options.  Use B<ppdFindMarkedChoice>()  to get the user-selected choice for "
-"a PPD option. For example, a filter might use the following code to "
-"determine the current value of the B<Duplex> PPD option:"
+"B<ippevepcl> prints to B&W HP PCL laser printers and supports printing of HP "
+"PCL (application/vnd.hp-pcl), PWG Raster (image/pwg-raster), and Apple "
+"Raster (image/urf) print files."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:84
-#, no-wrap
+#: ippevepcl.7:39
 msgid ""
-"    ppd_file_t *ppd = ppdOpenFile(getenv(\"PPD\"));\n"
-"    cups_option_t *options = NULL;\n"
-"    int num_options = cupsParseOptions(argv[5], 0, &options);\n"
+"B<ippeveps> print to Adobe PostScript printers and supports printing of PDF "
+"(application/pdf), PostScript (application/postscript), JPEG (image/jpeg), "
+"PWG Raster (image/pwg-raster), and Apple Raster (image/urf) print files.  "
+"Printer-specific commands are read from a supplied PPD file.  If no PPD file "
+"is specified, generic commands suitable for any Level 2 or Level 3 "
+"PostScript printer are used instead to specify duplex printing and media "
+"size."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:87
-#, no-wrap
+#: ippevepcl.7:41
+msgid "These programs return 1 on error and 0 on success."
+msgstr ""
+
+#. type: Plain text
+#: ippevepcl.7:45
 msgid ""
-"    ppdMarkDefaults(ppd);\n"
-"    cupsMarkOptions(ppd, num_options, options);\n"
+"These program inherit the environment provided by the B<ippeveprinter> "
+"program."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:89
-#, no-wrap
-msgid "    ppd_choice_t *choice = ppdFindMarkedChoice(ppd, \"Duplex\");\n"
+#: ippevepcl.7:47
+msgid "B<ippeveprinter>(8)"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:93
-msgid ""
-"Raster filters should use option choices set through the raster page header, "
-"as those reflect the options in effect for a given page.  Options specified "
-"on the command-line determine the default values for the entire job, which "
-"can be overridden on a per-page basis."
+#: ippevepcl.7:48
+msgid "Copyright \\[co] 2019 by Apple Inc."
 msgstr ""
 
-#. type: SH
-#: filter.man:93
+#. type: TH
+#: ippeveprinter.1:9
 #, no-wrap
-msgid "LOG MESSAGES"
+msgid "ippeveprinter"
+msgstr ""
+
+#. type: TH
+#: ippeveprinter.1:9
+#, no-wrap
+msgid "17 May 2019"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:96
-msgid ""
-"Messages sent to the standard error are generally stored in the printer's "
-"\"printer-state-message\" attribute and the current B<ErrorLog> file.  Each "
-"line begins with a standard prefix:"
+#: ippeveprinter.1:12
+msgid "ippeveprinter - an ipp everywhere printer application for cups"
 msgstr ""
 
-#. type: TP
-#: filter.man:96
-#, no-wrap
-msgid "B<ALERT: >I<message>"
+#. type: Plain text
+#: ippeveprinter.1:79
+msgid ""
+"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] [ "
+"B<-2> ] [ B<-D> I<device-uri> ] [ B<-F> I<output-type/subtype> ] [ B<-K> "
+"I<keypath> ] [ B<-M> I<manufacturer> ] [ B<-P> I<filename.ppd> ] [ B<-V> "
+"I<ipp-version> ] [ B<-a> I<filename.conf> ] [ B<-c> I<command> ] [ B<-d> "
+"I<spool-directory> ] [ B<-f> I<type/subtype[,...]> ] [ B<-i> I<iconfile.png> "
+"] [ B<-k> ] [ B<-l> I<location> ] [ B<-m> I<model> ] [ B<-n> I<hostname> ] [ "
+"B<-p> I<port> ] [ B<-r> I<subtype[,subtype]> ] [ B<-s> "
+"I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:99
+#: ippeveprinter.1:82
 msgid ""
-"Sets the \"printer-state-message\" attribute and adds the specified message "
-"to the current B<ErrorLog> using the \"alert\" log level."
+"B<ippeveprinter> is a simple Internet Printing Protocol (IPP) server "
+"conforming to the IPP Everywhere (PWG 5100.14) specification. It can be used "
+"to test client software or act as a very basic print server that runs a "
+"command for every job that is printed."
 msgstr ""
 
-#. type: TP
-#: filter.man:99
-#, no-wrap
-msgid "B<ATTR: >I<attribute=value >[ I<... attribute=value>]"
+#. type: Plain text
+#: ippeveprinter.1:85
+msgid "The following options are recognized by B<ippeveprinter:>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:105
-msgid ""
-"Sets the named job or printer attribute(s). The following job attributes can "
-"be set: \"job-media-progress\". The following printer attributes can be set: "
-"\"auth-info-required\", \"marker-colors\", \"marker-high-levels\", "
-"\"marker-levels\", \"marker-low-levels\", \"marker-message\", "
-"\"marker-names\", \"marker-types\", \"printer-alert\", and "
-"\"printer-alert-description\"."
+#: ippeveprinter.1:88
+msgid "Show program usage."
 msgstr ""
 
 #. type: TP
-#: filter.man:105
+#: ippeveprinter.1:88
 #, no-wrap
-msgid "B<CRIT: >I<message>"
+msgid "B<--no-web-forms>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:108
-msgid ""
-"Sets the \"printer-state-message\" attribute and adds the specified message "
-"to the current B<ErrorLog> using the \"critical\" log level."
+#: ippeveprinter.1:91
+msgid "Disable the web interface forms used to update the media and supply levels."
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:94
+msgid "Show the CUPS version."
 msgstr ""
 
 #. type: TP
-#: filter.man:108
+#: ippeveprinter.1:94
 #, no-wrap
-msgid "B<DEBUG: >I<message>"
+msgid "B<-2>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:112
-msgid ""
-"Adds the specified message to the current B<ErrorLog> using the \"debug\" "
-"log level.  B<DEBUG> messages are never stored in the "
-"\"printer-state-message\" attribute."
+#: ippeveprinter.1:97
+msgid "Report support for two-sided (duplex) printing."
 msgstr ""
 
 #. type: TP
-#: filter.man:112
+#: ippeveprinter.1:97
 #, no-wrap
-msgid "B<DEBUG2: >I<message>"
+msgid "B<-D >I<device-uri>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:117
+#: ippeveprinter.1:104
 msgid ""
-"Adds the specified message to the current B<ErrorLog> using the \"debug2\" "
-"log level.  B<DEBUG2> messages are never stored in the "
-"\"printer-state-message\" attribute."
+"Set the device URI for print output.  The URI can be a filename, directory, "
+"or a network socket URI of the form \"socket://ADDRESS[:PORT]\" (where the "
+"default port number is 9100).  When specifying a directory, B<ippeveprinter> "
+"will create an output file using the job ID and name."
 msgstr ""
 
 #. type: TP
-#: filter.man:117
+#: ippeveprinter.1:104
 #, no-wrap
-msgid "B<EMERG: >I<message>"
+msgid "B<-F >I<output-type/subtype[,...]>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:120
+#: ippeveprinter.1:108
 msgid ""
-"Sets the \"printer-state-message\" attribute and adds the specified message "
-"to the current B<ErrorLog> using the \"emergency\" log level."
+"Specifies the output MIME media type.  The default is "
+"\"application/postscript\" when the B<-P> option is specified."
 msgstr ""
 
 #. type: TP
-#: filter.man:120
+#: ippeveprinter.1:108
 #, no-wrap
-msgid "B<ERROR:>I< message>"
+msgid "B<-M >I<manufacturer>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:123
-msgid ""
-"Sets the \"printer-state-message\" attribute and adds the specified message "
-"to the current B<ErrorLog> using the \"error\" log level."
+#: ippeveprinter.1:112
+msgid "Set the manufacturer of the printer.  The default is \"Example\"."
 msgstr ""
 
 #. type: TP
-#: filter.man:123
+#: ippeveprinter.1:112
 #, no-wrap
-msgid "B<INFO:>I< message>"
+msgid "B<-P >I<filename.ppd>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:126
+#: ippeveprinter.1:118
 msgid ""
-"Sets the \"printer-state-message\" attribute. If the current B<LogLevel> is "
-"set to \"debug2\", also adds the specified message to the current "
-"B<ErrorLog> using the \"info\" log level."
+"Load printer attributes from the specified PPD file.  This option is "
+"typically used in conjunction with the B<ippeveps>(7)  printer command (\"-c "
+"ippeveps\")."
 msgstr ""
 
 #. type: TP
-#: filter.man:126
+#: ippeveprinter.1:118
 #, no-wrap
-msgid "B<NOTICE:>I< message>"
+msgid "B<-V 1.1>"
+msgstr ""
+
+#. type: TP
+#: ippeveprinter.1:120
+#, no-wrap
+msgid "B<-V 2.0>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:129
-msgid ""
-"Sets the \"printer-state-message\" attribute and adds the specified message "
-"to the current B<ErrorLog> using the \"notice\" log level."
+#: ippeveprinter.1:124
+msgid "Specifies the maximum IPP version to report.  2.0 is the default."
 msgstr ""
 
 #. type: TP
-#: filter.man:129
+#: ippeveprinter.1:124
 #, no-wrap
-msgid "B<PAGE:>I< page-number #-copies>"
+msgid "B<-c >I<command>"
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:136
+msgid ""
+"Run the specified command for each document that is printed.  If \"command\" "
+"is not an absolute path (\"/path/to/command\"), B<ippeveprinter> looks for "
+"the command in the \"command\" subdirectory of the CUPS binary directory, "
+"typically /usr/lib/cups/command or /usr/libexec/cups/command.  The "
+"B<cups-config>(1)  command can be used to discover the correct binary "
+"directory (\"cups-config --serverbin\").  In addition, the CUPS_SERVERBIN "
+"environment variable can be used to override the default location of this "
+"directory - see the B<cups>(1)  man page for more details."
 msgstr ""
 
 #. type: TP
-#: filter.man:131
+#: ippeveprinter.1:136
 #, no-wrap
-msgid "B<PAGE:>I< total #-pages>"
+msgid "B<-d >I<spool-directory>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:134
+#: ippeveprinter.1:140
 msgid ""
-"Adds an entry to the current B<PageLog>. The first form adds I<#-copies> to "
-"the \"job-media-sheets-completed\" attribute. The second form sets the "
-"\"job-media-sheets-completed\" attribute to I<#-pages>."
+"Specifies the directory that will hold the print files.  The default is a "
+"directory under the user's current temporary directory."
 msgstr ""
 
 #. type: TP
-#: filter.man:134
+#: ippeveprinter.1:140
 #, no-wrap
-msgid "B<PPD:>I< Keyword=Value> [ I<... KeywordN=Value> ]"
+msgid "B<-f >I<type/subtype[,...]>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:137
+#: ippeveprinter.1:144
 msgid ""
-"Sets the named keywords in the printer's PPD file. This is typically used to "
-"update default option keywords such as B<DefaultPageSize> and the various "
-"installable options in the PPD file."
+"Specifies a list of MIME media types that the server will accept.  The "
+"default depends on the type of printer created."
 msgstr ""
 
 #. type: TP
-#: filter.man:137
+#: ippeveprinter.1:144
 #, no-wrap
-msgid "B<STATE:>I< printer-state-reason >[ I<... printer-state-reason> ]"
+msgid "B<-i >I<iconfile.png>"
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:149
+msgid ""
+"Specifies the printer icon file for the server.  The file must be a PNG "
+"format image.  The default is an internally-provided PNG image."
 msgstr ""
 
 #. type: TP
-#: filter.man:139
+#: ippeveprinter.1:149
 #, no-wrap
-msgid "B<STATE: +>I< printer-state-reason >[ I<... printer-state-reason> ]"
+msgid "B<-k>"
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:152
+msgid "Keeps the print documents in the spool directory rather than deleting them."
 msgstr ""
 
 #. type: TP
-#: filter.man:141
+#: ippeveprinter.1:152
 #, no-wrap
-msgid "B<STATE: ->I< printer-state-reason >[ I<... printer-state-reason> ]"
+msgid "B<-l >I<location>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:144
+#: ippeveprinter.1:156
 msgid ""
-"Sets, adds, or removes \"printer-state-reason\" keywords for the current "
-"queue. Typically this is used to indicate media, ink, and toner conditions "
-"on a printer."
+"Specifies the human-readable location string that is reported by the "
+"server.  The default is the empty string."
 msgstr ""
 
 #. type: TP
-#: filter.man:144
+#: ippeveprinter.1:156 lpadmin.8:79
 #, no-wrap
-msgid "B<WARNING:>I< message>"
+msgid "B<-m >I<model>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:147
-msgid ""
-"Sets the \"printer-state-message\" attribute and adds the specified message "
-"to the current B<ErrorLog> using the \"warning\" log level."
+#: ippeveprinter.1:160
+msgid "Specifies the model name of the printer.  The default is \"Printer\"."
 msgstr ""
 
-#. type: SH
-#: filter.man:147
+#. type: TP
+#: ippeveprinter.1:160
 #, no-wrap
-msgid "ENVIRONMENT VARIABLES"
+msgid "B<-n >I<hostname>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:150
+#: ippeveprinter.1:166
 msgid ""
-"The following environment variables are defined by the CUPS server when "
-"executing the filter:"
+"Specifies the hostname that is reported by the server.  The default is the "
+"name returned by the B<hostname>(1)  command."
 msgstr ""
 
 #. type: TP
-#: filter.man:150
+#: ippeveprinter.1:166
 #, no-wrap
-msgid "B<CHARSET>"
+msgid "B<-p >I<port>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:153
-msgid "The default text character set, typically \"utf-8\"."
+#: ippeveprinter.1:170
+msgid ""
+"Specifies the port number to listen on.  The default is a user-specific "
+"number from 8000 to 8999."
 msgstr ""
 
 #. type: TP
-#: filter.man:153
+#: ippeveprinter.1:170
 #, no-wrap
-msgid "B<CLASS>"
+msgid "B<-r >I<subtype[,subtype]>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:156
+#: ippeveprinter.1:175
 msgid ""
-"When a job is submitted to a printer class, contains the name of the "
-"destination printer class. Otherwise this environment variable will not be "
-"set."
+"Specifies the DNS-SD subtype(s) to advertise.  Separate multiple subtypes "
+"with a comma.  The default is \"_print\"."
 msgstr ""
 
 #. type: TP
-#: filter.man:156
+#: ippeveprinter.1:175
 #, no-wrap
-msgid "B<CONTENT_TYPE>"
+msgid "B<-s >I<speed[,color-speed]>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:159
+#: ippeveprinter.1:180
 msgid ""
-"The MIME media type associated with the submitted job file, for example "
-"\"application/postscript\"."
+"Specifies the printer speed in pages per minute.  If two numbers are "
+"specified and the second number is greater than zero, the server will report "
+"support for color printing.  The default is \"10,0\"."
+msgstr ""
+
+#. type: TP
+#: ippeveprinter.1:180
+#, no-wrap
+msgid "B<-v[vvv]>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:162
-msgid "The directory where semi-persistent cache files can be found and stored."
+#: ippeveprinter.1:183
+msgid "Be (very) verbose when logging activity to standard error."
 msgstr ""
 
-#. type: TP
-#: filter.man:165
-#, no-wrap
-msgid "B<CUPS_FILETYPE>"
+#. type: Plain text
+#: ippeveprinter.1:190
+msgid ""
+"The B<ippeveprinter> program returns 1 if it is unable to process the "
+"command-line arguments or register the IPP service.  Otherwise "
+"B<ippeveprinter> will run continuously until terminated."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:169
+#: ippeveprinter.1:194
 msgid ""
-"The type of file being printed: \"job-sheet\" for a banner page and "
-"\"document\" for a regular print file."
+"The B<ippeveprinter> program is unique to CUPS and conforms to the IPP "
+"Everywhere (PWG 5100.14) specification."
 msgstr ""
 
-#. type: TP
-#: filter.man:169
-#, no-wrap
-msgid "B<CUPS_MAX_MESSAGE>"
+#. type: Plain text
+#: ippeveprinter.1:198
+msgid ""
+"B<ippeveprinter> adds environment variables starting with \"IPP_\" for all "
+"IPP Job attributes in the print request.  For example, when executing a "
+"command for an IPP Job containing the \"media\" Job Template attribute, the "
+"\"IPP_MEDIA\" environment variable will be set to the value of that "
+"attribute."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:172
+#: ippeveprinter.1:201
 msgid ""
-"The maximum size of a message sent to I<stderr>, including any leading "
-"prefix and the trailing newline."
+"In addition, all IPP \"xxx-default\" and \"pwg-xxx\" Printer Description "
+"attributes are added to the environment.  For example, the "
+"\"IPP_MEDIA_DEFAULT\" environment variable will be set to the default value "
+"for the \"media\" Job Template attribute."
 msgstr ""
 
-#. type: TP
-#: filter.man:175
-#, no-wrap
-msgid "B<FINAL_CONTENT_TYPE>"
+#. type: Plain text
+#: ippeveprinter.1:205
+msgid ""
+"Enumerated values are converted to their keyword equivalents.  For example, "
+"a \"print-quality\" Job Template attribute with a enum value of 3 will "
+"become the \"IPP_PRINT_QUALITY\" environment variable with a value of "
+"\"draft\".  This string conversion only happens for standard Job Template "
+"attributes, currently \"finishings\", \"orientation-requested\", and "
+"\"print-quality\"."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:178
+#: ippeveprinter.1:207
 msgid ""
-"The MIME media type associated with the output destined for the printer, for "
-"example \"application/vnd.cups-postscript\"."
+"Finally, the \"CONTENT_TYPE\" environment variable contains the MIME media "
+"type of the document being printed, the \"DEVICE_URI\" environment variable "
+"contains the device URI as specified with the \"-D\" option, the "
+"\"OUTPUT_FORMAT\" environment variable contains the output MIME media type, "
+"and the \"PPD\" environment variable contains the PPD filename as specified "
+"with the \"-P\" option."
 msgstr ""
 
-#. type: TP
-#: filter.man:178
+#. type: SH
+#: ippeveprinter.1:207
 #, no-wrap
-msgid "B<LANG>"
+msgid "COMMAND OUTPUT"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:181
-msgid "The default language locale (typically C or en)."
+#: ippeveprinter.1:209
+msgid ""
+"Unless they communicate directly with a printer, print commands send "
+"printer-ready data to the standard output."
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:213
+msgid ""
+"Print commands can send messages back to B<ippeveprinter> on the standard "
+"error with one of the following prefixes:"
 msgstr ""
 
 #. type: TP
-#: filter.man:181
+#: ippeveprinter.1:213
 #, no-wrap
-msgid "B<PATH>"
+msgid "B<ATTR: >I<attribute=value[ attribute=value]>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:184
+#: ippeveprinter.1:217
 msgid ""
-"The standard execution path for external programs that may be run by the "
-"filter."
+"Sets the named attribute(s) to the given values.  Currently only the "
+"\"job-impressions\" and \"job-impressions-completed\" Job Status attributes "
+"and the \"marker-xxx\", \"printer-alert\", \"printer-alert-description\", "
+"\"printer-supply\", and \"printer-supply-description\" Printer Status "
+"attributes can be set."
 msgstr ""
 
 #. type: TP
-#: filter.man:184
+#: ippeveprinter.1:217
 #, no-wrap
-msgid "B<PPD>"
+msgid "B<DEBUG: >I<Debugging message>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:187
-msgid ""
-"The full pathname of the PostScript Printer Description (PPD) file for this "
-"printer."
+#: ippeveprinter.1:220
+msgid "Logs a debugging message if at least two -v's have been specified."
+msgstr ""
+
+#. type: TP
+#: ippeveprinter.1:220
+#, no-wrap
+msgid "B<ERROR: >I<Error message>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:190
-msgid "The name of the printer."
+#: ippeveprinter.1:223
+msgid ""
+"Logs an error message and copies the message to the \"job-state-message\" "
+"attribute."
 msgstr ""
 
 #. type: TP
-#: filter.man:190
+#: ippeveprinter.1:223
 #, no-wrap
-msgid "B<RIP_CACHE>"
+msgid "B<INFO: >I<Informational message>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:193
-msgid "The recommended amount of memory to use for Raster Image Processors (RIPs)."
+#: ippeveprinter.1:226
+msgid ""
+"Logs an informational/progress message if -v has been specified and copies "
+"the message to the \"job-state-message\" attribute unless an error has been "
+"reported."
 msgstr ""
 
 #. type: TP
-#: filter.man:193
+#: ippeveprinter.1:226
 #, no-wrap
-msgid "B<SOFTWARE>"
+msgid "B<STATE: >I<keyword[,keyword,...]>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:196
-msgid "The name and version number of the server (typically CUPS/I<major.minor>)."
+#: ippeveprinter.1:229
+msgid ""
+"Sets the printer's \"printer-state-reasons\" attribute to the listed "
+"keywords."
 msgstr ""
 
 #. type: TP
-#: filter.man:196
+#: ippeveprinter.1:229
 #, no-wrap
-msgid "B<TZ>"
+msgid "B<STATE: ->I<keyword[,keyword,...]>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:199
-msgid "The timezone of the server."
+#: ippeveprinter.1:232
+msgid ""
+"Removes the listed keywords from the printer's \"printer-state-reasons\" "
+"attribute."
 msgstr ""
 
 #. type: TP
-#: filter.man:199
+#: ippeveprinter.1:232
 #, no-wrap
-msgid "B<USER>"
+msgid "B<STATE: +>I<keyword[,keyword,...]>"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:202
+#: ippeveprinter.1:235
 msgid ""
-"The user executing the filter, typically \"lp\" or \"root\"; consult the "
-"I<cups-files.conf> file for the current setting."
+"Adds the listed keywords to the printer's \"printer-state-reasons\" "
+"attribute."
 msgstr ""
 
 #. type: Plain text
-#: filter.man:204
-msgid ""
-"While the filter interface is compatible with System V interface scripts, "
-"CUPS does not support System V interface scripts."
+#: ippeveprinter.1:239
+msgid "Run B<ippeveprinter> with a service name of My Cool Printer:"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:211
-msgid ""
-"CUPS filters are not meant to be run directly by the user.  Aside from the "
-"legacy System V interface issues (I<argv[0]> is the printer name), CUPS "
-"filters also expect specific environment variables and file descriptors, and "
-"typically run in a user session that (on macOS) has additional restrictions "
-"that affect how it runs.  Unless you are a developer and know what you are "
-"doing, please do not run filters directly.  Instead, use the "
-"B<cupsfilter>(8)  program to use the appropriate filters to do the "
-"conversions you need."
+#: ippeveprinter.1:242
+#, no-wrap
+msgid "    ippeveprinter \"My Cool Printer\"\n"
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:247
+msgid "Run the B<file>(1)  command whenever a job is sent to the server:"
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:250
+#, no-wrap
+msgid "    ippeveprinter -c /usr/bin/file \"My Cool Printer\"\n"
 msgstr ""
 
 #. type: Plain text
-#: filter.man:217
+#: ippeveprinter.1:255
 msgid ""
-"B<backend>(7), B<cups>(1), B<cups-files.conf>(5), B<cupsd>(8), "
-"B<cupsfilter>(8),"
+"B<ippevepcl>(7), B<ippeveps>(7), PWG Internet Printing Protocol Workgroup "
+"(http://www.pwg.org/ipp)"
 msgstr ""
 
 #. type: TH
-#: ippfind.man:12
+#: ippfind.1:9
 #, no-wrap
 msgid "ippfind"
 msgstr ""
 
 #. type: TH
-#: ippfind.man:12
+#: ippfind.1:9
 #, no-wrap
-msgid "14 February 2018"
+msgid "ippsample"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:15
+#: ippfind.1:12
 msgid "ippfind - find internet printing protocol printers"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:22
+#: ippfind.1:19
 msgid ""
 "B<ippfind> [ I<options> ] I<regtype>[B<,>I<subtype>][B<.>I<domain>B<.>] "
 "... [ I<expression> ... ]"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:29
+#: ippfind.1:26
 msgid ""
 "B<ippfind> [ I<options> ] I<name>[B<.>I<regtype>[B<.>I<domain>B<.>]] ... [ "
 "I<expression> ... ]"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:32
+#: ippfind.1:29
 msgid "B<ippfind> B<--help>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:35
+#: ippfind.1:32
 msgid "B<ippfind> B<--version>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:38
+#: ippfind.1:35
 msgid ""
 "B<ippfind> finds services registered with a DNS server or available through "
 "local devices.  Its primary purpose is to find IPP printers and show their "
@@ -7993,79 +8432,79 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: ippfind.man:38
+#: ippfind.1:35
 #, no-wrap
 msgid "REGISTRATION TYPES"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:40
+#: ippfind.1:37
 msgid "B<ippfind> supports the following registration types:"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:40
+#: ippfind.1:37
 #, no-wrap
 msgid "_http._tcp"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:43
+#: ippfind.1:40
 msgid "HyperText Transport Protocol (HTTP, RFC 2616)"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:43
+#: ippfind.1:40
 #, no-wrap
 msgid "_https._tcp"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:46
+#: ippfind.1:43
 msgid "Secure HyperText Transport Protocol (HTTPS, RFC 2818)"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:46
+#: ippfind.1:43
 #, no-wrap
 msgid "_ipp._tcp"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:49
+#: ippfind.1:46
 msgid "Internet Printing Protocol (IPP, RFC 2911)"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:49
+#: ippfind.1:46
 #, no-wrap
 msgid "_ipps._tcp"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:52
+#: ippfind.1:49
 msgid "Secure Internet Printing Protocol (IPPS, draft)"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:52
+#: ippfind.1:49
 #, no-wrap
 msgid "_printer._tcp"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:55
+#: ippfind.1:52
 msgid "Line Printer Daemon (LPD, RFC 1179)"
 msgstr ""
 
 #. type: SS
-#: ippfind.man:55
+#: ippfind.1:52
 #, no-wrap
 msgid "EXPRESSIONS"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:64
+#: ippfind.1:61
 msgid ""
 "B<ippfind> supports expressions much like the B<find>(1)  utility.  However, "
 "unlike B<find>(1), B<ippfind> uses POSIX regular expressions instead of "
@@ -8076,58 +8515,58 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ippfind.man:64
+#: ippfind.1:61
 #, no-wrap
 msgid "B<-d >I<regex>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:66
+#: ippfind.1:63
 #, no-wrap
 msgid "B<--domain >I<regex>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:69
+#: ippfind.1:66
 msgid "True if the domain matches the given regular expression."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:69
+#: ippfind.1:66
 #, no-wrap
 msgid "B<--false>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:72
+#: ippfind.1:69
 msgid "Always false."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:72
+#: ippfind.1:69
 #, no-wrap
 msgid "B<-h >I<regex>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:74
+#: ippfind.1:71
 #, no-wrap
 msgid "B<--host >I<regex>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:77
+#: ippfind.1:74
 msgid "True is the hostname matches the given regular expression."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:79
+#: ippfind.1:76
 #, no-wrap
 msgid "B<--ls>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:83
+#: ippfind.1:80
 msgid ""
 "Lists attributes returned by Get-Printer-Attributes for IPP printers and "
 "traditional I<find> \"-ls\" output for HTTP URLs.  The result is true if the "
@@ -8135,210 +8574,210 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ippfind.man:83
+#: ippfind.1:80
 #, no-wrap
 msgid "B<--local>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:86
+#: ippfind.1:83
 msgid "True if the service is local to this computer."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:86
+#: ippfind.1:83
 #, no-wrap
 msgid "B<-N >I<name>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:88
+#: ippfind.1:85
 #, no-wrap
 msgid "B<--literal-name >I<name>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:91
+#: ippfind.1:88
 msgid "True if the service instance name matches the given name."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:91
+#: ippfind.1:88
 #, no-wrap
 msgid "B<-n >I<regex>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:93
+#: ippfind.1:90
 #, no-wrap
 msgid "B<--name >I<regex>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:96
+#: ippfind.1:93
 msgid "True if the service instance name matches the given regular expression."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:96
+#: ippfind.1:93
 #, no-wrap
 msgid "B<--path >I<regex>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:99
+#: ippfind.1:96
 msgid "True if the URI resource path matches the given regular expression."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:99
+#: ippfind.1:96
 #, no-wrap
 msgid "B<-P >I<number>[B<->I<number>]"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:101
+#: ippfind.1:98
 #, no-wrap
 msgid "B<--port >I<number>[B<->I<number>]"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:104
+#: ippfind.1:101
 msgid "True if the port matches the given number or range."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:104 lpr.man:105
+#: ippfind.1:101 lpr.1:102
 #, no-wrap
 msgid "B<-p>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:106
+#: ippfind.1:103
 #, no-wrap
 msgid "B<--print>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:110
+#: ippfind.1:107
 msgid ""
 "Prints the URI if the result of previous expressions is true.  The result is "
 "always true."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:112
+#: ippfind.1:109
 #, no-wrap
 msgid "B<--quiet>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:115
+#: ippfind.1:112
 msgid "Quiet mode - just returns the exit codes below."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:117
+#: ippfind.1:114
 #, no-wrap
 msgid "B<--remote>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:120
+#: ippfind.1:117
 msgid "True if the service is not local to this computer."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:120 lp.man:135 lpstat.man:121
+#: ippfind.1:117 lp.1:132 lpstat.1:117
 #, no-wrap
 msgid "B<-s>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:122
+#: ippfind.1:119
 #, no-wrap
 msgid "B<--print-name>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:126
+#: ippfind.1:123
 msgid ""
 "Prints the service instance name if the result of previous expressions is "
 "true.  The result is always true."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:126
+#: ippfind.1:123
 #, no-wrap
 msgid "B<--true>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:129
+#: ippfind.1:126
 msgid "Always true."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:129
+#: ippfind.1:126
 #, no-wrap
 msgid "B<-t >I<key>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:131
+#: ippfind.1:128
 #, no-wrap
 msgid "B<--txt >I<key>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:134
+#: ippfind.1:131
 msgid "True if the TXT record contains the named key."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:134
+#: ippfind.1:131
 #, no-wrap
 msgid "B<--txt->I<key regex>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:137
+#: ippfind.1:134
 msgid ""
 "True if the TXT record contains the named key and matches the given regular "
 "expression."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:137
+#: ippfind.1:134
 #, no-wrap
 msgid "B<-u >I<regex>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:139
+#: ippfind.1:136
 #, no-wrap
 msgid "B<--uri >I<regex>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:142
+#: ippfind.1:139
 msgid "True if the URI matches the given regular expression."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:142
+#: ippfind.1:139
 #, no-wrap
 msgid "B<-x >I<utility >[ I<argument >... ] B<;>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:144
+#: ippfind.1:141
 #, no-wrap
 msgid "B<--exec >I<utility >[ I<argument >... ] B<;>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:148
+#: ippfind.1:145
 msgid ""
 "Executes the specified program if the current result is true.  \"{foo}\" "
 "arguments are replaced with the corresponding value - see SUBSTITUTIONS "
@@ -8346,240 +8785,240 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:150
+#: ippfind.1:147
 msgid "Expressions may also contain modifiers:"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:150
+#: ippfind.1:147
 #, no-wrap
 msgid "B<( >I<expression >B<)>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:153
+#: ippfind.1:150
 msgid "Group the result of expressions."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:153
+#: ippfind.1:150
 #, no-wrap
 msgid "B<! >I<expression>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:155
+#: ippfind.1:152
 #, no-wrap
 msgid "B<--not >I<expression>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:158
+#: ippfind.1:155
 msgid "Unary NOT of the expression."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:158
+#: ippfind.1:155
 #, no-wrap
 msgid "I<expression expression>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:160
+#: ippfind.1:157
 #, no-wrap
 msgid "I<expression >B<--and >I<expression>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:163
+#: ippfind.1:160
 msgid "Logical AND of expressions."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:163
+#: ippfind.1:160
 #, no-wrap
 msgid "I<expression >B<--or >I<expression>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:166
+#: ippfind.1:163
 msgid "Logical OR of expressions."
 msgstr ""
 
 #. type: SS
-#: ippfind.man:166
+#: ippfind.1:163
 #, no-wrap
 msgid "SUBSTITUTIONS"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:168
+#: ippfind.1:165
 msgid "The substitutions for \"{foo}\" in I<-e> and I<--exec> are:"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:168
+#: ippfind.1:165
 #, no-wrap
 msgid "B<{service_domain}>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:171 ippfind.man:224
+#: ippfind.1:168 ippfind.1:221
 msgid "Domain name, e.g., \"example.com.\", \"local.\", etc."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:171
+#: ippfind.1:168
 #, no-wrap
 msgid "B<{service_hostname}>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:174 ippfind.man:227
+#: ippfind.1:171 ippfind.1:224
 msgid ""
 "Fully-qualified domain name, e.g., \"printer.example.com.\", "
 "\"printer.local.\", etc."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:174
+#: ippfind.1:171
 #, no-wrap
 msgid "B<{service_name}>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:177 ippfind.man:230
+#: ippfind.1:174 ippfind.1:227
 msgid "Service instance name, e.g., \"My Fine Printer\"."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:177
+#: ippfind.1:174
 #, no-wrap
 msgid "B<{service_port}>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:180 ippfind.man:233
+#: ippfind.1:177 ippfind.1:230
 msgid "Port number for server, typically 631 for IPP and 80 for HTTP."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:180
+#: ippfind.1:177
 #, no-wrap
 msgid "B<{service_regtype}>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:183 ippfind.man:236
+#: ippfind.1:180 ippfind.1:233
 msgid "DNS-SD registration type, e.g., \"_ipp._tcp\", \"_http._tcp\", etc."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:183
+#: ippfind.1:180
 #, no-wrap
 msgid "B<{service_scheme}>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:186 ippfind.man:239
+#: ippfind.1:183 ippfind.1:236
 msgid "URI scheme for DNS-SD registration type, e.g., \"ipp\", \"http\", etc."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:186
+#: ippfind.1:183
 #, no-wrap
 msgid "B<{}>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:188
+#: ippfind.1:185
 #, no-wrap
 msgid "B<{service_uri}>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:191 ippfind.man:242
+#: ippfind.1:188 ippfind.1:239
 msgid ""
 "URI for service, e.g., \"ipp://printer.local./ipp/print\", "
 "\"http://printer.local./\", etc."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:191
+#: ippfind.1:188
 #, no-wrap
 msgid "B<{txt_>I<key>B<}>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:194
+#: ippfind.1:191
 msgid "Value of TXT record I<key> (lowercase)."
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:196
+#: ippfind.1:193
 msgid "B<ippfind> supports the following options:"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:199
+#: ippfind.1:196
 msgid "Show program help."
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:202
+#: ippfind.1:199
 msgid "Show program version."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:202 ipptool.man:106
+#: ippfind.1:199 ipptool.1:111
 #, no-wrap
 msgid "B<-4>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:205
+#: ippfind.1:202
 msgid "Use IPv4 when listing."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:205 ipptool.man:111
+#: ippfind.1:202 ipptool.1:116
 #, no-wrap
 msgid "B<-6>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:208
+#: ippfind.1:205
 msgid "Use IPv6 when listing."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:208
+#: ippfind.1:205
 #, no-wrap
 msgid "B<-T >I<seconds>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:213
+#: ippfind.1:210
 msgid ""
 "Specify find timeout in seconds.  If 1 or less, B<ippfind> stops as soon as "
 "it thinks it has found everything.  The default timeout is 1 second."
 msgstr ""
 
 #. type: TP
-#: ippfind.man:213
+#: ippfind.1:210
 #, no-wrap
 msgid "B<-V >I<version>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:217
+#: ippfind.1:214
 msgid ""
 "Specifies the IPP version when listing.  Supported values are \"1.1\", "
 "\"2.0\", \"2.1\", and \"2.2\"."
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:219
+#: ippfind.1:216
 msgid ""
 "B<ippfind> returns 0 if the result for all processed expressions is true, 1 "
 "if the result of any processed expression is false, 2 if browsing or any "
@@ -8588,83 +9027,83 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:221
+#: ippfind.1:218
 msgid ""
 "When executing a program, B<ippfind> sets the following environment "
 "variables for the matching service registration:"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:221
+#: ippfind.1:218
 #, no-wrap
 msgid "B<IPPFIND_SERVICE_DOMAIN>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:224
+#: ippfind.1:221
 #, no-wrap
 msgid "B<IPPFIND_SERVICE_HOSTNAME>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:227
+#: ippfind.1:224
 #, no-wrap
 msgid "B<IPPFIND_SERVICE_NAME>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:230
+#: ippfind.1:227
 #, no-wrap
 msgid "B<IPPFIND_SERVICE_PORT>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:233
+#: ippfind.1:230
 #, no-wrap
 msgid "B<IPPFIND_SERVICE_REGTYPE>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:236
+#: ippfind.1:233
 #, no-wrap
 msgid "B<IPPFIND_SERVICE_SCHEME>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:239
+#: ippfind.1:236
 #, no-wrap
 msgid "B<IPPFIND_SERVICE_URI>"
 msgstr ""
 
 #. type: TP
-#: ippfind.man:242
+#: ippfind.1:239
 #, no-wrap
 msgid "B<IPPFIND_TXT_>I<KEY>"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:245
+#: ippfind.1:242
 msgid "Values of TXT record I<KEY> (uppercase)."
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:247
+#: ippfind.1:244
 msgid "To show the status of all registered IPP printers on your network, run:"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:250
+#: ippfind.1:247
 #, no-wrap
 msgid "    ippfind --ls\n"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:253
+#: ippfind.1:250
 msgid "Similarly, to send a PostScript test page to every PostScript printer, run:"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:257
+#: ippfind.1:254
 #, no-wrap
 msgid ""
 "    ippfind --txt-pdl application/postscript --exec ipptool\n"
@@ -8672,328 +9111,408 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:260
+#: ippfind.1:257
 msgid "B<ipptool>(1)"
 msgstr ""
 
 #. type: Plain text
-#: ippfind.man:261
-msgid "Copyright \\[co] 2013-2018 by Apple Inc."
-msgstr ""
-
-#. type: TH
-#: ../test/ippserver.man:12
-#, no-wrap
-msgid "ippserver"
+#: ippfind.1:258
+msgid "Copyright \\[co] 2013-2019 by Apple Inc."
 msgstr ""
 
 #. type: TH
-#: ../test/ippserver.man:12
+#: ipptool.1:9
 #, no-wrap
-msgid "28 August 2014"
+msgid "ipptool"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:15
-msgid "ippserver - a simple internet printing protocol server"
+#: ipptool.1:12
+msgid "ipptool - perform internet printing protocol requests"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:62
+#: ipptool.1:75
 msgid ""
-"B<ippserver> [ B<-2> ] [ B<-M> I<manufacturer> ] [ B<-P> ] [ B<-c> "
-"I<command> ] [ B<-d> I<spool-directory> ] [ B<-f> I<type/subtype[,...]> ] [ "
-"B<-h> ] [ B<-i> I<iconfile.png> ] [ B<-k> ] [ B<-l> I<location> ] [ B<-m> "
-"I<model> ] [ B<-n> I<hostname> ] [ B<-p> I<port> ] [ B<-r> I<subtype> ] [ "
-"B<-s> I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
+"B<ipptool> [ B<--help> ] [ B<--ippserver> I<filename> ] [ "
+"B<--stop-after-include-error> ] [ B<--version> ] [ B<-4> ] [ B<-6> ] [ B<-C> "
+"] [ B<-E> ] [ B<-I> ] [ B<-L> ] [ B<-P> I<filename.plist> ] [ B<-S> ] [ "
+"B<-T> I<seconds> ] [ B<-V> I<version> ] [ B<-X> ] [ B<-c> ] [ B<-d> "
+"I<name=value> ] [ B<-f> I<filename> ] [ B<-h> ] [ B<-i> I<seconds> ] [ B<-n> "
+"I<repeat-count> ] [ B<-q> ] [ B<-t> ] [ B<-v ]> I<printer-uri> I<testfile> [ "
+"...  I<testfile> ]"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:65
+#: ipptool.1:88
 msgid ""
-"B<ippserver> is a simple Internet Printing Protocol (IPP) server conforming "
-"to the IPP Everywhere (PWG 5100.14) specification. It can be used to test "
-"client software or act as a very basic print server that runs a command for "
-"every job that is printed."
+"B<ipptool> sends IPP requests to the specified I<printer-uri> and tests "
+"and/or displays the results.  Each named I<testfile> defines one or more "
+"requests, including the expected response status, attributes, and values.  "
+"Output is either a plain text, formatted text, CSV, or XML report on the "
+"standard output, with a non-zero exit status indicating that one or more "
+"tests have failed.  The I<testfile> format is described in "
+"B<ipptoolfile>(5)."
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:68
-msgid "The following options are recognized by B<ippserver:>"
-msgstr ""
-
-#. type: TP
-#: ../test/ippserver.man:68
-#, no-wrap
-msgid "B<-2>"
+#: ipptool.1:91
+msgid "The following options are recognized by B<ipptool:>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:71
-msgid "Report support for two-sided (duplex) printing."
+#: ipptool.1:94
+msgid "Shows program help."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:71
+#: ipptool.1:94
 #, no-wrap
-msgid "B<-M >I<manufacturer>"
+msgid "B<--ippserver >I<filename>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:75
-msgid "Set the manufacturer of the printer.  The default is \"Test\"."
+#: ipptool.1:99
+msgid ""
+"Specifies that the test results should be written to the named B<ippserver> "
+"attributes file."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:75
+#: ipptool.1:99
 #, no-wrap
-msgid "B<-P>"
+msgid "B<--stop-after-include-error>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:78
-msgid "Report support for PIN printing."
-msgstr ""
-
-#. type: TP
-#: ../test/ippserver.man:78
-#, no-wrap
-msgid "B<-c >I<command>"
+#: ipptool.1:106
+msgid ""
+"Tells B<ipptool> to stop if an error occurs in an included file. Normally "
+"B<ipptool> will continue with subsequent tests after the INCLUDE directive."
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:81
-msgid "Run the specified command for each document that is printed."
+#: ipptool.1:111
+msgid "Shows the version of B<ipptool> being used."
 msgstr ""
 
-#. type: TP
-#: ../test/ippserver.man:81
-#, no-wrap
-msgid "B<-d >I<spool-directory>"
+#. type: Plain text
+#: ipptool.1:116
+msgid "Specifies that B<ipptool> must connect to the printer or server using IPv4."
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:85
-msgid ""
-"Specifies the directory that will hold the print files.  The default is a "
-"directory under the user's current temporary directory."
+#: ipptool.1:121
+msgid "Specifies that B<ipptool> must connect to the printer or server using IPv6."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:85
+#: ipptool.1:121
 #, no-wrap
-msgid "B<-f >I<type/subtype[,...]>"
+msgid "B<-C>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:89
+#: ipptool.1:125
 msgid ""
-"Specifies a list of MIME media types that the server will accept.  The "
-"default is \"application/pdf,image/jpeg,image/pwg-raster\"."
-msgstr ""
-
+"Specifies that requests should be sent using the HTTP/1.1 "
+"\"Transfer-Encoding: chunked\" header, which is required for conformance by "
+"all versions of IPP.  The default is to use \"Transfer-Encoding: chunked\" "
+"for requests with attached files and \"Content-Length:\" for requests "
+"without attached files."
+msgstr ""
+
 #. type: Plain text
-#: ../test/ippserver.man:92 ipptool.man:94
-msgid "Shows program help."
+#: ipptool.1:128
+msgid ""
+"Forces TLS encryption when connecting to the server using the HTTP "
+"\"Upgrade\" header."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:92
+#: ipptool.1:128
 #, no-wrap
-msgid "B<-i >I<iconfile.png>"
+msgid "B<-I>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:96
-msgid ""
-"Specifies the printer icon file for the server.  The default is "
-"\"printer.png\"."
+#: ipptool.1:133
+msgid "Specifies that B<ipptool> will continue past errors."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:96
+#: ipptool.1:133
 #, no-wrap
-msgid "B<-k>"
+msgid "B<-L>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:99
-msgid "Keeps the print documents in the spool directory rather than deleting them."
+#: ipptool.1:137
+msgid ""
+"Specifies that requests should be sent using the HTTP/1.0 "
+"\"Content-Length:\" header, which is required for conformance by all "
+"versions of IPP.  The default is to use \"Transfer-Encoding: chunked\" for "
+"requests with attached files and \"Content-Length:\" for requests without "
+"attached files."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:99
+#: ipptool.1:137
 #, no-wrap
-msgid "B<-l >I<location>"
+msgid "B<-P>I<\\ filename.plist>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:103
+#: ipptool.1:141
 msgid ""
-"Specifies the human-readable location string that is reported by the "
-"server.  The default is the empty string."
+"Specifies that the test results should be written to the named XML (Apple "
+"plist) file in addition to the regular test report (B<-t>).  This option is "
+"incompatible with the B<-i> (interval) and B<-n> (repeat-count) options."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:103 lpadmin.man:87
+#: ipptool.1:141
 #, no-wrap
-msgid "B<-m >I<model>"
+msgid "B<-S>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:107
-msgid "Specifies the model name of the printer.  The default is \"Printer\"."
+#: ipptool.1:144
+msgid "Forces (dedicated) TLS encryption when connecting to the server."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:107
+#: ipptool.1:144
 #, no-wrap
-msgid "B<-n >I<hostname>"
+msgid "B<-T>I<\\ seconds>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:113
-msgid ""
-"Specifies the hostname that is reported by the server.  The default is the "
-"name returned by the B<hostname>(1)  command."
+#: ipptool.1:147
+msgid "Specifies a timeout for IPP requests in seconds."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:113
+#: ipptool.1:147
 #, no-wrap
-msgid "B<-p >I<port>"
+msgid "B<-V>I<\\ version>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:117
+#: ipptool.1:150
 msgid ""
-"Specifies the port number to listen on.  The default is a user-specific "
-"number from 8000 to 8999."
+"Specifies the default IPP version to use: 1.0, 1.1, 2.0, 2.1, or 2.2. If not "
+"specified, version 1.1 is used."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:117
+#: ipptool.1:150
 #, no-wrap
-msgid "B<-r >I<subtype>"
+msgid "B<-X>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:122
+#: ipptool.1:154
 msgid ""
-"Specifies the Bonjour subtype(s) to advertise.  Separate multiple subtypes "
-"with a comma.  The default is \"_print\"."
+"Specifies that XML (Apple plist) output is desired instead of the plain text "
+"report.  This option is incompatible with the B<-i> (interval) and B<-n> "
+"(repeat-count) options."
+msgstr ""
+
+#. type: Plain text
+#: ipptool.1:157
+msgid ""
+"Specifies that CSV (comma-separated values) output is desired instead of the "
+"plain text output."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:122
+#: ipptool.1:157
 #, no-wrap
-msgid "B<-s >I<speed[,color-speed]>"
+msgid "B<-d>I<\\ name=value>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:127
-msgid ""
-"Specifies the printer speed in pages per minute.  If two numbers are "
-"specified and the second number is greater than zero, the server will report "
-"support for color printing.  The default is \"10,0\"."
+#: ipptool.1:160
+msgid "Defines the named variable."
 msgstr ""
 
 #. type: TP
-#: ../test/ippserver.man:127
+#: ipptool.1:160
 #, no-wrap
-msgid "B<-v[vvv]>"
+msgid "B<-f>I<\\ filename>"
+msgstr ""
+
+#. type: Plain text
+#: ipptool.1:163
+msgid "Defines the default request filename for tests."
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:130
-msgid "Be (very) verbose when logging activity to the standard output."
+#: ipptool.1:166
+msgid "Validate HTTP response headers."
+msgstr ""
+
+#. type: TP
+#: ipptool.1:166
+#, no-wrap
+msgid "B<-i>I<\\ seconds>"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:137
+#: ipptool.1:172
 msgid ""
-"The B<ippserver> program returns 1 if it is unable to process the "
-"command-line arguments or register the IPP service.  Otherwise B<ippserver> "
-"will run continuously until terminated."
+"Specifies that the (last)  I<testfile> should be repeated at the specified "
+"interval.  This option is incompatible with the B<-X> (XML plist output) "
+"option."
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:141
+#: ipptool.1:175
+msgid "Specifies that plain text output is desired."
+msgstr ""
+
+#. type: TP
+#: ipptool.1:175
+#, no-wrap
+msgid "B<-n>I<\\ repeat-count>"
+msgstr ""
+
+#. type: Plain text
+#: ipptool.1:181
 msgid ""
-"The B<ippserver> program is unique to CUPS and conforms to the IPP "
-"Everywhere (PWG 5100.14) specification."
+"Specifies that the (last)  I<testfile> should be repeated the specified "
+"number of times.  This option is incompatible with the I<-X> (XML plist "
+"output) option."
+msgstr ""
+
+#. type: Plain text
+#: ipptool.1:184
+msgid "Be quiet and produce no output."
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:145
+#: ipptool.1:187
 msgid ""
-"B<ippserver> adds environment variables starting with \"IPP_\" for all IPP "
-"Job attributes in the print request.  For example, when executing a command "
-"for an IPP Job containing the \"media\" Job Template attribute, the "
-"\"IPP_MEDIA\" environment variable will be set to the value of that "
-"attribute."
+"Specifies that CUPS test report output is desired instead of the plain text "
+"output."
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:148
+#: ipptool.1:191
 msgid ""
-"Enumerated values are converted to their keyword equivalents.  For example, "
-"a \"print-quality\" Job Template attribute with a enum value of 3 will "
-"become the \"IPP_PRINT_QUALITY\" environment variable with a value of "
-"\"draft\"."
+"Specifies that all request and response attributes should be output in CUPS "
+"test mode (B<-t>).  This is the default for XML output."
+msgstr ""
+
+#. type: Plain text
+#: ipptool.1:195
+msgid ""
+"The B<ipptool> program returns 0 if all tests were successful and 1 "
+"otherwise."
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:152
-msgid "Run B<ippserver> with a service name of My Cool Printer:"
+#: ipptool.1:197
+msgid "The following standard files are available:"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:155
+#: ipptool.1:228
 #, no-wrap
-msgid "    ippserver \"My Cool Printer\"\n"
+msgid ""
+"I<color.jpg>\n"
+"I<create-printer-subscription.test>\n"
+"I<document-a4.pdf>\n"
+"I<document-a4.ps>\n"
+"I<document-letter.pdf>\n"
+"I<document-letter.ps>\n"
+"I<get-completed-jobs.test>\n"
+"I<get-jobs.test>\n"
+"I<get-notifications.test>\n"
+"I<get-printer-attributes.test>\n"
+"I<get-subscriptions.test>\n"
+"I<gray.jpg>\n"
+"I<ipp-1.1.test>\n"
+"I<ipp-2.0.test>\n"
+"I<ipp-2.1.test>\n"
+"I<ipp-2.2.test>\n"
+"I<ipp-everywhere.test>\n"
+"I<onepage-a4.pdf>\n"
+"I<onepage-a4.ps>\n"
+"I<onepage-letter.pdf>\n"
+"I<onepage-letter.ps>\n"
+"I<print-job.test>\n"
+"I<print-job-deflate.test>\n"
+"I<print-job-gzip.test>\n"
+"I<testfile.jpg>\n"
+"I<testfile.pcl>\n"
+"I<testfile.pdf>\n"
+"I<testfile.ps>\n"
+"I<testfile.txt>\n"
+"I<validate-job.test>\n"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:160
-msgid "Run the B<file>(1)  command whenever a job is sent to the server:"
+#: ipptool.1:233
+msgid ""
+"The B<ipptool> program is unique to CUPS and conforms to the Internet "
+"Printing Protocol up to version 2.2."
+msgstr ""
+
+#. type: Plain text
+#: ipptool.1:235
+msgid "Get a list of completed jobs for \"myprinter\":"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:163
+#: ipptool.1:238
 #, no-wrap
-msgid "    ippserver -c file \"My Cool Printer\"\n"
+msgid "    ipptool ipp://localhost/printers/myprinter get-completed-jobs.test\n"
+msgstr ""
+
+#. type: Plain text
+#: ipptool.1:241
+msgid "Send email notifications to \"user@example.com\" when \"myprinter\" changes:"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:166
-msgid "PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)"
+#: ipptool.1:245
+#, no-wrap
+msgid ""
+"    ipptool -d recipient=mailto:user@example.com \\e\n"
+"        ipp://localhost/printers/myprinter "
+"create-printer-subscription.test\n"
 msgstr ""
 
 #. type: Plain text
-#: ../test/ippserver.man:167
-msgid "Copyright \\[co] 2007-2014 by Apple Inc."
+#: ipptool.1:251
+msgid ""
+"B<ipptoolfile>(5), IANA IPP Registry "
+"(http://www.iana.org/assignments/ipp-registrations), PWG Internet Printing "
+"Protocol Workgroup (http://www.pwg.org/ipp)  RFC 8011 "
+"(http://tools.ietf.org/html/rfc8011),"
 msgstr ""
 
 #. type: TH
-#: ipptoolfile.man:12
+#: ipptoolfile.5:9
 #, no-wrap
 msgid "ipptoolfile"
 msgstr ""
 
 #. type: TH
-#: ipptoolfile.man:12
+#: ipptoolfile.5:9
 #, no-wrap
-msgid "5 August 2019"
+msgid "15 August 2019"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:15
+#: ipptoolfile.5:12
 msgid "ipptoolfile - ipptool file format"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:21
+#: ipptoolfile.5:18
 msgid ""
 "The B<ipptool>(1)  program accepts free-form plain text files that describe "
 "one or more IPP requests.  Comments start with the \"#\" character and "
@@ -9002,7 +9521,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:27
+#: ipptoolfile.5:24
 #, no-wrap
 msgid ""
 "    # This is a comment\n"
@@ -9012,7 +9531,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:30
+#: ipptoolfile.5:27
 #, no-wrap
 msgid ""
 "      # The request to send\n"
@@ -9020,7 +9539,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:37
+#: ipptoolfile.5:34
 #, no-wrap
 msgid ""
 "      GROUP operation-attributes-tag\n"
@@ -9032,7 +9551,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:52
+#: ipptoolfile.5:49
 #, no-wrap
 msgid ""
 "      GROUP job-attributes-tag\n"
@@ -9052,13 +9571,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:54
+#: ipptoolfile.5:51
 #, no-wrap
 msgid "      FILE testfile.pdf\n"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:63
+#: ipptoolfile.5:60
 #, no-wrap
 msgid ""
 "      # The response to expect\n"
@@ -9072,7 +9591,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:66
+#: ipptoolfile.5:63
 #, no-wrap
 msgid ""
 "      # The request to send\n"
@@ -9080,7 +9599,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:73
+#: ipptoolfile.5:70
 #, no-wrap
 msgid ""
 "      GROUP operation-attributes-tag\n"
@@ -9092,7 +9611,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:80
+#: ipptoolfile.5:77
 #, no-wrap
 msgid ""
 "      # The response to expect\n"
@@ -9104,7 +9623,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:85
+#: ipptoolfile.5:82
 #, no-wrap
 msgid ""
 "      # Show the job state until completed...\n"
@@ -9114,91 +9633,91 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:88
+#: ipptoolfile.5:85
 msgid "The following directives can be used outside of a I<test>:"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:88
+#: ipptoolfile.5:85
 #, no-wrap
 msgid "B<{ >I<test >B<}>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:91
+#: ipptoolfile.5:88
 msgid "Defines a test."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:91
+#: ipptoolfile.5:88
 #, no-wrap
 msgid "B<DEFINE >I<variable-name value>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:96
+#: ipptoolfile.5:93
 msgid ""
 "Defines the named variable to the given value. This is equivalent to "
 "specifying I<-d variable-name=value> on the B<ipptool>(8)  command-line."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:96
+#: ipptoolfile.5:93
 #, no-wrap
 msgid "B<DEFINE-DEFAULT >I<variable-name value>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:99
+#: ipptoolfile.5:96
 msgid ""
 "Defines the named variable to the given value if it does not already have a "
 "value."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:99
+#: ipptoolfile.5:96
 #, no-wrap
 msgid "B<FILE-ID \">I<identifier>B<\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:102
+#: ipptoolfile.5:99
 msgid "Specifies an identifier string for the current file."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:102 ipptoolfile.man:212
+#: ipptoolfile.5:99 ipptoolfile.5:209
 #, no-wrap
 msgid "B<IGNORE-ERRORS yes>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:104 ipptoolfile.man:214
+#: ipptoolfile.5:101 ipptoolfile.5:211
 #, no-wrap
 msgid "B<IGNORE-ERRORS no>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:109
+#: ipptoolfile.5:106
 msgid ""
 "Specifies whether, by default, B<ipptool>(8)  will ignore errors and "
 "continue with subsequent tests."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:109
+#: ipptoolfile.5:106
 #, no-wrap
 msgid "B<INCLUDE \">I<filename>B<\">"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:111
+#: ipptoolfile.5:108
 #, no-wrap
 msgid "B<INCLUDE E<lt>>I<filename>B<E<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:116
+#: ipptoolfile.5:113
 msgid ""
 "Includes another test file. The first form includes a file relative to the "
 "current test file, while the second form includes a file from the "
@@ -9206,19 +9725,19 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:116
+#: ipptoolfile.5:113
 #, no-wrap
 msgid "B<INCLUDE-IF-DEFINED >I<name >B<\">I<filename>B<\">"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:118
+#: ipptoolfile.5:115
 #, no-wrap
 msgid "B<INCLUDE-IF-DEFINED >I<name >B<E<lt>>I<filename>B<E<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:123
+#: ipptoolfile.5:120
 msgid ""
 "Includes another test file if the named variable is defined. The first form "
 "includes a file relative to the current test file, while the second form "
@@ -9226,19 +9745,19 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:123
+#: ipptoolfile.5:120
 #, no-wrap
 msgid "B<INCLUDE-IF-NOT-DEFINED >I<name >B<\">I<filename>B<\">"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:125
+#: ipptoolfile.5:122
 #, no-wrap
 msgid "B<INCLUDE-IF-NOT-DEFINED >I<name >B<E<lt>>I<filename>B<E<gt>>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:130
+#: ipptoolfile.5:127
 msgid ""
 "Includes another test file if the named variable is not defined. The first "
 "form includes a file relative to the current test file, while the second "
@@ -9246,49 +9765,49 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:130 ipptoolfile.man:238
+#: ipptoolfile.5:127 ipptoolfile.5:235
 #, no-wrap
 msgid "B<SKIP-IF-DEFINED >I<variable-name>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:132 ipptoolfile.man:240
+#: ipptoolfile.5:129 ipptoolfile.5:237
 #, no-wrap
 msgid "B<SKIP-IF-NOT-DEFINED >I<variable-name>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:135
+#: ipptoolfile.5:132
 msgid ""
 "Specifies that the remainder of the test file should be skipped when the "
 "variable is or is not defined."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:135
+#: ipptoolfile.5:132
 #, no-wrap
 msgid "B<STOP-AFTER-INCLUDE-ERROR no>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:137
+#: ipptoolfile.5:134
 #, no-wrap
 msgid "B<STOP-AFTER-INCLUDE-ERROR yes>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:140
+#: ipptoolfile.5:137
 msgid "Specifies whether tests will be stopped after an error in an included file."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:140 ipptoolfile.man:256
+#: ipptoolfile.5:137 ipptoolfile.5:253
 #, no-wrap
 msgid "B<TRANSFER auto>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:143
+#: ipptoolfile.5:140
 msgid ""
 "Specifies that tests will, by default, use \"Transfer-Encoding: chunked\" "
 "for requests with attached files and \"Content-Length:\" for requests "
@@ -9296,13 +9815,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:143 ipptoolfile.man:259
+#: ipptoolfile.5:140 ipptoolfile.5:256
 #, no-wrap
 msgid "B<TRANSFER chunked>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:148
+#: ipptoolfile.5:145
 msgid ""
 "Specifies that tests will, by default, use the HTTP/1.1 \"Transfer-Encoding: "
 "chunked\" header. This is the default and is equivalent to specifying I<-c> "
@@ -9311,13 +9830,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:148 ipptoolfile.man:262
+#: ipptoolfile.5:145 ipptoolfile.5:259
 #, no-wrap
 msgid "B<TRANSFER length>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:153
+#: ipptoolfile.5:150
 msgid ""
 "Specifies that tests will, by default, use the HTTP/1.0 \"Content-Length:\" "
 "header. This is equivalent to specifying I<-l> on the B<ipptool>(8)  "
@@ -9326,76 +9845,75 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:153 ipptoolfile.man:265
+#: ipptoolfile.5:150 ipptoolfile.5:262
 #, no-wrap
 msgid "B<VERSION 1.0>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:155 ipptoolfile.man:267
+#: ipptoolfile.5:152 ipptoolfile.5:264
 #, no-wrap
 msgid "B<VERSION 1.1>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:157 ipptoolfile.man:269
+#: ipptoolfile.5:154 ipptoolfile.5:266
 #, no-wrap
 msgid "B<VERSION 2.0>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:159 ipptoolfile.man:271
+#: ipptoolfile.5:156 ipptoolfile.5:268
 #, no-wrap
 msgid "B<VERSION 2.1>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:161 ipptoolfile.man:273
+#: ipptoolfile.5:158 ipptoolfile.5:270
 #, no-wrap
 msgid "B<VERSION 2.2>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:164
+#: ipptoolfile.5:161
 msgid "Specifies the default IPP version number to use for the tests that follow."
 msgstr ""
 
 #. type: SS
-#: ipptoolfile.man:164
+#: ipptoolfile.5:161
 #, no-wrap
 msgid "TEST DIRECTIVES"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:166
+#: ipptoolfile.5:163
 msgid "The following directives are understood within a I<test>:"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:166
+#: ipptoolfile.5:163
 #, no-wrap
 msgid "B<ATTR >I<out-of-band-tag attribute-name>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:168
+#: ipptoolfile.5:165
 #, no-wrap
 msgid "B<ATTR >I<tag attribute-name value(s)>"
 msgstr ""
 
-#.  character.
 #. type: Plain text
-#: ipptoolfile.man:174
+#: ipptoolfile.5:171
 msgid ""
 "Adds an attribute to the test request.  Out-of-band tags (admin-define, "
 "delete-attribute, no-value, not-settable, unknown, unsupported) have no "
-"value.  Values for other tags are separated by the comma (\",\") character - "
-"escape commas using the \" Common attributes and values are listed in the "
-"IANA IPP registry - see references below."
+"value.  Values for other tags are delimited by the comma (\",\") character - "
+"escape commas using the \"\\e\" character.  Common attributes and values are "
+"listed in the IANA IPP registry - see references below."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:174
+#: ipptoolfile.5:171
 #, no-wrap
 msgid ""
 "B<ATTR collection >I<attribute-name >B<{ MEMBER >I<tag member-name value(s) "
@@ -9403,7 +9921,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:179
+#: ipptoolfile.5:176
 msgid ""
 "Adds a collection attribute to the test request.  Member attributes follow "
 "the same syntax as regular attributes and can themselves be nested "
@@ -9412,76 +9930,76 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:179
+#: ipptoolfile.5:176
 #, no-wrap
 msgid "B<COMPRESSION deflate>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:181
+#: ipptoolfile.5:178
 #, no-wrap
 msgid "B<COMPRESSION gzip>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:183
+#: ipptoolfile.5:180
 #, no-wrap
 msgid "B<COMPRESSION none>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:186
+#: ipptoolfile.5:183
 msgid ""
 "Uses the specified compression on the document data following the attributes "
 "in a Print-Job or Send-Document request."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:186
+#: ipptoolfile.5:183
 #, no-wrap
 msgid "B<DELAY >I<seconds>[I<,repeat-seconds>]"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:190
+#: ipptoolfile.5:187
 msgid ""
 "Specifies a delay in seconds before this test will be run.  If two values "
 "are specified, the second value is used as the delay between repeated tests."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:190
+#: ipptoolfile.5:187
 #, no-wrap
 msgid "B<DISPLAY >I<attribute-name>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:194
+#: ipptoolfile.5:191
 msgid ""
 "Specifies that value of the named attribute should be output as part of the "
 "test report."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:194
+#: ipptoolfile.5:191
 #, no-wrap
 msgid "B<EXPECT >I<attribute-name >[ I<predicate(s) >]"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:196
+#: ipptoolfile.5:193
 #, no-wrap
 msgid "B<EXPECT ?>I<attribute-name predicate(s)>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:198
+#: ipptoolfile.5:195
 #, no-wrap
 msgid "B<EXPECT !>I<attribute-name>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:201
+#: ipptoolfile.5:198
 msgid ""
 "Specifies that the response must/may/must not include the named "
 "attribute. Additional requirements can be added as predicates - see the "
@@ -9492,117 +10010,117 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:201
+#: ipptoolfile.5:198
 #, no-wrap
 msgid "B<EXPECT-ALL >I<attribute-name >[ I<predicate(s) >]"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:203
+#: ipptoolfile.5:200
 #, no-wrap
 msgid "B<EXPECT-ALL ?>I<attribute-name predicate(s)>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:206
+#: ipptoolfile.5:203
 msgid ""
 "Specifies that the response must/may include the named attribute and that "
 "all occurrences of that attribute must match the given predicates."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:206
+#: ipptoolfile.5:203
 #, no-wrap
 msgid "B<FILE filename>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:209
+#: ipptoolfile.5:206
 msgid ""
 "Specifies a file to include at the end of the request. This is typically "
 "used when sending a test print file."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:209
+#: ipptoolfile.5:206
 #, no-wrap
 msgid "B<GROUP tag>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:212
+#: ipptoolfile.5:209
 msgid "Specifies the group tag for subsequent attributes in the request."
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:219
+#: ipptoolfile.5:216
 msgid ""
 "Specifies whether B<ipptool>(8)  will ignore errors and continue with "
 "subsequent tests."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:219
+#: ipptoolfile.5:216
 #, no-wrap
 msgid "B<NAME \">I<literal string>B<\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:222
+#: ipptoolfile.5:219
 msgid "Specifies the human-readable name of the test."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:222
+#: ipptoolfile.5:219
 #, no-wrap
 msgid "B<OPERATION >I<operation-code>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:225
+#: ipptoolfile.5:222
 msgid "Specifies the operation to be performed."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:225
+#: ipptoolfile.5:222
 #, no-wrap
 msgid "B<PAUSE \">I<message>B<\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:228
+#: ipptoolfile.5:225
 msgid ""
 "Displays the provided message and waits for the user to press a key to "
 "continue."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:228
+#: ipptoolfile.5:225
 #, no-wrap
 msgid "B<REQUEST-ID >I<number>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:230
+#: ipptoolfile.5:227
 #, no-wrap
 msgid "B<REQUEST-ID random>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:233
+#: ipptoolfile.5:230
 msgid ""
 "Specifies the request-id value to use in the request, either an integer or "
 "the word \"random\" to use a randomly generated value (the default)."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:233
+#: ipptoolfile.5:230
 #, no-wrap
 msgid "B<RESOURCE >I<path>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:238
+#: ipptoolfile.5:235
 msgid ""
 "Specifies an alternate resource path that is used for the HTTP POST "
 "request. The default is the resource from the URI provided to the "
@@ -9610,39 +10128,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:243
+#: ipptoolfile.5:240
 msgid ""
 "Specifies that the current test should be skipped when the variable is or is "
 "not defined."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:243
+#: ipptoolfile.5:240
 #, no-wrap
 msgid "B<SKIP-PREVIOUS-ERROR yes>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:245
+#: ipptoolfile.5:242
 #, no-wrap
 msgid "B<SKIP-PREVIOUS-ERROR no>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:250
+#: ipptoolfile.5:247
 msgid ""
 "Specifies whether B<ipptool>(8)  will skip the current test if the previous "
 "test resulted in an error/failure."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:250
+#: ipptoolfile.5:247
 #, no-wrap
 msgid "B<STATUS >I<status-code >[ I<predicate> ]"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:253
+#: ipptoolfile.5:250
 msgid ""
 "Specifies an expected response status-code value. Additional requirements "
 "can be added as predicates - see the \"STATUS PREDICATES\" section for more "
@@ -9650,98 +10168,98 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:253
+#: ipptoolfile.5:250
 #, no-wrap
 msgid "B<TEST-ID \">I<identifier>\""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:256
+#: ipptoolfile.5:253
 msgid "Specifies an identifier string for the current test."
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:259
+#: ipptoolfile.5:256
 msgid ""
 "Specifies that this test will use \"Transfer-Encoding: chunked\" if it has "
 "an attached file or \"Content-Length:\" otherwise."
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:262
+#: ipptoolfile.5:259
 msgid ""
 "Specifies that this test will use the HTTP/1.1 \"Transfer-Encoding: "
 "chunked\" header."
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:265
+#: ipptoolfile.5:262
 msgid "Specifies that this test will use the HTTP/1.0 \"Content-Length:\" header."
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:276
+#: ipptoolfile.5:273
 msgid "Specifies the IPP version number to use for this test."
 msgstr ""
 
 #. type: SS
-#: ipptoolfile.man:276
+#: ipptoolfile.5:273
 #, no-wrap
 msgid "EXPECT PREDICATES"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:278
+#: ipptoolfile.5:275
 msgid ""
 "The following predicates are understood following the B<EXPECT> test "
 "directive:"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:278
+#: ipptoolfile.5:275
 #, no-wrap
 msgid "B<COUNT >I<number>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:281
+#: ipptoolfile.5:278
 msgid "Requires the B<EXPECT> attribute to have the specified number of values."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:281 ipptoolfile.man:390
+#: ipptoolfile.5:278 ipptoolfile.5:387
 #, no-wrap
 msgid "B<DEFINE-MATCH >I<variable-name>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:284
+#: ipptoolfile.5:281
 msgid ""
 "Defines the variable to \"1\" when the B<EXPECT> condition matches. A "
 "side-effect of this predicate is that this B<EXPECT> will never fail a test."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:284 ipptoolfile.man:393
+#: ipptoolfile.5:281 ipptoolfile.5:390
 #, no-wrap
 msgid "B<DEFINE-NO-MATCH >I<variable-name>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:287
+#: ipptoolfile.5:284
 msgid ""
 "Defines the variable to \"1\" when the B<EXPECT> condition does not match. A "
 "side-effect of this predicate is that this B<EXPECT> will never fail a test."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:287
+#: ipptoolfile.5:284
 #, no-wrap
 msgid "B<DEFINE-VALUE >I<variable-name>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:290
+#: ipptoolfile.5:287
 msgid ""
 "Defines the variable to the value of the attribute when the B<EXPECT> "
 "condition matches. A side-effect of this predicate is that this B<EXPECT> "
@@ -9749,190 +10267,190 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:290 ipptoolfile.man:396
+#: ipptoolfile.5:287 ipptoolfile.5:393
 #, no-wrap
 msgid "B<IF-DEFINED >I<variable-name>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:293
+#: ipptoolfile.5:290
 msgid ""
 "Makes the B<EXPECT> conditions apply only if the specified variable is "
 "defined."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:293 ipptoolfile.man:399
+#: ipptoolfile.5:290 ipptoolfile.5:396
 #, no-wrap
 msgid "B<IF-NOT-DEFINED >I<variable-name>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:296
+#: ipptoolfile.5:293
 msgid ""
 "Makes the B<EXPECT> conditions apply only if the specified variable is not "
 "defined."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:296
+#: ipptoolfile.5:293
 #, no-wrap
 msgid "B<IN-GROUP >I<tag>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:299
+#: ipptoolfile.5:296
 msgid "Requires the B<EXPECT> attribute to be in the specified group tag."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:299
+#: ipptoolfile.5:296
 #, no-wrap
 msgid "B<OF-TYPE >I<tag[|tag,...]>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:302
+#: ipptoolfile.5:299
 msgid "Requires the B<EXPECT> attribute to use one of the specified value tag(s)."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:302 ipptoolfile.man:402
+#: ipptoolfile.5:299 ipptoolfile.5:399
 #, no-wrap
 msgid "B<REPEAT-LIMIT >I<number>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:306
+#: ipptoolfile.5:303
 msgid ""
 "Specifies the maximum number of times to repeat if the B<REPEAT-MATCH> or "
 "B<REPEAT-NO-MATCH> predicate is specified. The default value is 1000."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:306 ipptoolfile.man:406
+#: ipptoolfile.5:303 ipptoolfile.5:403
 #, no-wrap
 msgid "B<REPEAT-MATCH>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:308 ipptoolfile.man:408
+#: ipptoolfile.5:305 ipptoolfile.5:405
 #, no-wrap
 msgid "B<REPEAT-NO-MATCH>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:311
+#: ipptoolfile.5:308
 msgid ""
 "Specifies that the current test should be repeated when the B<EXPECT> "
 "condition matches or does not match."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:311
+#: ipptoolfile.5:308
 #, no-wrap
 msgid "B<SAME-COUNT-AS >I<attribute-name>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:314
+#: ipptoolfile.5:311
 msgid ""
 "Requires the B<EXPECT> attribute to have the same number of values as the "
 "specified parallel attribute."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:314
+#: ipptoolfile.5:311
 #, no-wrap
 msgid "B<WITH-ALL-HOSTNAMES \">I<literal string>B<\">"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:316
+#: ipptoolfile.5:313
 #, no-wrap
 msgid "B<WITH-ALL-HOSTNAMES \"/>I<regular expression>B</\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:319
+#: ipptoolfile.5:316
 msgid "Requires that all URI values contain a matching hostname."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:319
+#: ipptoolfile.5:316
 #, no-wrap
 msgid "B<WITH-ALL-RESOURCES \">I<literal string>B<\">"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:321
+#: ipptoolfile.5:318
 #, no-wrap
 msgid "B<WITH-ALL-RESOURCES \"/>I<regular expression>B</\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:324
+#: ipptoolfile.5:321
 msgid ""
 "Requires that all URI values contain a matching resource (including leading "
 "/)."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:324
+#: ipptoolfile.5:321
 #, no-wrap
 msgid "B<WITH-ALL-SCHEMES \">I<literal string>B<\">"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:326
+#: ipptoolfile.5:323
 #, no-wrap
 msgid "B<WITH-ALL-SCHEMES \"/>I<regular expression>B</\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:329
+#: ipptoolfile.5:326
 msgid "Requires that all URI values contain a matching scheme."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:329
+#: ipptoolfile.5:326
 #, no-wrap
 msgid "B<WITH-ALL-VALUES \">I<literal string>B<\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:332
+#: ipptoolfile.5:329
 msgid ""
 "Requires that all values of the B<EXPECT> attribute match the literal "
 "string. Comparisons are case-sensitive."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:332
+#: ipptoolfile.5:329
 #, no-wrap
 msgid "B<WITH-ALL-VALUES E<lt>>I<number>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:334
+#: ipptoolfile.5:331
 #, no-wrap
 msgid "B<WITH-ALL-VALUES =>I<number>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:336
+#: ipptoolfile.5:333
 #, no-wrap
 msgid "B<WITH-ALL-VALUES E<gt>>I<number>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:338
+#: ipptoolfile.5:335
 #, no-wrap
 msgid "B<WITH-ALL-VALUES >I<number>[I<,...,number>]"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:341
+#: ipptoolfile.5:338
 msgid ""
 "Requires that all values of the B<EXPECT> attribute match the number(s) or "
 "numeric comparison. When comparing rangeOfInteger values, the \"E<lt>\" and "
@@ -9940,32 +10458,32 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:341
+#: ipptoolfile.5:338
 #, no-wrap
 msgid "B<WITH-ALL-VALUES \"false\">"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:343
+#: ipptoolfile.5:340
 #, no-wrap
 msgid "B<WITH-ALL-VALUES \"true\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:346
+#: ipptoolfile.5:343
 msgid ""
 "Requires that all values of the B<EXPECT> attribute match the boolean value "
 "given."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:346
+#: ipptoolfile.5:343
 #, no-wrap
 msgid "B<WITH-ALL-VALUES \"/>I<regular expression>B</\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:349
+#: ipptoolfile.5:346
 msgid ""
 "Requires that all values of the B<EXPECT> attribute match the regular "
 "expression, which must conform to the POSIX regular expression "
@@ -9973,97 +10491,97 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:349
+#: ipptoolfile.5:346
 #, no-wrap
 msgid "B<WITH-HOSTNAME \">I<literal string>B<\">"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:351
+#: ipptoolfile.5:348
 #, no-wrap
 msgid "B<WITH-HOSTNAME \"/>I<regular expression>B</\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:354
+#: ipptoolfile.5:351
 msgid "Requires that at least one URI value contains a matching hostname."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:354
+#: ipptoolfile.5:351
 #, no-wrap
 msgid "B<WITH-RESOURCE \">I<literal string>B<\">"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:356
+#: ipptoolfile.5:353
 #, no-wrap
 msgid "B<WITH-RESOURCE \"/>I<regular expression>B</\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:359
+#: ipptoolfile.5:356
 msgid ""
 "Requires that at least one URI value contains a matching resource (including "
 "leading /)."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:359
+#: ipptoolfile.5:356
 #, no-wrap
 msgid "B<WITH-SCHEME \">I<literal string>B<\">"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:361
+#: ipptoolfile.5:358
 #, no-wrap
 msgid "B<WITH-SCHEME \"/>I<regular expression>B</\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:364
+#: ipptoolfile.5:361
 msgid "Requires that at least one URI value contains a matching scheme."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:364
+#: ipptoolfile.5:361
 #, no-wrap
 msgid "B<WITH-VALUE \">I<literal string>B<\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:367
+#: ipptoolfile.5:364
 msgid ""
 "Requires that at least one value of the B<EXPECT> attribute matches the "
 "literal string. Comparisons are case-sensitive."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:367
+#: ipptoolfile.5:364
 #, no-wrap
 msgid "B<WITH-VALUE E<lt>>I<number>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:369
+#: ipptoolfile.5:366
 #, no-wrap
 msgid "B<WITH-VALUE =>I<number>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:371
+#: ipptoolfile.5:368
 #, no-wrap
 msgid "B<WITH-VALUE E<gt>>I<number>"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:373
+#: ipptoolfile.5:370
 #, no-wrap
 msgid "B<WITH-VALUE >I<number>[I<,...,number>]"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:376
+#: ipptoolfile.5:373
 msgid ""
 "Requires that at least one value of the B<EXPECT> attribute matches the "
 "number(s) or numeric comparison. When comparing rangeOfInteger values, the "
@@ -10071,32 +10589,32 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:376
+#: ipptoolfile.5:373
 #, no-wrap
 msgid "B<WITH-VALUE \"false\">"
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:378
+#: ipptoolfile.5:375
 #, no-wrap
 msgid "B<WITH-VALUE \"true\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:381
+#: ipptoolfile.5:378
 msgid ""
 "Requires that at least one value of the B<EXPECT> attribute matches the "
 "boolean value given."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:381
+#: ipptoolfile.5:378
 #, no-wrap
 msgid "B<WITH-VALUE \"/>I<regular expression>B</\">"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:384
+#: ipptoolfile.5:381
 msgid ""
 "Requires that at least one value of the B<EXPECT> attribute matches the "
 "regular expression, which must conform to the POSIX regular expression "
@@ -10104,13 +10622,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:384
+#: ipptoolfile.5:381
 #, no-wrap
 msgid "B<WITH-VALUE-FROM >I<attribute-name>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:388
+#: ipptoolfile.5:385
 msgid ""
 "Requires that the value(s) of the B<EXPECT> attribute matches the value(s) "
 "in the specified attribute.  For example, \"EXPECT job-sheets "
@@ -10119,49 +10637,49 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: ipptoolfile.man:388
+#: ipptoolfile.5:385
 #, no-wrap
 msgid "STATUS PREDICATES"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:390
+#: ipptoolfile.5:387
 msgid ""
 "The following predicates are understood following the B<STATUS> test "
 "directive:"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:393
+#: ipptoolfile.5:390
 msgid ""
 "Defines the variable to \"1\" when the B<STATUS> matches. A side-effect of "
 "this predicate is that this B<STATUS> will never fail a test."
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:396
+#: ipptoolfile.5:393
 msgid ""
 "Defines the variable to \"1\" when the B<STATUS> does not match. A "
 "side-effect of this predicate is that this B<STATUS> will never fail a test."
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:399
+#: ipptoolfile.5:396
 msgid "Makes the B<STATUS> apply only if the specified variable is defined."
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:402
+#: ipptoolfile.5:399
 msgid "Makes the B<STATUS> apply only if the specified variable is not defined."
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:406
+#: ipptoolfile.5:403
 msgid "Specifies the maximum number of times to repeat. The default value is 1000."
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:411
+#: ipptoolfile.5:408
 msgid ""
 "Specifies that the current test should be repeated when the response "
 "status-code matches or does not match the value specified by the STATUS "
@@ -10169,13 +10687,13 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: ipptoolfile.man:411
+#: ipptoolfile.5:408
 #, no-wrap
 msgid "OPERATION CODES"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:414
+#: ipptoolfile.5:411
 msgid ""
 "Operation codes correspond to the hexadecimal numbers (0xHHHH) and names "
 "from RFC 8011 and other IPP extension specifications. Here is a complete "
@@ -10183,7 +10701,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:483
+#: ipptoolfile.5:480
 #, no-wrap
 msgid ""
 "    Activate-Printer\n"
@@ -10256,13 +10774,13 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: ipptoolfile.man:484
+#: ipptoolfile.5:481
 #, no-wrap
 msgid "STATUS CODES"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:487
+#: ipptoolfile.5:484
 msgid ""
 "Status codes correspond to the hexadecimal numbers (0xHHHH) and names from "
 "RFC 8011 and other IPP extension specifications. Here is a complete list of "
@@ -10270,7 +10788,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:546
+#: ipptoolfile.5:543
 #, no-wrap
 msgid ""
 "    client-error-account-authorization-failed\n"
@@ -10333,20 +10851,20 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: ipptoolfile.man:547
+#: ipptoolfile.5:544
 #, no-wrap
 msgid "TAGS"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:549
+#: ipptoolfile.5:546
 msgid ""
 "Value and group tags correspond to the names from RFC 8011 and other IPP "
 "extension specifications. Here are the group tags:"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:558
+#: ipptoolfile.5:555
 #, no-wrap
 msgid ""
 "    document-attributes-tag\n"
@@ -10359,12 +10877,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:561
+#: ipptoolfile.5:558
 msgid "Here are the value tags:"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:588
+#: ipptoolfile.5:585
 #, no-wrap
 msgid ""
 "    admin-define\n"
@@ -10395,13 +10913,13 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: ipptoolfile.man:589
+#: ipptoolfile.5:586
 #, no-wrap
 msgid "VARIABLES"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:593
+#: ipptoolfile.5:590
 msgid ""
 "The B<ipptool>(8)  program maintains a list of variables that can be used in "
 "any literal string or attribute value by specifying "
@@ -10410,1832 +10928,1400 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:593
+#: ipptoolfile.5:590
 #, no-wrap
 msgid "B<$$>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:596
+#: ipptoolfile.5:593
 msgid "Inserts a single \"$\" character."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:596
+#: ipptoolfile.5:593
 #, no-wrap
 msgid "B<$ENV[>I<name>B<]>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:599
+#: ipptoolfile.5:596
 msgid ""
 "Inserts the value of the named environment variable, or an empty string if "
 "the environment variable is not defined."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:599
-#, no-wrap
-msgid "B<$filename>"
-msgstr ""
-
-#. type: Plain text
-#: ipptoolfile.man:604
-msgid "Inserts the filename provided to B<ipptool>(8)  with the I<-f> option."
-msgstr ""
-
-#. type: TP
-#: ipptoolfile.man:604
-#, no-wrap
-msgid "B<$filetype>"
-msgstr ""
-
-#. type: Plain text
-#: ipptoolfile.man:609
-msgid ""
-"Inserts the MIME media type for the filename provided to B<ipptool>(8)  with "
-"the I<-f> option."
-msgstr ""
-
-#. type: TP
-#: ipptoolfile.man:609
-#, no-wrap
-msgid "B<$hostname>"
-msgstr ""
-
-#. type: Plain text
-#: ipptoolfile.man:613
-msgid "Inserts the hostname from the URI provided to B<ipptool>(8)."
-msgstr ""
-
-#. type: TP
-#: ipptoolfile.man:613
-#, no-wrap
-msgid "B<$job-id>"
-msgstr ""
-
-#. type: Plain text
-#: ipptoolfile.man:616
-msgid ""
-"Inserts the last \"job-id\" attribute value returned in a test response or 0 "
-"if no \"job-id\" attribute has been seen."
-msgstr ""
-
-#. type: TP
-#: ipptoolfile.man:616
-#, no-wrap
-msgid "B<$job-uri>"
-msgstr ""
-
-#. type: Plain text
-#: ipptoolfile.man:619
-msgid ""
-"Inserts the last \"job-uri\" attribute value returned in a test response or "
-"an empty string if no \"job-uri\" attribute has been seen."
-msgstr ""
-
-#. type: TP
-#: ipptoolfile.man:619
+#: ipptoolfile.5:596
 #, no-wrap
-msgid "B<$notify-subscription-id>"
+msgid "B<$date-current>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:622
+#: ipptoolfile.5:599
 msgid ""
-"Inserts the last \"notify-subscription-id\" attribute value returned in a "
-"test response or 0 if no \"notify-subscription-id\" attribute has been seen."
-msgstr ""
-
-#. type: TP
-#: ipptoolfile.man:622
-#, no-wrap
-msgid "B<$port>"
-msgstr ""
-
-#. type: Plain text
-#: ipptoolfile.man:626
-msgid "Inserts the port number from the URI provided to B<ipptool>(8)."
-msgstr ""
-
-#. type: TP
-#: ipptoolfile.man:626
-#, no-wrap
-msgid "B<$resource>"
-msgstr ""
-
-#. type: Plain text
-#: ipptoolfile.man:630
-msgid "Inserts the resource path from the URI provided to B<ipptool>(8)."
-msgstr ""
-
-#. type: TP
-#: ipptoolfile.man:630
-#, no-wrap
-msgid "B<$scheme>"
-msgstr ""
-
-#. type: Plain text
-#: ipptoolfile.man:634
-msgid "Inserts the scheme from the URI provided to B<ipptool>(8)."
+"Inserts the current date and time using the ISO-8601 format "
+"(\"yyyy-mm-ddThh:mm:ssZ\")."
 msgstr ""
 
 #. type: TP
-#: ipptoolfile.man:634
+#: ipptoolfile.5:599
 #, no-wrap
-msgid "B<$uri>"
+msgid "B<$date-start>"
 msgstr ""
 
 #. type: Plain text
-#: ipptoolfile.man:638
-msgid "Inserts the URI provided to B<ipptool>(8)."
-msgstr ""
-
-#. type: TP
-#: ipptoolfile.man:638
-#, no-wrap
-msgid "B<$uriuser>"
-msgstr ""
-
-#. type: Plain text
-#: ipptoolfile.man:643
-msgid "Inserts the username from the URI provided to B<ipptool>(8), if any."
-msgstr ""
-
-#. type: TP
-#: ipptoolfile.man:643
-#, no-wrap
-msgid "B<$user>"
-msgstr ""
-
-#. type: Plain text
-#: ipptoolfile.man:646
-msgid "Inserts the current user's login name."
-msgstr ""
-
-#. type: Plain text
-#: ipptoolfile.man:651
-msgid ""
-"B<ipptool>(1), IANA IPP Registry "
-"(http://www.iana.org/assignments/ipp-registrations), PWG Internet Printing "
-"Protocol Workgroup (http://www.pwg.org/ipp), RFC 8011 "
-"(http://tools.ietf.org/html/rfc8011)"
-msgstr ""
-
-#. type: TH
-#: ipptool.man:12
-#, no-wrap
-msgid "ipptool"
-msgstr ""
-
-#. type: TH
-#: ipptool.man:12
-#, no-wrap
-msgid "4 August 2017"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:15
-msgid "ipptool - perform internet printing protocol requests"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:75
-msgid ""
-"B<ipptool> [ B<--help> ] [ B<--stop-after-include-error> ] [ B<--version> ] "
-"[ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] [ B<-I> ] [ B<-L> ] [ B<-P> "
-"I<filename.plist> ] [ B<-S> ] [ B<-T> I<seconds> ] [ B<-V> I<version> ] [ "
-"B<-X> ] [ B<-c> ] [ B<-d> I<name=value> ] [ B<-f> I<filename> ] [ B<-h> ] [ "
-"B<-i> I<seconds> ] [ B<-n> I<repeat-count> ] [ B<-q> ] [ B<-t> ] [ B<-v ]> "
-"I<printer-uri> I<testfile> [ ...  I<testfile> ]"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:88
-msgid ""
-"B<ipptool> sends IPP requests to the specified I<printer-uri> and tests "
-"and/or displays the results.  Each named I<testfile> defines one or more "
-"requests, including the expected response status, attributes, and values.  "
-"Output is either a plain text, formatted text, CSV, or XML report on the "
-"standard output, with a non-zero exit status indicating that one or more "
-"tests have failed.  The I<testfile> format is described in "
-"B<ipptoolfile>(5)."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:91
-msgid "The following options are recognized by B<ipptool:>"
-msgstr ""
-
-#. type: TP
-#: ipptool.man:94
-#, no-wrap
-msgid "B<--stop-after-include-error>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:101
-msgid ""
-"Tells B<ipptool> to stop if an error occurs in an included file. Normally "
-"B<ipptool> will continue with subsequent tests after the INCLUDE directive."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:106
-msgid "Shows the version of B<ipptool> being used."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:111
-msgid "Specifies that B<ipptool> must connect to the printer or server using IPv4."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:116
-msgid "Specifies that B<ipptool> must connect to the printer or server using IPv6."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:116
-#, no-wrap
-msgid "B<-C>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:120
-msgid ""
-"Specifies that requests should be sent using the HTTP/1.1 "
-"\"Transfer-Encoding: chunked\" header, which is required for conformance by "
-"all versions of IPP.  The default is to use \"Transfer-Encoding: chunked\" "
-"for requests with attached files and \"Content-Length:\" for requests "
-"without attached files."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:123
-msgid ""
-"Forces TLS encryption when connecting to the server using the HTTP "
-"\"Upgrade\" header."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:123
-#, no-wrap
-msgid "B<-I>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:128
-msgid "Specifies that B<ipptool> will continue past errors."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:128
-#, no-wrap
-msgid "B<-L>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:132
-msgid ""
-"Specifies that requests should be sent using the HTTP/1.0 "
-"\"Content-Length:\" header, which is required for conformance by all "
-"versions of IPP.  The default is to use \"Transfer-Encoding: chunked\" for "
-"requests with attached files and \"Content-Length:\" for requests without "
-"attached files."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:132
-#, no-wrap
-msgid "B<-P>I<\\ filename.plist>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:136
-msgid ""
-"Specifies that the test results should be written to the named XML (Apple "
-"plist) file in addition to the regular test report (B<-t>).  This option is "
-"incompatible with the B<-i> (interval) and B<-n> (repeat-count) options."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:136
-#, no-wrap
-msgid "B<-S>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:139
-msgid "Forces (dedicated) TLS encryption when connecting to the server."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:139
-#, no-wrap
-msgid "B<-T>I<\\ seconds>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:142
-msgid "Specifies a timeout for IPP requests in seconds."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:142
-#, no-wrap
-msgid "B<-V>I<\\ version>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:145
-msgid ""
-"Specifies the default IPP version to use: 1.0, 1.1, 2.0, 2.1, or 2.2. If not "
-"specified, version 1.1 is used."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:145
-#, no-wrap
-msgid "B<-X>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:149
-msgid ""
-"Specifies that XML (Apple plist) output is desired instead of the plain text "
-"report.  This option is incompatible with the B<-i> (interval) and B<-n> "
-"(repeat-count) options."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:152
-msgid ""
-"Specifies that CSV (comma-separated values) output is desired instead of the "
-"plain text output."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:152
-#, no-wrap
-msgid "B<-d>I<\\ name=value>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:155
-msgid "Defines the named variable."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:155
-#, no-wrap
-msgid "B<-f>I<\\ filename>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:158
-msgid "Defines the default request filename for tests."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:161
-msgid "Validate HTTP response headers."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:161
-#, no-wrap
-msgid "B<-i>I<\\ seconds>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:167
-msgid ""
-"Specifies that the (last)  I<testfile> should be repeated at the specified "
-"interval.  This option is incompatible with the B<-X> (XML plist output) "
-"option."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:170
-msgid "Specifies that plain text output is desired."
-msgstr ""
-
-#. type: TP
-#: ipptool.man:170
-#, no-wrap
-msgid "B<-n>I<\\ repeat-count>"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:176
-msgid ""
-"Specifies that the (last)  I<testfile> should be repeated the specified "
-"number of times.  This option is incompatible with the I<-X> (XML plist "
-"output) option."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:179
-msgid "Be quiet and produce no output."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:182
-msgid ""
-"Specifies that CUPS test report output is desired instead of the plain text "
-"output."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:186
-msgid ""
-"Specifies that all request and response attributes should be output in CUPS "
-"test mode (B<-t>).  This is the default for XML output."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:190
-msgid ""
-"The B<ipptool> program returns 0 if all tests were successful and 1 "
-"otherwise."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:192
-msgid "The following standard files are available:"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:223
-#, no-wrap
-msgid ""
-"I<color.jpg>\n"
-"I<create-printer-subscription.test>\n"
-"I<document-a4.pdf>\n"
-"I<document-a4.ps>\n"
-"I<document-letter.pdf>\n"
-"I<document-letter.ps>\n"
-"I<get-completed-jobs.test>\n"
-"I<get-jobs.test>\n"
-"I<get-notifications.test>\n"
-"I<get-printer-attributes.test>\n"
-"I<get-subscriptions.test>\n"
-"I<gray.jpg>\n"
-"I<ipp-1.1.test>\n"
-"I<ipp-2.0.test>\n"
-"I<ipp-2.1.test>\n"
-"I<ipp-2.2.test>\n"
-"I<ipp-everywhere.test>\n"
-"I<onepage-a4.pdf>\n"
-"I<onepage-a4.ps>\n"
-"I<onepage-letter.pdf>\n"
-"I<onepage-letter.ps>\n"
-"I<print-job.test>\n"
-"I<print-job-deflate.test>\n"
-"I<print-job-gzip.test>\n"
-"I<testfile.jpg>\n"
-"I<testfile.pcl>\n"
-"I<testfile.pdf>\n"
-"I<testfile.ps>\n"
-"I<testfile.txt>\n"
-"I<validate-job.test>\n"
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:228
-msgid ""
-"The B<ipptool> program is unique to CUPS and conforms to the Internet "
-"Printing Protocol up to version 2.2."
-msgstr ""
-
-#. type: Plain text
-#: ipptool.man:230
-msgid "Get a list of completed jobs for \"myprinter\":"
+#: ipptoolfile.5:602
+msgid ""
+"Inserts the starting date and time using the ISO-8601 format "
+"(\"yyyy-mm-ddThh:mm:ssZ\")."
 msgstr ""
 
-#. type: Plain text
-#: ipptool.man:233
+#. type: TP
+#: ipptoolfile.5:602
 #, no-wrap
-msgid "    ipptool ipp://localhost/printers/myprinter get-completed-jobs.test\n"
+msgid "B<$filename>"
 msgstr ""
 
 #. type: Plain text
-#: ipptool.man:236
-msgid "Send email notifications to \"user@example.com\" when \"myprinter\" changes:"
+#: ipptoolfile.5:607
+msgid "Inserts the filename provided to B<ipptool>(8)  with the I<-f> option."
 msgstr ""
 
-#. type: Plain text
-#: ipptool.man:240
+#. type: TP
+#: ipptoolfile.5:607
 #, no-wrap
-msgid ""
-"    ipptool -d recipient=mailto:user@example.com \\e\n"
-"        ipp://localhost/printers/myprinter "
-"create-printer-subscription.test\n"
+msgid "B<$filetype>"
 msgstr ""
 
 #. type: Plain text
-#: ipptool.man:246
+#: ipptoolfile.5:612
 msgid ""
-"B<ipptoolfile>(5), IANA IPP Registry "
-"(http://www.iana.org/assignments/ipp-registrations), PWG Internet Printing "
-"Protocol Workgroup (http://www.pwg.org/ipp)  RFC 8011 "
-"(http://tools.ietf.org/html/rfc8011),"
+"Inserts the MIME media type for the filename provided to B<ipptool>(8)  with "
+"the I<-f> option."
 msgstr ""
 
-#. type: TH
-#: lpadmin.man:13
+#. type: TP
+#: ipptoolfile.5:612
 #, no-wrap
-msgid "lpadmin"
+msgid "B<$hostname>"
 msgstr ""
 
-#. type: TH
-#: lpadmin.man:13
-#, no-wrap
-msgid "19 August 2018"
+#. type: Plain text
+#: ipptoolfile.5:616
+msgid "Inserts the hostname from the URI provided to B<ipptool>(8)."
 msgstr ""
 
-#. type: Plain text
-#: lpadmin.man:16
-msgid "lpadmin - configure cups printers and classes"
+#. type: TP
+#: ipptoolfile.5:616
+#, no-wrap
+msgid "B<$job-id>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:28
+#: ipptoolfile.5:619
 msgid ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
-"B<-d> I<destination>"
+"Inserts the last \"job-id\" attribute value returned in a test response or 0 "
+"if no \"job-id\" attribute has been seen."
 msgstr ""
 
-#. type: Plain text
-#: lpadmin.man:45
-msgid ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
-"B<-p> I<destination> [ B<-R> I<name-default> ] I<option(s)>"
+#. type: TP
+#: ipptoolfile.5:619
+#, no-wrap
+msgid "B<$job-uri>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:57
+#: ipptoolfile.5:622
 msgid ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
-"B<-x> I<destination>"
+"Inserts the last \"job-uri\" attribute value returned in a test response or "
+"an empty string if no \"job-uri\" attribute has been seen."
 msgstr ""
 
-#. type: Plain text
-#: lpadmin.man:60
-msgid ""
-"B<lpadmin> configures printer and class queues provided by CUPS.  It can "
-"also be used to set the server default printer or class."
+#. type: TP
+#: ipptoolfile.5:622
+#, no-wrap
+msgid "B<$notify-subscription-id>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:62
+#: ipptoolfile.5:625
 msgid ""
-"When specified before the I<-d>, I<-p>, or I<-x> options, the I<-E> option "
-"forces encryption when connecting to the server."
+"Inserts the last \"notify-subscription-id\" attribute value returned in a "
+"test response or 0 if no \"notify-subscription-id\" attribute has been seen."
 msgstr ""
 
-#. type: Plain text
-#: lpadmin.man:71
-msgid ""
-"The first form of the command (I<-d>) sets the default printer or class to "
-"I<destination>.  Subsequent print jobs submitted via the B<lp>(1)  or "
-"B<lpr>(1)  commands will use this destination unless the user specifies "
-"otherwise with the B<lpoptions>(1)  command."
+#. type: TP
+#: ipptoolfile.5:625
+#, no-wrap
+msgid "B<$port>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:73
-msgid ""
-"The second form of the command (I<-p>) configures the named printer or "
-"class.  The additional options are described below."
+#: ipptoolfile.5:629
+msgid "Inserts the port number from the URI provided to B<ipptool>(8)."
+msgstr ""
+
+#. type: TP
+#: ipptoolfile.5:629
+#, no-wrap
+msgid "B<$resource>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:76
-msgid ""
-"The third form of the command (I<-x>) deletes the printer or class "
-"I<destination>.  Any jobs that are pending for the destination will be "
-"removed and any job that is currently printed will be aborted."
+#: ipptoolfile.5:633
+msgid "Inserts the resource path from the URI provided to B<ipptool>(8)."
+msgstr ""
+
+#. type: TP
+#: ipptoolfile.5:633
+#, no-wrap
+msgid "B<$scheme>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:78
-msgid "The following options are recognized when configuring a printer queue:"
+#: ipptoolfile.5:637
+msgid "Inserts the scheme from the URI provided to B<ipptool>(8)."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:78
+#: ipptoolfile.5:637
 #, no-wrap
-msgid "B<-c >I<class>"
+msgid "B<$uri>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:82
-msgid ""
-"Adds the named I<printer> to I<class>.  If I<class> does not exist it is "
-"created automatically."
+#: ipptoolfile.5:641
+msgid "Inserts the URI provided to B<ipptool>(8)."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:82
+#: ipptoolfile.5:641
 #, no-wrap
-msgid "B<-i >I<ppd-file>"
+msgid "B<$uriuser>"
+msgstr ""
+
+#. type: Plain text
+#: ipptoolfile.5:646
+msgid "Inserts the username from the URI provided to B<ipptool>(8), if any."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:84
+#: ipptoolfile.5:646
 #, no-wrap
-msgid "B<-P >I<ppd-file>"
+msgid "B<$user>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:87
-msgid ""
-"Specifies a PostScript Printer Description (PPD) file to use with the "
-"printer."
+#: ipptoolfile.5:649
+msgid "Inserts the current user's login name."
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:95
+#: ipptoolfile.5:654
 msgid ""
-"Sets a standard PPD file for the printer from the I<model> directory or "
-"using one of the driver interfaces.  Use the I<-m> option with the "
-"B<lpinfo>(8)  command to get a list of supported models.  The model \"raw\" "
-"clears any existing PPD file and the model \"everywhere\" queries the "
-"printer referred to by the specified IPP I<device-uri>.  Note: The \"raw\" "
-"model is deprecated and will not be supported in a future version of CUPS."
+"B<ipptool>(1), IANA IPP Registry "
+"(http://www.iana.org/assignments/ipp-registrations), PWG Internet Printing "
+"Protocol Workgroup (http://www.pwg.org/ipp), RFC 8011 "
+"(http://tools.ietf.org/html/rfc8011)"
 msgstr ""
 
-#. type: TP
-#: lpadmin.man:95
+#. type: TH
+#: lp.1:10
 #, no-wrap
-msgid "B<-o cupsIPPSupplies=true>"
+msgid "lp"
 msgstr ""
 
-#. type: TP
-#: lpadmin.man:97
-#, no-wrap
-msgid "B<-o cupsIPPSupplies=false>"
+#. type: Plain text
+#: lp.1:13
+msgid "lp - print files"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:100
-msgid "Specifies whether IPP supply level values should be reported."
+#: lp.1:52
+msgid ""
+"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-d "
+">I<destination>[B</>I<instance>] ] [ B<-h >I<hostname>[B<:>I<port>] ] [ "
+"B<-m> ] [ B<-n> I<num-copies> ] [ B<-o >I<option>[B<=>I<value>] ] [ B<-q> "
+"I<priority> ] [ B<-s> ] [ B<-t> I<title> ] [ B<-H> I<handling> ] [ B<-P> "
+"I<page-list> ] [ B<--> ] [ I<file(s)> ]"
 msgstr ""
 
-#. type: TP
-#: lpadmin.man:100
-#, no-wrap
-msgid "B<-o cupsSNMPSupplies=true>"
+#. type: Plain text
+#: lp.1:84
+msgid ""
+"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h "
+">I<hostname>[B<:>I<port>] ] [ B<-i> I<job-id> ] [ B<-n> I<num-copies> ] [ "
+"B<-o >I<option>[B<=>I<value>] ] [ B<-q> I<priority> ] [ B<-t> I<title> ] [ "
+"B<-H> I<handling> ] [ B<-P> I<page-list> ]"
 msgstr ""
 
-#. type: TP
-#: lpadmin.man:102
+#. type: Plain text
+#: lp.1:87
+msgid ""
+"B<lp> submits files for printing or alters a pending job.  Use a filename of "
+"\"-\" to force printing from the standard input."
+msgstr ""
+
+#. type: SS
+#: lp.1:87 lpr.1:57
 #, no-wrap
-msgid "B<-o cupsSNMPSupplies=false>"
+msgid "THE DEFAULT DESTINATION"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:105
-msgid "Specifies whether SNMP supply level (RFC 3805) values should be reported."
+#: lp.1:94 lpr.1:64
+msgid ""
+"CUPS provides many ways to set the default destination. The B<LPDEST> and "
+"B<PRINTER> environment variables are consulted first.  If neither are set, "
+"the current default set using the B<lpoptions>(1)  command is used, followed "
+"by the default set using the B<lpadmin>(8)  command."
+msgstr ""
+
+#. type: Plain text
+#: lp.1:96
+msgid "The following options are recognized by I<lp>:"
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:105
+#: lp.1:96
 #, no-wrap
-msgid "B<-o job-k-limit=>I<value>"
+msgid "B<-->"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:109
+#: lp.1:99
 msgid ""
-"Sets the kilobyte limit for per-user quotas.  The value is an integer number "
-"of kilobytes; one kilobyte is 1024 bytes."
+"Marks the end of options; use this to print a file whose name begins with a "
+"dash (-)."
+msgstr ""
+
+#. type: Plain text
+#: lp.1:109
+msgid ""
+"This option is provided for backwards-compatibility only. On systems that "
+"support it, this option forces the print file to be copied to the spool "
+"directory before printing.  In CUPS, print files are always sent to the "
+"scheduler via IPP which has the same effect."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:109
+#: lp.1:109
 #, no-wrap
-msgid "B<-o job-page-limit=>I<value>"
+msgid "B<-d >I<destination>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:113
-msgid ""
-"Sets the page limit for per-user quotas.  The value is the integer number of "
-"pages that can be printed; double-sided pages are counted as two pages."
+#: lp.1:112 lpr.1:82
+msgid "Prints files to the named printer."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:113
+#: lp.1:115
 #, no-wrap
-msgid "B<-o job-quota-period=>I<value>"
+msgid "B<-i >I<job-id>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:117
-msgid ""
-"Sets the accounting period for per-user quotas.  The value is an integer "
-"number of seconds; 86,400 seconds are in one day."
+#: lp.1:118
+msgid "Specifies an existing job to modify."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:117
+#: lp.1:118 lpr.1:95 ppdc.1:70
 #, no-wrap
-msgid "B<-o job-sheets-default=>I<banner>"
+msgid "B<-m>"
 msgstr ""
 
-#. type: TP
-#: lpadmin.man:119
-#, no-wrap
-msgid "B<-o job-sheets-default=>I<banner>B<,>I<banner>"
+#. type: Plain text
+#: lp.1:121
+msgid "Sends an email when the job is completed."
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:122
-msgid "Sets the default banner page(s) to use for print jobs."
+#: lp.1:124 lpr.1:88
+msgid "Sets the number of copies to print."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:122
+#: lp.1:124
 #, no-wrap
-msgid "B<-o >I<name>B<=>I<value>"
+msgid "B<-o \">I<name>B<=>I<value >[ ... I<name>B<=>I<value >]B<\">"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:128
-msgid ""
-"Sets a PPD option for the printer.  PPD options can be listed using the "
-"I<-l> option with the B<lpoptions>(1)  command."
+#: lp.1:128
+msgid "Sets one or more job options.  See \"COMMON JOB OPTIONS\" below."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:128
+#: lp.1:128
 #, no-wrap
-msgid "B<-o >I<name>B<-default=>I<value>"
+msgid "B<-q >I<priority>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:132
+#: lp.1:132
 msgid ""
-"Sets a default server-side option for the destination.  Any print-time "
-"option can be defaulted, e.g., \"-o number-up-default=2\" to set the default "
-"\"number-up\" option value to 2."
+"Sets the job priority from 1 (lowest) to 100 (highest).  The default "
+"priority is 50."
+msgstr ""
+
+#. type: Plain text
+#: lp.1:135
+msgid "Do not report the resulting job IDs (silent mode.)"
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:132
+#: lp.1:135
 #, no-wrap
-msgid "B<-o port-monitor=>I<name>"
+msgid "B<-t \">I<name>B<\">"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:137
-msgid ""
-"Sets the binary communications program to use when printing, \"none\", "
-"\"bcp\", or \"tbcp\".  The default program is \"none\".  The specified port "
-"monitor must be listed in the printer's PPD file."
+#: lp.1:138
+msgid "Sets the job name."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:137
+#: lp.1:138
 #, no-wrap
-msgid "B<-o printer-error-policy=>I<name>"
+msgid "B<-H >I<hh:mm>"
 msgstr ""
 
-#. type: Plain text
-#: lpadmin.man:143
-msgid ""
-"Sets the error policy to be used when the printer backend is unable to send "
-"the job to the printer.  The name must be one of \"abort-job\", "
-"\"retry-job\", \"retry-current-job\", or \"stop-printer\".  The default "
-"error policy is \"stop-printer\" for printers and \"retry-current-job\" for "
-"classes."
+#. type: TP
+#: lp.1:140
+#, no-wrap
+msgid "B<-H hold>"
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:143
+#: lp.1:142
 #, no-wrap
-msgid "B<-o printer-is-shared=true>"
+msgid "B<-H immediate>"
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:145
+#: lp.1:144
 #, no-wrap
-msgid "B<-o printer-is-shared=false>"
+msgid "B<-H restart>"
+msgstr ""
+
+#. type: TP
+#: lp.1:146
+#, no-wrap
+msgid "B<-H resume>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:150
+#: lp.1:152
 msgid ""
-"Sets the destination to shared/published or unshared/unpublished.  "
-"Shared/published destinations are publicly announced by the server on the "
-"LAN based on the browsing configuration in I<cupsd.conf>, while "
-"unshared/unpublished destinations are not announced.  The default value is "
-"\"true\"."
+"Specifies when the job should be printed.  A value of I<immediate> will "
+"print the file immediately, a value of I<hold> will hold the job "
+"indefinitely, and a UTC time value (HH:MM) will hold the job until the "
+"specified UTC (not local) time.  Use a value of I<resume> with the I<-i> "
+"option to resume a held job.  Use a value of I<restart> with the I<-i> "
+"option to restart a completed job."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:150
+#: lp.1:152
 #, no-wrap
-msgid "B<-o printer-op-policy=>I<name>"
+msgid "B<-P >I<page-list>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:155
+#: lp.1:157
 msgid ""
-"Sets the IPP operation policy associated with the destination.  The name "
-"must be defined in the I<cupsd.conf> in a Policy section.  The default "
-"operation policy is \"default\"."
+"Specifies which pages to print in the document.  The list can contain a list "
+"of numbers and ranges (#-#) separated by commas, e.g., \"1,3-5,16\".  The "
+"page numbers refer to the output pages and not the document's original pages "
+"- options like \"number-up\" can affect the numbering of the pages."
 msgstr ""
 
-#. type: TP
-#: lpadmin.man:155
+#. type: SS
+#: lp.1:157 lpr.1:112
 #, no-wrap
-msgid "B<-R >I<name>B<-default>"
+msgid "COMMON JOB OPTIONS"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:158
-msgid "Deletes the named option from I<printer>."
+#: lp.1:161 lpr.1:116
+msgid ""
+"Aside from the printer-specific options reported by the B<lpoptions>(1)  "
+"command, the following generic options are available:"
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:158
+#: lp.1:161 lpr.1:116
 #, no-wrap
-msgid "B<-r >I<class>"
+msgid "B<-o job-sheets=>I<name>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:162
+#: lp.1:165 lpr.1:120
 msgid ""
-"Removes the named I<printer> from I<class>.  If the resulting class becomes "
-"empty it is removed."
+"Prints a cover page (banner) with the document.  The \"name\" can be "
+"\"classified\", \"confidential\", \"secret\", \"standard\", \"topsecret\", "
+"or \"unclassified\"."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:162
+#: lp.1:165 lpr.1:120
 #, no-wrap
-msgid "B<-u allow:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
+msgid "B<-o media=>I<size>"
 msgstr ""
 
-#. type: TP
-#: lpadmin.man:164
-#, no-wrap
-msgid "B<-u deny:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
+#. type: Plain text
+#: lp.1:168 lpr.1:123
+msgid ""
+"Sets the page size to I<size>. Most printers support at least the size names "
+"\"a4\", \"letter\", and \"legal\"."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:166
+#: lp.1:168 lpr.1:123
 #, no-wrap
-msgid "B<-u allow:all>"
+msgid "B<-o number-up=>{I<2|4|6|9|16>}"
+msgstr ""
+
+#. type: Plain text
+#: lp.1:171 lpr.1:126
+msgid "Prints 2, 4, 6, 9, or 16 document (input) pages on each output page."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:168
+#: lp.1:171 lpr.1:126
 #, no-wrap
-msgid "B<-u deny:none>"
+msgid "B<-o orientation-requested=4>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:174
-msgid ""
-"Sets user-level access control on a destination.  Names starting with \"@\" "
-"are interpreted as UNIX groups.  The latter two forms turn user-level access "
-"control off.  Note: The user 'root' is not granted special access - using "
-"\"-u allow:foo,bar\" will allow users 'foo' and 'bar' to access the printer "
-"but NOT 'root'."
+#: lp.1:174 lpr.1:129
+msgid "Prints the job in landscape (rotated 90 degrees counter-clockwise)."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:174
+#: lp.1:174 lpr.1:129
 #, no-wrap
-msgid "B<-v \">I<device-uri>B<\">"
+msgid "B<-o orientation-requested=5>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:180
-msgid ""
-"Sets the I<device-uri> attribute of the printer queue.  Use the I<-v> option "
-"with the B<lpinfo>(8)  command to get a list of supported device URIs and "
-"schemes."
+#: lp.1:177 lpr.1:132
+msgid "Prints the job in landscape (rotated 90 degrees clockwise)."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:180
+#: lp.1:177 lpr.1:132
 #, no-wrap
-msgid "B<-D \">I<info>B<\">"
-msgstr ""
-
-#. type: Plain text
-#: lpadmin.man:183
-msgid "Provides a textual description of the destination."
+msgid "B<-o orientation-requested=6>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:191
-msgid ""
-"When specified before the B<-d>, B<-p>, or B<-x> options, forces the use of "
-"TLS encryption on the connection to the scheduler.  Otherwise, enables the "
-"destination and accepts jobs; this is the same as running the "
-"B<cupsaccept>(8)  and B<cupsenable>(8)  programs on the destination."
+#: lp.1:180 lpr.1:135
+msgid "Prints the job in reverse portrait (rotated 180 degrees)."
 msgstr ""
 
 #. type: TP
-#: lpadmin.man:191
+#: lp.1:180 lpr.1:135
 #, no-wrap
-msgid "B<-L \">I<location>B<\">"
+msgid "B<-o print-quality=3>"
 msgstr ""
 
-#. type: Plain text
-#: lpadmin.man:194
-msgid "Provides a textual location of the destination."
+#. type: TP
+#: lp.1:182 lpr.1:137
+#, no-wrap
+msgid "B<-o print-quality=4>"
 msgstr ""
 
-#. type: Plain text
-#: lpadmin.man:199
-msgid ""
-"Unlike the System V printing system, CUPS allows printer names to contain "
-"any printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer "
-"and class names are I<not> case-sensitive.  Finally, the CUPS version of "
-"B<lpadmin> may ask the user for an access password depending on the printing "
-"system configuration.  This differs from the System V version which requires "
-"the root user to execute this command."
+#. type: TP
+#: lp.1:184 lpr.1:139
+#, no-wrap
+msgid "B<-o print-quality=5>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:201
-msgid ""
-"The CUPS version of B<lpadmin> does not support all of the System V or "
-"Solaris printing system configuration options."
+#: lp.1:187 lpr.1:142
+msgid "Specifies the output quality - draft (3), normal (4), or best (5)."
 msgstr ""
 
-#. type: Plain text
-#: lpadmin.man:203
-msgid "The double meaning of the B<-E> option is an unfortunate historical oddity."
+#. type: TP
+#: lp.1:187 lpr.1:142
+#, no-wrap
+msgid "B<-o sides=one-sided>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:205
-msgid "Create an IPP Everywhere print queue:"
+#: lp.1:190 lpr.1:145
+msgid "Prints on one side of the paper."
 msgstr ""
 
-#. type: Plain text
-#: lpadmin.man:208
+#. type: TP
+#: lp.1:190 lpr.1:145
 #, no-wrap
-msgid ""
-"    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m "
-"everywhere\n"
+msgid "B<-o sides=two-sided-long-edge>"
 msgstr ""
 
 #. type: Plain text
-#: lpadmin.man:216
-msgid ""
-"B<cupsaccept>(8), B<cupsenable>(8), B<lpinfo>(8), B<lpoptions>(1), CUPS "
-"Online Help (http://localhost:631/help)"
+#: lp.1:193 lpr.1:148
+msgid "Prints on both sides of the paper for portrait output."
 msgstr ""
 
-#. type: TH
-#: lpc.man:13
+#. type: TP
+#: lp.1:193 lpr.1:148
 #, no-wrap
-msgid "lpc"
-msgstr ""
-
-#. type: Plain text
-#: lpc.man:16
-msgid "lpc - line printer control program"
+msgid "B<-o sides=two-sided-short-edge>"
 msgstr ""
 
 #. type: Plain text
-#: lpc.man:23
-msgid "B<lpc> [ I<command> [ I<parameter(s)> ] ]"
+#: lp.1:196 lpr.1:151
+msgid "Prints on both sides of the paper for landscape output."
 msgstr ""
 
 #. type: Plain text
-#: lpc.man:25
+#: lp.1:201
 msgid ""
-"B<lpc> provides limited control over printer and class queues provided by "
-"CUPS. It can also be used to query the state of queues."
+"The I<-q> option accepts a different range of values than the Solaris lp "
+"command, matching the IPP job priority values (1-100, 100 is highest "
+"priority) instead of the Solaris values (0-39, 0 is highest priority)."
 msgstr ""
 
 #. type: Plain text
-#: lpc.man:27
-msgid ""
-"If no command is specified on the command-line, B<lpc> displays a prompt and "
-"accepts commands from the standard input."
+#: lp.1:203 lpr.1:155
+msgid "Print two copies of a document to the default printer:"
 msgstr ""
 
-#. type: SS
-#: lpc.man:27
+#. type: Plain text
+#: lp.1:206
 #, no-wrap
-msgid "COMMANDS"
+msgid "    lp -n 2 filename\n"
 msgstr ""
 
 #. type: Plain text
-#: lpc.man:29
-msgid ""
-"The B<lpc> program accepts a subset of commands accepted by the Berkeley "
-"B<lpc> program of the same name:"
+#: lp.1:209 lpr.1:161
+msgid "Print a double-sided legal document to a printer called \"foo\":"
 msgstr ""
 
-#. type: TP
-#: lpc.man:29
+#. type: Plain text
+#: lp.1:212
 #, no-wrap
-msgid "B<exit>"
+msgid "    lp -d foo -o media=legal -o sides=two-sided-long-edge filename\n"
 msgstr ""
 
 #. type: Plain text
-#: lpc.man:32 lpc.man:40
-msgid "Exits the command interpreter."
-msgstr ""
-
-#. type: TP
-#: lpc.man:32
-#, no-wrap
-msgid "B<help >[I<command>]"
+#: lp.1:215
+msgid "Print a presentation document 2-up to a printer called \"bar\":"
 msgstr ""
 
-#. type: TP
-#: lpc.man:34
+#. type: Plain text
+#: lp.1:218
 #, no-wrap
-msgid "B<? >[I<command>]"
+msgid "    lp -d bar -o number-up=2 filename\n"
 msgstr ""
 
 #. type: Plain text
-#: lpc.man:37
-msgid "Displays a short help message."
-msgstr ""
-
-#. type: TP
-#: lpc.man:37
-#, no-wrap
-msgid "B<quit>"
+#: lp.1:228
+msgid ""
+"B<cancel>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), B<lpr>(1), "
+"B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
-#. type: TP
-#: lpc.man:40
+#. type: TH
+#: lpadmin.8:10
 #, no-wrap
-msgid "B<status >[I<queue>]"
+msgid "lpadmin"
 msgstr ""
 
 #. type: Plain text
-#: lpc.man:43
-msgid "Displays the status of one or more printer or class queues."
+#: lpadmin.8:13
+msgid "lpadmin - configure cups printers and classes"
 msgstr ""
 
 #. type: Plain text
-#: lpc.man:48
+#: lpadmin.8:25
 msgid ""
-"Since B<lpc> is geared towards the Berkeley printing system, it is "
-"impossible to use B<lpc> to configure printer or class queues provided by "
-"CUPS.  To configure printer or class queues you must use the B<lpadmin>(8)  "
-"command or another CUPS-compatible client with that functionality."
+"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
+"B<-d> I<destination>"
 msgstr ""
 
 #. type: Plain text
-#: lpc.man:58
+#: lpadmin.8:42
 msgid ""
-"B<cancel>(1), B<cupsaccept>(8), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), "
-"B<lpr>(1), B<lprm>(1), B<lpstat>(1), CUPS Online Help "
-"(http://localhost:631/help)"
-msgstr ""
-
-#. type: TH
-#: lpinfo.man:13
-#, no-wrap
-msgid "lpinfo"
-msgstr ""
-
-#. type: TH
-#: lpinfo.man:13 lpq.man:13 mailto.conf.man:13 mime.types.man:13 notifier.man:13 ppdc.man:13 ppdhtml.man:13 ppdi.man:13 ppdmerge.man:13 ppdpo.man:13
-#, no-wrap
-msgid "12 June 2014"
+"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
+"B<-p> I<destination> [ B<-R> I<name-default> ] I<option(s)>"
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:16
-msgid "lpinfo - show available devices or drivers"
+#: lpadmin.8:54
+msgid ""
+"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
+"B<-x> I<destination>"
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:44
+#: lpadmin.8:57
 msgid ""
-"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ "
-"B<--device-id> I<device-id-string> ] [ B<--exclude-schemes> I<scheme-list> ] "
-"[ B<--include-schemes> I<scheme-list> ] [ B<--language> I<locale> ] [ "
-"B<--make-and-model> I<name> ] [ B<--product> I<name> ] B<-m>"
+"B<lpadmin> configures printer and class queues provided by CUPS.  It can "
+"also be used to set the server default printer or class."
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:63
+#: lpadmin.8:59
 msgid ""
-"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ "
-"B<--exclude-schemes> I<scheme-list> ] [ B<--include-schemes> I<scheme-list> "
-"] [ B<--timeout> I<seconds> ] B<-v>"
+"When specified before the I<-d>, I<-p>, or I<-x> options, the I<-E> option "
+"forces encryption when connecting to the server."
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:66
+#: lpadmin.8:68
 msgid ""
-"B<lpinfo> lists the available devices or drivers known to the CUPS server.  "
-"The first form (I<-m>) lists the available drivers, while the second form "
-"(I<-v>) lists the available devices."
+"The first form of the command (I<-d>) sets the default printer or class to "
+"I<destination>.  Subsequent print jobs submitted via the B<lp>(1)  or "
+"B<lpr>(1)  commands will use this destination unless the user specifies "
+"otherwise with the B<lpoptions>(1)  command."
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:68
-msgid "B<lpinfo> accepts the following options:"
+#: lpadmin.8:70
+msgid ""
+"The second form of the command (I<-p>) configures the named printer or "
+"class.  The additional options are described below."
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:74
-msgid "Selects an alternate server."
+#: lpadmin.8:73
+msgid ""
+"The third form of the command (I<-x>) deletes the printer or class "
+"I<destination>.  Any jobs that are pending for the destination will be "
+"removed and any job that is currently printed will be aborted."
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:77
-msgid "Shows a \"long\" listing of devices or drivers."
+#: lpadmin.8:75
+msgid "The following options are recognized when configuring a printer queue:"
 msgstr ""
 
 #. type: TP
-#: lpinfo.man:77
+#: lpadmin.8:75
 #, no-wrap
-msgid "B<--device-id >I<device-id-string>"
+msgid "B<-c >I<class>"
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:80
+#: lpadmin.8:79
 msgid ""
-"Specifies the IEEE-1284 device ID to match when listing drivers with the "
-"I<-m> option."
-msgstr ""
-
-#. type: TP
-#: lpinfo.man:80
-#, no-wrap
-msgid "B<--exclude-schemes >I<scheme-list>"
+"Adds the named I<printer> to I<class>.  If I<class> does not exist it is "
+"created automatically."
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:84
+#: lpadmin.8:87
 msgid ""
-"Specifies a comma-delimited list of device or PPD schemes that should be "
-"excluded from the results.  Static PPD files use the \"file\" scheme."
+"Sets a standard PPD file for the printer from the I<model> directory or "
+"using one of the driver interfaces.  Use the I<-m> option with the "
+"B<lpinfo>(8)  command to get a list of supported models.  The model \"raw\" "
+"clears any existing PPD file and the model \"everywhere\" queries the "
+"printer referred to by the specified IPP I<device-uri>.  Note: Models other "
+"than \"everywhere\" are deprecated and will not be supported in a future "
+"version of CUPS."
 msgstr ""
 
 #. type: TP
-#: lpinfo.man:84
+#: lpadmin.8:87
 #, no-wrap
-msgid "B<--include-schemes >I<scheme-list>"
-msgstr ""
-
-#. type: Plain text
-#: lpinfo.man:88
-msgid ""
-"Specifies a comma-delimited list of device or PPD schemes that should be "
-"included in the results.  Static PPD files use the \"file\" scheme."
+msgid "B<-o cupsIPPSupplies=true>"
 msgstr ""
 
 #. type: TP
-#: lpinfo.man:88
+#: lpadmin.8:89
 #, no-wrap
-msgid "B<--language >I<locale>"
+msgid "B<-o cupsIPPSupplies=false>"
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:91
-msgid "Specifies the language to match when listing drivers with the I<-m> option."
+#: lpadmin.8:92
+msgid "Specifies whether IPP supply level values should be reported."
 msgstr ""
 
 #. type: TP
-#: lpinfo.man:91
+#: lpadmin.8:92
 #, no-wrap
-msgid "B<--make-and-model >I<name>"
-msgstr ""
-
-#. type: Plain text
-#: lpinfo.man:94
-msgid ""
-"Specifies the make and model to match when listing drivers with the I<-m> "
-"option."
+msgid "B<-o cupsSNMPSupplies=true>"
 msgstr ""
 
 #. type: TP
-#: lpinfo.man:94
+#: lpadmin.8:94
 #, no-wrap
-msgid "B<--product >I<name>"
+msgid "B<-o cupsSNMPSupplies=false>"
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:97
-msgid "Specifies the product to match when listing drivers with the I<-m> option."
+#: lpadmin.8:97
+msgid "Specifies whether SNMP supply level (RFC 3805) values should be reported."
 msgstr ""
 
 #. type: TP
-#: lpinfo.man:97
+#: lpadmin.8:97
 #, no-wrap
-msgid "B<--timeout >I<seconds>"
+msgid "B<-o job-k-limit=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:100
-msgid "Specifies the timeout when listing devices with the I<-v> option."
+#: lpadmin.8:101
+msgid ""
+"Sets the kilobyte limit for per-user quotas.  The value is an integer number "
+"of kilobytes; one kilobyte is 1024 bytes."
 msgstr ""
 
-#. type: Plain text
-#: lpinfo.man:102
-msgid "The I<lpinfo> command is unique to CUPS."
+#. type: TP
+#: lpadmin.8:101
+#, no-wrap
+msgid "B<-o job-page-limit=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:104
-msgid "List all devices:"
+#: lpadmin.8:105
+msgid ""
+"Sets the page limit for per-user quotas.  The value is the integer number of "
+"pages that can be printed; double-sided pages are counted as two pages."
 msgstr ""
 
-#. type: Plain text
-#: lpinfo.man:107
+#. type: TP
+#: lpadmin.8:105
 #, no-wrap
-msgid "    lpinfo -v\n"
-msgstr ""
-
-#. type: Plain text
-#: lpinfo.man:110
-msgid "List all drivers:"
+msgid "B<-o job-quota-period=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:113
-#, no-wrap
-msgid "    lpinfo -m\n"
+#: lpadmin.8:109
+msgid ""
+"Sets the accounting period for per-user quotas.  The value is an integer "
+"number of seconds; 86,400 seconds are in one day."
 msgstr ""
 
-#. type: Plain text
-#: lpinfo.man:116
-msgid "List drivers matching \"HP LaserJet\":"
+#. type: TP
+#: lpadmin.8:109
+#, no-wrap
+msgid "B<-o job-sheets-default=>I<banner>"
 msgstr ""
 
-#. type: Plain text
-#: lpinfo.man:119
+#. type: TP
+#: lpadmin.8:111
 #, no-wrap
-msgid "    lpinfo --make-and-model \"HP LaserJet\" -m\n"
+msgid "B<-o job-sheets-default=>I<banner>B<,>I<banner>"
 msgstr ""
 
 #. type: Plain text
-#: lpinfo.man:123
-msgid "B<lpadmin>(8), CUPS Online Help (http://localhost:631/help)"
+#: lpadmin.8:114
+msgid "Sets the default banner page(s) to use for print jobs."
 msgstr ""
 
-#. type: TH
-#: lp.man:13
+#. type: TP
+#: lpadmin.8:114
 #, no-wrap
-msgid "lp"
+msgid "B<-o >I<name>B<=>I<value>"
 msgstr ""
 
-#. type: TH
-#: lp.man:13 lpr.man:13
-#, no-wrap
-msgid "2 May 2016"
+#. type: Plain text
+#: lpadmin.8:120
+msgid ""
+"Sets a PPD option for the printer.  PPD options can be listed using the "
+"I<-l> option with the B<lpoptions>(1)  command."
 msgstr ""
 
-#. type: Plain text
-#: lp.man:16
-msgid "lp - print files"
+#. type: TP
+#: lpadmin.8:120
+#, no-wrap
+msgid "B<-o >I<name>B<-default=>I<value>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:55
+#: lpadmin.8:124
 msgid ""
-"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-d "
-">I<destination>[B</>I<instance>] ] [ B<-h >I<hostname>[B<:>I<port>] ] [ "
-"B<-m> ] [ B<-n> I<num-copies> ] [ B<-o >I<option>[B<=>I<value>] ] [ B<-q> "
-"I<priority> ] [ B<-s> ] [ B<-t> I<title> ] [ B<-H> I<handling> ] [ B<-P> "
-"I<page-list> ] [ B<--> ] [ I<file(s)> ]"
+"Sets a default server-side option for the destination.  Any print-time "
+"option can be defaulted, e.g., \"-o number-up-default=2\" to set the default "
+"\"number-up\" option value to 2."
 msgstr ""
 
-#. type: Plain text
-#: lp.man:87
-msgid ""
-"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h "
-">I<hostname>[B<:>I<port>] ] [ B<-i> I<job-id> ] [ B<-n> I<num-copies> ] [ "
-"B<-o >I<option>[B<=>I<value>] ] [ B<-q> I<priority> ] [ B<-t> I<title> ] [ "
-"B<-H> I<handling> ] [ B<-P> I<page-list> ]"
+#. type: TP
+#: lpadmin.8:124
+#, no-wrap
+msgid "B<-o port-monitor=>I<name>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:90
+#: lpadmin.8:129
 msgid ""
-"B<lp> submits files for printing or alters a pending job.  Use a filename of "
-"\"-\" to force printing from the standard input."
+"Sets the binary communications program to use when printing, \"none\", "
+"\"bcp\", or \"tbcp\".  The default program is \"none\".  The specified port "
+"monitor must be listed in the printer's PPD file."
 msgstr ""
 
-#. type: SS
-#: lp.man:90 lpr.man:60
+#. type: TP
+#: lpadmin.8:129
 #, no-wrap
-msgid "THE DEFAULT DESTINATION"
+msgid "B<-o printer-error-policy=>I<name>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:97 lpr.man:67
+#: lpadmin.8:135
 msgid ""
-"CUPS provides many ways to set the default destination. The B<LPDEST> and "
-"B<PRINTER> environment variables are consulted first.  If neither are set, "
-"the current default set using the B<lpoptions>(1)  command is used, followed "
-"by the default set using the B<lpadmin>(8)  command."
+"Sets the policy for errors such as printers that cannot be found or "
+"accessed, don't support the format being printed, fail during submission of "
+"the print data, or cause one or more filters to crash.  The name must be one "
+"of \"abort-job\" (abort the job on error), \"retry-job\" (retry the job at a "
+"future time), \"retry-current-job\" (retry the current job immediately), or "
+"\"stop-printer\" (stop the printer on error).  The default error policy is "
+"\"stop-printer\" for printers and \"retry-current-job\" for classes."
 msgstr ""
 
-#. type: Plain text
-#: lp.man:99
-msgid "The following options are recognized by I<lp>:"
+#. type: TP
+#: lpadmin.8:135
+#, no-wrap
+msgid "B<-o printer-is-shared=true>"
 msgstr ""
 
 #. type: TP
-#: lp.man:99
+#: lpadmin.8:137
 #, no-wrap
-msgid "B<-->"
+msgid "B<-o printer-is-shared=false>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:102
+#: lpadmin.8:142
 msgid ""
-"Marks the end of options; use this to print a file whose name begins with a "
-"dash (-)."
+"Sets the destination to shared/published or unshared/unpublished.  "
+"Shared/published destinations are publicly announced by the server on the "
+"LAN based on the browsing configuration in I<cupsd.conf>, while "
+"unshared/unpublished destinations are not announced.  The default value is "
+"\"true\"."
+msgstr ""
+
+#. type: TP
+#: lpadmin.8:142
+#, no-wrap
+msgid "B<-o printer-op-policy=>I<name>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:112
+#: lpadmin.8:147
 msgid ""
-"This option is provided for backwards-compatibility only. On systems that "
-"support it, this option forces the print file to be copied to the spool "
-"directory before printing.  In CUPS, print files are always sent to the "
-"scheduler via IPP which has the same effect."
+"Sets the IPP operation policy associated with the destination.  The name "
+"must be defined in the I<cupsd.conf> in a Policy section.  The default "
+"operation policy is \"default\"."
 msgstr ""
 
 #. type: TP
-#: lp.man:112
+#: lpadmin.8:147
 #, no-wrap
-msgid "B<-d >I<destination>"
+msgid "B<-R >I<name>B<-default>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:115 lpr.man:85
-msgid "Prints files to the named printer."
+#: lpadmin.8:150
+msgid "Deletes the named option from I<printer>."
 msgstr ""
 
 #. type: TP
-#: lp.man:118
+#: lpadmin.8:150
 #, no-wrap
-msgid "B<-i >I<job-id>"
+msgid "B<-r >I<class>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:121
-msgid "Specifies an existing job to modify."
+#: lpadmin.8:154
+msgid ""
+"Removes the named I<printer> from I<class>.  If the resulting class becomes "
+"empty it is removed."
 msgstr ""
 
 #. type: TP
-#: lp.man:121 lpr.man:98 ppdc.man:73
+#: lpadmin.8:154
 #, no-wrap
-msgid "B<-m>"
+msgid "B<-u allow:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
 msgstr ""
 
-#. type: Plain text
-#: lp.man:124
-msgid "Sends an email when the job is completed."
+#. type: TP
+#: lpadmin.8:156
+#, no-wrap
+msgid "B<-u deny:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
 msgstr ""
 
-#. type: Plain text
-#: lp.man:127 lpr.man:91
-msgid "Sets the number of copies to print."
+#. type: TP
+#: lpadmin.8:158
+#, no-wrap
+msgid "B<-u allow:all>"
 msgstr ""
 
 #. type: TP
-#: lp.man:127
+#: lpadmin.8:160
 #, no-wrap
-msgid "B<-o \">I<name>B<=>I<value >[ ... I<name>B<=>I<value >]B<\">"
+msgid "B<-u deny:none>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:131
-msgid "Sets one or more job options.  See \"COMMON JOB OPTIONS\" below."
+#: lpadmin.8:166
+msgid ""
+"Sets user-level access control on a destination.  Names starting with \"@\" "
+"are interpreted as UNIX groups.  The latter two forms turn user-level access "
+"control off.  Note: The user 'root' is not granted special access - using "
+"\"-u allow:foo,bar\" will allow users 'foo' and 'bar' to access the printer "
+"but NOT 'root'."
 msgstr ""
 
 #. type: TP
-#: lp.man:131
+#: lpadmin.8:166
 #, no-wrap
-msgid "B<-q >I<priority>"
+msgid "B<-v \">I<device-uri>B<\">"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:135
+#: lpadmin.8:172
 msgid ""
-"Sets the job priority from 1 (lowest) to 100 (highest).  The default "
-"priority is 50."
-msgstr ""
-
-#. type: Plain text
-#: lp.man:138
-msgid "Do not report the resulting job IDs (silent mode.)"
+"Sets the I<device-uri> attribute of the printer queue.  Use the I<-v> option "
+"with the B<lpinfo>(8)  command to get a list of supported device URIs and "
+"schemes."
 msgstr ""
 
 #. type: TP
-#: lp.man:138
+#: lpadmin.8:172
 #, no-wrap
-msgid "B<-t \">I<name>B<\">"
+msgid "B<-D \">I<info>B<\">"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:141
-msgid "Sets the job name."
+#: lpadmin.8:175
+msgid "Provides a textual description of the destination."
 msgstr ""
 
-#. type: TP
-#: lp.man:141
-#, no-wrap
-msgid "B<-H >I<hh:mm>"
+#. type: Plain text
+#: lpadmin.8:183
+msgid ""
+"When specified before the B<-d>, B<-p>, or B<-x> options, forces the use of "
+"TLS encryption on the connection to the scheduler.  Otherwise, enables the "
+"destination and accepts jobs; this is the same as running the "
+"B<cupsaccept>(8)  and B<cupsenable>(8)  programs on the destination."
 msgstr ""
 
 #. type: TP
-#: lp.man:143
+#: lpadmin.8:183
 #, no-wrap
-msgid "B<-H hold>"
+msgid "B<-L \">I<location>B<\">"
 msgstr ""
 
-#. type: TP
-#: lp.man:145
-#, no-wrap
-msgid "B<-H immediate>"
+#. type: Plain text
+#: lpadmin.8:186
+msgid "Provides a textual location of the destination."
 msgstr ""
 
-#. type: TP
-#: lp.man:147
-#, no-wrap
-msgid "B<-H restart>"
+#. type: Plain text
+#: lpadmin.8:188
+msgid "The following B<lpadmin> options are deprecated:"
 msgstr ""
 
 #. type: TP
-#: lp.man:149
+#: lpadmin.8:188
 #, no-wrap
-msgid "B<-H resume>"
+msgid "B<-i >I<filename>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:155
+#: lpadmin.8:193
 msgid ""
-"Specifies when the job should be printed.  A value of I<immediate> will "
-"print the file immediately, a value of I<hold> will hold the job "
-"indefinitely, and a UTC time value (HH:MM) will hold the job until the "
-"specified UTC (not local) time.  Use a value of I<resume> with the I<-i> "
-"option to resume a held job.  Use a value of I<restart> with the I<-i> "
-"option to restart a completed job."
+"This option historically has been used to provide either a System V "
+"interface script or (as an implementation side-effect) a PPD file.  Note: "
+"Interface scripts are not supported by CUPS.  PPD files and printer drivers "
+"are deprecated and will not be supported in a future version of CUPS."
 msgstr ""
 
 #. type: TP
-#: lp.man:155
+#: lpadmin.8:193
 #, no-wrap
-msgid "B<-P >I<page-list>"
+msgid "B<-P >I<ppd-file>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:160 lp.man:223 lpr.man:178
+#: lpadmin.8:197
 msgid ""
-"Specifies which pages to print in the document.  The list can contain a list "
-"of numbers and ranges (#-#) separated by commas, e.g., \"1,3-5,16\".  The "
-"page numbers refer to the output pages and not the document's original pages "
-"- options like \"number-up\" can affect the numbering of the pages."
+"Specifies a PostScript Printer Description (PPD) file to use with the "
+"printer.  Note: PPD files and printer drivers are deprecated and will not be "
+"supported in a future version of CUPS."
 msgstr ""
 
-#. type: SS
-#: lp.man:160 lpr.man:115
-#, no-wrap
-msgid "COMMON JOB OPTIONS"
+#. type: Plain text
+#: lpadmin.8:203
+msgid ""
+"Finally, the CUPS version of B<lpadmin> may ask the user for an access "
+"password depending on the printing system configuration.  This differs from "
+"the System V version which requires the root user to execute this command."
 msgstr ""
 
 #. type: Plain text
-#: lp.man:164 lpr.man:119
+#: lpadmin.8:209
 msgid ""
-"Aside from the printer-specific options reported by the B<lpoptions>(1)  "
-"command, the following generic options are available:"
+"The CUPS version of B<lpadmin> does not support all of the System V or "
+"Solaris printing system configuration options."
 msgstr ""
 
-#. type: TP
-#: lp.man:164 lpr.man:119
-#, no-wrap
-msgid "B<-o collate=true>"
+#. type: Plain text
+#: lpadmin.8:211
+msgid "Interface scripts are not supported for security reasons."
 msgstr ""
 
 #. type: Plain text
-#: lp.man:167 lpr.man:122
-msgid "Prints collated copies."
+#: lpadmin.8:213
+msgid "The double meaning of the B<-E> option is an unfortunate historical oddity."
 msgstr ""
 
-#. type: TP
-#: lp.man:167 lpr.man:122
-#, no-wrap
-msgid "B<-o fit-to-page>"
+#. type: Plain text
+#: lpadmin.8:217
+msgid ""
+"The B<lpadmin> command communicates with the scheduler (B<cupsd>) to make "
+"changes to the printing system configuration.  This configuration "
+"information is stored in several files including I<printers.conf> and "
+"I<classes.conf>.  These files should not be edited directly and are an "
+"implementation detail of CUPS that is subject to change at any time."
 msgstr ""
 
 #. type: Plain text
-#: lp.man:170 lpr.man:125
-msgid "Scales the print file to fit on the page."
+#: lpadmin.8:219
+msgid "Create an IPP Everywhere print queue:"
 msgstr ""
 
-#. type: TP
-#: lp.man:170 lpr.man:125
+#. type: Plain text
+#: lpadmin.8:222
 #, no-wrap
-msgid "B<-o job-hold-until=>I<when>"
+msgid ""
+"    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m "
+"everywhere\n"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:174 lpr.man:129
+#: lpadmin.8:230
 msgid ""
-"Holds the job until the specified local time.  \"when\" can be "
-"\"indefinite\" to hold the until released, \"day-time\" to print the job "
-"between 6am and 6pm local time, \"night\" to print the job between 6pm and "
-"6am local time, \"second-shift\" to print the job between 4pm and 12am local "
-"time, \"third-shift\" to print the job between 12am and 8am local time, or "
-"\"weekend\" to print the job on Saturday or Sunday."
+"B<cupsaccept>(8), B<cupsenable>(8), B<lpinfo>(8), B<lpoptions>(1), CUPS "
+"Online Help (http://localhost:631/help)"
 msgstr ""
 
-#. type: TP
-#: lp.man:174 lpr.man:129
+#. type: TH
+#: lpc.8:10
 #, no-wrap
-msgid "B<-o job-hold-until=>I<hh:mm>"
+msgid "lpc"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:177 lpr.man:132
-msgid "Holds the job until the specified time in hours and minutes UTC."
+#: lpc.8:13
+msgid "lpc - line printer control program (deprecated)"
 msgstr ""
 
-#. type: TP
-#: lp.man:177 lpr.man:132
-#, no-wrap
-msgid "B<-o job-priority=>I<priority>"
+#. type: Plain text
+#: lpc.8:20
+msgid "B<lpc> [ I<command> [ I<parameter(s)> ] ]"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:181 lpr.man:136
+#: lpc.8:22
 msgid ""
-"Set the priority to a value from 1 (lowest) to 100 (highest), which "
-"influences when a job is scheduled for printing.  The default priority is "
-"typically 50."
+"B<lpc> provides limited control over printer and class queues provided by "
+"CUPS. It can also be used to query the state of queues."
 msgstr ""
 
-#. type: TP
-#: lp.man:181 lpr.man:136
+#. type: Plain text
+#: lpc.8:24
+msgid ""
+"If no command is specified on the command-line, B<lpc> displays a prompt and "
+"accepts commands from the standard input."
+msgstr ""
+
+#. type: SS
+#: lpc.8:24
 #, no-wrap
-msgid "B<-o job-sheets=>I<name>"
+msgid "COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:185 lpr.man:140
+#: lpc.8:26
 msgid ""
-"Prints a cover page (banner) with the document.  The \"name\" can be "
-"\"classified\", \"confidential\", \"secret\", \"standard\", \"topsecret\", "
-"or \"unclassified\"."
+"The B<lpc> program accepts a subset of commands accepted by the Berkeley "
+"B<lpc> program of the same name:"
 msgstr ""
 
 #. type: TP
-#: lp.man:185 lpr.man:140
+#: lpc.8:26
 #, no-wrap
-msgid "B<-o job-sheets=>I<start-name,end-name>"
+msgid "B<exit>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:188 lpr.man:143
-msgid "Prints cover pages (banners) with the document."
+#: lpc.8:29 lpc.8:37
+msgid "Exits the command interpreter."
 msgstr ""
 
 #. type: TP
-#: lp.man:188 lpr.man:143
+#: lpc.8:29
 #, no-wrap
-msgid "B<-o media=>I<size>"
+msgid "B<help >[I<command>]"
+msgstr ""
+
+#. type: TP
+#: lpc.8:31
+#, no-wrap
+msgid "B<? >[I<command>]"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:191 lpr.man:146
-msgid ""
-"Sets the page size to I<size>. Most printers support at least the size names "
-"\"a4\", \"letter\", and \"legal\"."
+#: lpc.8:34
+msgid "Displays a short help message."
+msgstr ""
+
+#. type: TP
+#: lpc.8:34
+#, no-wrap
+msgid "B<quit>"
 msgstr ""
 
 #. type: TP
-#: lp.man:191 lpr.man:146
+#: lpc.8:37
 #, no-wrap
-msgid "B<-o mirror>"
+msgid "B<status >[I<queue>]"
+msgstr ""
+
+#. type: Plain text
+#: lpc.8:40
+msgid "Displays the status of one or more printer or class queues."
+msgstr ""
+
+#. type: Plain text
+#: lpc.8:42
+msgid ""
+"This program is deprecated and will be removed in a future feature release "
+"of CUPS."
+msgstr ""
+
+#. type: Plain text
+#: lpc.8:47
+msgid ""
+"Since B<lpc> is geared towards the Berkeley printing system, it is "
+"impossible to use B<lpc> to configure printer or class queues provided by "
+"CUPS.  To configure printer or class queues you must use the B<lpadmin>(8)  "
+"command or another CUPS-compatible client with that functionality."
 msgstr ""
 
 #. type: Plain text
-#: lp.man:194 lpr.man:149
-msgid "Mirrors each page."
+#: lpc.8:57
+msgid ""
+"B<cancel>(1), B<cupsaccept>(8), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), "
+"B<lpr>(1), B<lprm>(1), B<lpstat>(1), CUPS Online Help "
+"(http://localhost:631/help)"
 msgstr ""
 
-#. type: TP
-#: lp.man:194 lpr.man:149
+#. type: TH
+#: lpinfo.8:10
 #, no-wrap
-msgid "B<-o number-up=>{I<2|4|6|9|16>}"
+msgid "lpinfo"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:197 lpr.man:152
-msgid "Prints 2, 4, 6, 9, or 16 document (input) pages on each output page."
+#: lpinfo.8:13
+msgid "lpinfo - show available devices or drivers (deprecated)"
 msgstr ""
 
-#. type: TP
-#: lp.man:197 lpr.man:152
-#, no-wrap
-msgid "B<-o number-up-layout=>I<layout>"
+#. type: Plain text
+#: lpinfo.8:41
+msgid ""
+"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ "
+"B<--device-id> I<device-id-string> ] [ B<--exclude-schemes> I<scheme-list> ] "
+"[ B<--include-schemes> I<scheme-list> ] [ B<--language> I<locale> ] [ "
+"B<--make-and-model> I<name> ] [ B<--product> I<name> ] B<-m>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:202 lpr.man:157
+#: lpinfo.8:60
 msgid ""
-"Specifies the layout of pages with the \"number-up\" option.  The \"layout\" "
-"string can be \"btlr\", \"btrl\", \"lrbt\", \"lrtb\", \"rlbt\", \"rltb\", "
-"\"tblr\", or \"tbrl\" - the first two letters determine the column order "
-"while the second two letters determine the row order.  \"bt\" is "
-"bottom-to-top, \"lr\" is left-to-right, \"rl\" is right-to-left, and \"tb\" "
-"is top-to-bottom."
+"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ "
+"B<--exclude-schemes> I<scheme-list> ] [ B<--include-schemes> I<scheme-list> "
+"] [ B<--timeout> I<seconds> ] B<-v>"
 msgstr ""
 
-#. type: TP
-#: lp.man:202 lpr.man:157
-#, no-wrap
-msgid "B<-o orientation-requested=4>"
+#. type: Plain text
+#: lpinfo.8:63
+msgid ""
+"B<lpinfo> lists the available devices or drivers known to the CUPS server.  "
+"The first form (I<-m>) lists the available drivers, while the second form "
+"(I<-v>) lists the available devices."
 msgstr ""
 
 #. type: Plain text
-#: lp.man:205 lpr.man:160
-msgid "Prints the job in landscape (rotated 90 degrees counter-clockwise)."
+#: lpinfo.8:65
+msgid "B<lpinfo> accepts the following options:"
 msgstr ""
 
-#. type: TP
-#: lp.man:205 lpr.man:160
-#, no-wrap
-msgid "B<-o orientation-requested=5>"
+#. type: Plain text
+#: lpinfo.8:71
+msgid "Selects an alternate server."
 msgstr ""
 
 #. type: Plain text
-#: lp.man:208 lpr.man:163
-msgid "Prints the job in landscape (rotated 90 degrees clockwise)."
+#: lpinfo.8:74
+msgid "Shows a \"long\" listing of devices or drivers."
 msgstr ""
 
 #. type: TP
-#: lp.man:208 lpr.man:163
+#: lpinfo.8:74
 #, no-wrap
-msgid "B<-o orientation-requested=6>"
+msgid "B<--device-id >I<device-id-string>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:211 lpr.man:166
-msgid "Prints the job in reverse portrait (rotated 180 degrees)."
+#: lpinfo.8:77
+msgid ""
+"Specifies the IEEE-1284 device ID to match when listing drivers with the "
+"I<-m> option."
 msgstr ""
 
 #. type: TP
-#: lp.man:211 lpr.man:166
+#: lpinfo.8:77
 #, no-wrap
-msgid "B<-o outputorder=reverse>"
+msgid "B<--exclude-schemes >I<scheme-list>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:214 lpr.man:169
-msgid "Prints pages in reverse order."
+#: lpinfo.8:81
+msgid ""
+"Specifies a comma-delimited list of device or PPD schemes that should be "
+"excluded from the results.  Static PPD files use the \"file\" scheme."
 msgstr ""
 
 #. type: TP
-#: lp.man:214 lpr.man:169
+#: lpinfo.8:81
 #, no-wrap
-msgid "B<-o page-border=>I<border>"
+msgid "B<--include-schemes >I<scheme-list>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:218 lpr.man:173
+#: lpinfo.8:85
 msgid ""
-"Prints a border around each document page.  \"border\" is \"double\", "
-"\"double-thick\", \"single\", or \"single-thick\"."
+"Specifies a comma-delimited list of device or PPD schemes that should be "
+"included in the results.  Static PPD files use the \"file\" scheme."
 msgstr ""
 
 #. type: TP
-#: lp.man:218 lpr.man:173
+#: lpinfo.8:85
 #, no-wrap
-msgid "B<-o page-ranges=>I<page-list>"
+msgid "B<--language >I<locale>"
+msgstr ""
+
+#. type: Plain text
+#: lpinfo.8:88
+msgid "Specifies the language to match when listing drivers with the I<-m> option."
 msgstr ""
 
 #. type: TP
-#: lp.man:223 lpr.man:178
+#: lpinfo.8:88
 #, no-wrap
-msgid "B<-o sides=one-sided>"
+msgid "B<--make-and-model >I<name>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:226 lpr.man:181
-msgid "Prints on one side of the paper."
+#: lpinfo.8:91
+msgid ""
+"Specifies the make and model to match when listing drivers with the I<-m> "
+"option."
 msgstr ""
 
 #. type: TP
-#: lp.man:226 lpr.man:181
+#: lpinfo.8:91
 #, no-wrap
-msgid "B<-o sides=two-sided-long-edge>"
+msgid "B<--product >I<name>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:229 lpr.man:184
-msgid "Prints on both sides of the paper for portrait output."
+#: lpinfo.8:94
+msgid "Specifies the product to match when listing drivers with the I<-m> option."
 msgstr ""
 
 #. type: TP
-#: lp.man:229 lpr.man:184
+#: lpinfo.8:94
 #, no-wrap
-msgid "B<-o sides=two-sided-short-edge>"
+msgid "B<--timeout >I<seconds>"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:232 lpr.man:187
-msgid "Prints on both sides of the paper for landscape output."
+#: lpinfo.8:97
+msgid "Specifies the timeout when listing devices with the I<-v> option."
 msgstr ""
 
 #. type: Plain text
-#: lp.man:237
-msgid ""
-"The I<-q> option accepts a different range of values than the Solaris lp "
-"command, matching the IPP job priority values (1-100, 100 is highest "
-"priority) instead of the Solaris values (0-39, 0 is highest priority)."
+#: lpinfo.8:99
+msgid "The I<lpinfo> command is unique to CUPS."
 msgstr ""
 
 #. type: Plain text
-#: lp.man:239 lpr.man:191
-msgid "Print two copies of a document to the default printer:"
+#: lpinfo.8:101
+msgid "List all devices:"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:242
+#: lpinfo.8:104
 #, no-wrap
-msgid "    lp -n 2 filename\n"
+msgid "    lpinfo -v\n"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:245 lpr.man:197
-msgid "Print a double-sided legal document to a printer called \"foo\":"
+#: lpinfo.8:107
+msgid "List all drivers:"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:248
+#: lpinfo.8:110
 #, no-wrap
-msgid "    lp -d foo -o media=legal -o sides=two-sided-long-edge filename\n"
+msgid "    lpinfo -m\n"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:251 lpr.man:203
-msgid "Print a presentation document 2-up to a printer called \"foo\":"
+#: lpinfo.8:113
+msgid "List drivers matching \"HP LaserJet\":"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:254
+#: lpinfo.8:116
 #, no-wrap
-msgid "    lp -d foo -o number-up=2 filename\n"
+msgid "    lpinfo --make-and-model \"HP LaserJet\" -m\n"
 msgstr ""
 
 #. type: Plain text
-#: lp.man:264
-msgid ""
-"B<cancel>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), B<lpr>(1), "
-"B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
+#: lpinfo.8:124
+msgid "B<lpadmin>(8), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: lpmove.man:13
+#: lpmove.8:10
 #, no-wrap
 msgid "lpmove"
 msgstr ""
 
-#. type: TH
-#: lpmove.man:13
-#, no-wrap
-msgid "26 May 2016"
-msgstr ""
-
 #. type: Plain text
-#: lpmove.man:16
+#: lpmove.8:13
 msgid "lpmove - move a job or all jobs to a new destination"
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:28
+#: lpmove.8:25
 msgid ""
 "B<lpmove> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-U> I<username> ] "
 "I<job> I<destination>"
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:40
+#: lpmove.8:37
 msgid ""
 "B<lpmove> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-U> I<username> ] "
 "I<source> I<destination>"
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:42
+#: lpmove.8:39
 msgid ""
 "B<lpmove> moves the specified I<job> or all jobs from I<source> to "
 "I<destination>. I<job> can be the job ID number or the old destination and "
@@ -12243,101 +12329,95 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:44
+#: lpmove.8:41
 msgid "The B<lpmove> command supports the following options:"
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:50 lpq.man:50 lpr.man:88 lprm.man:52 lpstat.man:86
+#: lpmove.8:47 lpq.1:47 lpr.1:85 lprm.1:49 lpstat.1:82
 msgid "Specifies an alternate username."
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:55
+#: lpmove.8:52
 msgid "Move job 123 from \"oldprinter\" to \"newprinter\":"
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:58
+#: lpmove.8:55
 #, no-wrap
 msgid "    lpmove 123 newprinter\n"
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:60
+#: lpmove.8:57
 #, no-wrap
 msgid "            I<or>\n"
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:62
+#: lpmove.8:59
 #, no-wrap
 msgid "    lpmove oldprinter-123 newprinter\n"
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:65
+#: lpmove.8:62
 msgid "Move all jobs from \"oldprinter\" to \"newprinter\":"
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:68
+#: lpmove.8:65
 #, no-wrap
 msgid "    lpmove oldprinter newprinter\n"
 msgstr ""
 
 #. type: Plain text
-#: lpmove.man:74
+#: lpmove.8:71
 msgid "B<cancel>(1), B<lp>(1), B<lpr>(1), B<lprm>(1),"
 msgstr ""
 
 #. type: TH
-#: lpoptions.man.in:13
+#: lpoptions.1:10
 #, no-wrap
 msgid "lpoptions"
 msgstr ""
 
-#. type: TH
-#: lpoptions.man.in:13
-#, no-wrap
-msgid "10 April 2018"
-msgstr ""
-
 #. type: Plain text
-#: lpoptions.man.in:16
+#: lpoptions.1:13
 msgid "lpoptions - display or set printer options and defaults"
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:27
+#: lpoptions.1:24
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] B<-d "
 ">I<destination>[B</>I<instance>] [ B<-l> ]"
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:37
+#: lpoptions.1:34
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-p "
 ">I<destination>[B</>I<instance>] ] B<-o >I<option>[B<=>I<value>] ..."
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:48
+#: lpoptions.1:45
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-p "
 ">I<destination>[B</>I<instance>] ] B<-r> I<option>"
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:56
+#: lpoptions.1:53
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] B<-x "
 ">I<destination>[B</>I<instance>]"
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:60
+#: lpoptions.1:57
 msgid ""
 "B<lpoptions> displays or sets printer options and defaults.  If no printer "
 "is specified using the I<-p> option, the default printer is used as "
@@ -12345,21 +12425,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:62
+#: lpoptions.1:59
 msgid ""
 "If no I<-l>, I<-o>, or I<-r> options are specified, the current options are "
 "reported on the standard output."
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:68
+#: lpoptions.1:65
 msgid ""
 "Options set with the B<lpoptions> command are used by the B<lp>(1)  and "
 "B<lpr>(1)  commands when submitting jobs."
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:71
+#: lpoptions.1:68
 msgid ""
 "When run by the root user, B<lpoptions> gets and sets default options and "
 "instances for all users in the I</etc/cups/lpoptions> file.  Otherwise, the "
@@ -12367,23 +12447,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:73
+#: lpoptions.1:70
 msgid "B<lpoptions> supports the following options:"
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:76
+#: lpoptions.1:73
 msgid "Enables encryption when communicating with the CUPS server."
 msgstr ""
 
 #. type: TP
-#: lpoptions.man.in:76
+#: lpoptions.1:73
 #, no-wrap
 msgid "B<-d >I<destination>[B</>I<instance>]"
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:81
+#: lpoptions.1:78
 msgid ""
 "Sets the user default printer to I<destination>.  If I<instance> is supplied "
 "then that particular instance is used.  This option overrides the system "
@@ -12391,34 +12471,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:84
+#: lpoptions.1:81
 msgid "Uses an alternate server."
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:87
+#: lpoptions.1:84
 msgid "Lists the printer specific options and their current settings."
 msgstr ""
 
 #. type: TP
-#: lpoptions.man.in:87 lpr.man:101
+#: lpoptions.1:84 lpr.1:98
 #, no-wrap
 msgid "B<-o >I<option>[B<=>I<value>]"
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:90
+#: lpoptions.1:87
 msgid "Specifies a new option for the named destination."
 msgstr ""
 
 #. type: TP
-#: lpoptions.man.in:90
+#: lpoptions.1:87
 #, no-wrap
 msgid "B<-p >I<destination>[B</>I<instance>]"
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:97
+#: lpoptions.1:94
 msgid ""
 "Sets the destination and instance, if specified, for any options that "
 "follow.  If the named instance does not exist then it is created.  "
@@ -12426,24 +12506,24 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: lpoptions.man.in:97
+#: lpoptions.1:94
 #, no-wrap
 msgid "B<-r >I<option>"
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:100
+#: lpoptions.1:97
 msgid "Removes the specified option from the named destination."
 msgstr ""
 
 #. type: TP
-#: lpoptions.man.in:100
+#: lpoptions.1:97
 #, no-wrap
 msgid "B<-x >I<destination>[B</>I<instance>]"
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:107
+#: lpoptions.1:104
 msgid ""
 "Removes the options for the named destination and instance, if specified.  "
 "If the named instance does not exist then this does nothing.  Destinations "
@@ -12451,44 +12531,44 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:109
+#: lpoptions.1:106
 msgid ""
 "I<~/.cups/lpoptions> - user defaults and instances created by non-root "
 "users."
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:111
+#: lpoptions.1:108
 msgid ""
 "I</etc/cups/lpoptions> - system-wide defaults and instances created by the "
 "root user."
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:113
+#: lpoptions.1:110
 msgid "The B<lpoptions> command is unique to CUPS."
 msgstr ""
 
 #. type: Plain text
-#: lpoptions.man.in:120
+#: lpoptions.1:117
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpadmin>(8), B<lpr>(1), B<lprm>(1), CUPS Online "
 "Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: lpq.man:13
+#: lpq.1:10
 #, no-wrap
 msgid "lpq"
 msgstr ""
 
 #. type: Plain text
-#: lpq.man:16
+#: lpq.1:13
 msgid "lpq - show printer queue status"
 msgstr ""
 
 #. type: Plain text
-#: lpq.man:34
+#: lpq.1:31
 msgid ""
 "B<lpq> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] [ "
 "B<-P >I<destination>[B</>I<instance>] ] [ B<-a> ] [ B<-l> ] [ "
@@ -12496,7 +12576,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpq.man:37
+#: lpq.1:34
 msgid ""
 "B<lpq> shows the current print queue status on the named printer.  Jobs "
 "queued on the default destination will be shown if no printer or class is "
@@ -12504,7 +12584,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpq.man:39
+#: lpq.1:36
 msgid ""
 "The I<+interval> option allows you to continuously report the jobs in the "
 "queue until the queue is empty; the list of jobs is shown once every "
@@ -12512,51 +12592,51 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpq.man:41
+#: lpq.1:38
 msgid "B<lpq> supports the following options:"
 msgstr ""
 
 #. type: TP
-#: lpq.man:44 lpr.man:82
+#: lpq.1:41 lpr.1:79
 #, no-wrap
 msgid "B<-P >I<destination>[B</>I<instance>]"
 msgstr ""
 
 #. type: Plain text
-#: lpq.man:47
+#: lpq.1:44
 msgid "Specifies an alternate printer or class name."
 msgstr ""
 
 #. type: Plain text
-#: lpq.man:53
+#: lpq.1:50
 msgid "Reports jobs on all printers."
 msgstr ""
 
 #. type: Plain text
-#: lpq.man:59
+#: lpq.1:56
 msgid "Requests a more verbose (long) reporting format."
 msgstr ""
 
 #. type: Plain text
-#: lpq.man:66
+#: lpq.1:63
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpr>(1), B<lprm>(1), B<lpstat>(1), CUPS Online "
 "Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: lpr.man:13
+#: lpr.1:10
 #, no-wrap
 msgid "lpr"
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:16
+#: lpr.1:13
 msgid "lpr - print files"
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:56
+#: lpr.1:53
 msgid ""
 "B<lpr> [ B<-E> ] [ B<-H >I<server>[B<:>I<port>] ] [ B<-U> I<username> ] [ "
 "B<-P >I<destination>[B</>I<instance>] ] [ B<-#> I<num-copies> [ B<-h> ] [ "
@@ -12566,7 +12646,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:60
+#: lpr.1:57
 msgid ""
 "B<lpr> submits files for printing.  Files named on the command line are sent "
 "to the named printer or the default destination if no destination is "
@@ -12575,71 +12655,71 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:69
+#: lpr.1:66
 msgid "The following options are recognized by I<lpr>:"
 msgstr ""
 
 #. type: TP
-#: lpr.man:72
+#: lpr.1:69
 #, no-wrap
 msgid "B<-H >I<server>[B<:>I<port>]"
 msgstr ""
 
 #. type: TP
-#: lpr.man:75
+#: lpr.1:72
 #, no-wrap
 msgid "B<-C \">I<name>B<\">"
 msgstr ""
 
 #. type: TP
-#: lpr.man:77
+#: lpr.1:74
 #, no-wrap
 msgid "B<-J \">I<name>B<\">"
 msgstr ""
 
 #. type: TP
-#: lpr.man:79
+#: lpr.1:76
 #, no-wrap
 msgid "B<-T \">I<name>B<\">"
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:82
+#: lpr.1:79
 msgid "Sets the job name/title."
 msgstr ""
 
 #. type: TP
-#: lpr.man:88
+#: lpr.1:85
 #, no-wrap
 msgid "B<-# >I<copies>"
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:94
+#: lpr.1:91
 msgid ""
 "Disables banner printing. This option is equivalent to I<-o "
 "job-sheets=none>."
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:98
+#: lpr.1:95
 msgid ""
 "Specifies that the print file is already formatted for the destination and "
 "should be sent without filtering.  This option is equivalent to I<-o raw>."
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:101
+#: lpr.1:98
 msgid "Send an email on job completion."
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:105
+#: lpr.1:102
 msgid "Sets a job option.  See \"COMMON JOB OPTIONS\" below."
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:109
+#: lpr.1:106
 msgid ""
 "Specifies that the print file should be formatted with a shaded header with "
 "the date, time, job name, and page number.  This option is equivalent to "
@@ -12647,75 +12727,74 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:112
+#: lpr.1:109
 msgid "Hold job for printing."
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:115
+#: lpr.1:112
 msgid ""
 "Specifies that the named print files should be deleted after submitting "
 "them."
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:189
+#: lpr.1:153
 msgid ""
 "The I<-c>, I<-d>, I<-f>, I<-g>, I<-i>, I<-n>, I<-t>, I<-v>, and I<-w> "
 "options are not supported by CUPS and produce a warning message if used."
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:194
+#: lpr.1:158
 #, no-wrap
 msgid "    lpr -# 2 filename\n"
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:200
+#: lpr.1:164
 #, no-wrap
 msgid "    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename\n"
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:206
+#: lpr.1:167
+msgid "Print a presentation document 2-up to a printer called \"foo\":"
+msgstr ""
+
+#. type: Plain text
+#: lpr.1:170
 #, no-wrap
 msgid "    lpr -P foo -o number-up=2 filename\n"
 msgstr ""
 
 #. type: Plain text
-#: lpr.man:216
+#: lpr.1:180
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), "
 "B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: lprm.man:13
+#: lprm.1:10
 #, no-wrap
 msgid "lprm"
 msgstr ""
 
-#. type: TH
-#: lprm.man:13
-#, no-wrap
-msgid "22 May 2014"
-msgstr ""
-
 #. type: Plain text
-#: lprm.man:16
+#: lprm.1:13
 msgid "lprm - cancel print jobs"
 msgstr ""
 
 #. type: Plain text
-#: lprm.man:34
+#: lprm.1:31
 msgid ""
 "B<lprm> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<server>[I<:port>] ] [ "
 "B<-P> I<destination>[I</instance>] ] [ B<-> ] [ I<job-id(s)> ]"
 msgstr ""
 
 #. type: Plain text
-#: lprm.man:39
+#: lprm.1:36
 msgid ""
 "B<lprm> cancels print jobs that have been queued for printing.  If no "
 "arguments are supplied, the current job on the default destination is "
@@ -12724,88 +12803,82 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lprm.man:43
+#: lprm.1:40
 msgid "The B<lprm> command supports the following options:"
 msgstr ""
 
 #. type: TP
-#: lprm.man:46
+#: lprm.1:43
 #, no-wrap
 msgid "B<-P >I<destination>[I</instance>]"
 msgstr ""
 
 #. type: Plain text
-#: lprm.man:49
+#: lprm.1:46
 msgid "Specifies the destination printer or class."
 msgstr ""
 
 #. type: TP
-#: lprm.man:52
+#: lprm.1:49
 #, no-wrap
 msgid "B<-h >I<server>[I<:port>]"
 msgstr ""
 
 #. type: Plain text
-#: lprm.man:59
+#: lprm.1:56
 msgid ""
 "The CUPS version of B<lprm> is compatible with the standard Berkeley command "
 "of the same name."
 msgstr ""
 
 #. type: Plain text
-#: lprm.man:61
+#: lprm.1:58
 msgid "Cancel the current job on the default printer:"
 msgstr ""
 
 #. type: Plain text
-#: lprm.man:64
+#: lprm.1:61
 #, no-wrap
 msgid "    lprm\n"
 msgstr ""
 
 #. type: Plain text
-#: lprm.man:67
+#: lprm.1:64
 msgid "Cancel job 1234:"
 msgstr ""
 
 #. type: Plain text
-#: lprm.man:70
+#: lprm.1:67
 #, no-wrap
 msgid "    lprm 1234\n"
 msgstr ""
 
 #. type: Plain text
-#: lprm.man:76
+#: lprm.1:73
 #, no-wrap
 msgid "    lprm -\n"
 msgstr ""
 
 #. type: Plain text
-#: lprm.man:84
+#: lprm.1:81
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpq>(1), B<lpr>(1), B<lpstat>(1), CUPS Online Help "
 "(http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: lpstat.man:13
+#: lpstat.1:9
 #, no-wrap
 msgid "lpstat"
 msgstr ""
 
-#. type: TH
-#: lpstat.man:13
-#, no-wrap
-msgid "26 May 2017"
-msgstr ""
-
 #. type: Plain text
-#: lpstat.man:16
+#: lpstat.1:12
 msgid "lpstat - print cups status information"
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:69
+#: lpstat.1:65
 msgid ""
 "B<lpstat> [ B<-E> ] [ B<-H> ] [ B<-U> I<username> ] [ B<-h "
 ">I<hostname>[B<:>I<port>] ] [ B<-l> ] [ B<-W> I<which-jobs> ] [ B<-a> [ "
@@ -12815,7 +12888,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:72
+#: lpstat.1:68
 msgid ""
 "B<lpstat> displays status information about the current classes, jobs, and "
 "printers.  When run with no arguments, B<lpstat> will list active jobs "
@@ -12823,40 +12896,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:74
+#: lpstat.1:70
 msgid "The B<lpstat> command supports the following options:"
 msgstr ""
 
 #. type: TP
-#: lpstat.man:77
+#: lpstat.1:73
 #, no-wrap
 msgid "B<-H>"
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:80
+#: lpstat.1:76
 msgid "Shows the server hostname and port."
 msgstr ""
 
 #. type: TP
-#: lpstat.man:80
+#: lpstat.1:76
 #, no-wrap
 msgid "B<-R>"
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:83
+#: lpstat.1:79
 msgid "Shows the ranking of print jobs."
 msgstr ""
 
 #. type: TP
-#: lpstat.man:86
+#: lpstat.1:82
 #, no-wrap
 msgid "B<-W >I<which-jobs>"
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:90
+#: lpstat.1:86
 msgid ""
 "Specifies which jobs to show, \"completed\" or \"not-completed\" (the "
 "default).  This option I<must> appear before the I<-o> option and/or any "
@@ -12865,85 +12938,85 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: lpstat.man:90
+#: lpstat.1:86
 #, no-wrap
 msgid "B<-a >[I<printer(s)>]"
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:94
+#: lpstat.1:90
 msgid ""
 "Shows the accepting state of printer queues.  If no printers are specified "
 "then all printers are listed."
 msgstr ""
 
 #. type: TP
-#: lpstat.man:94
+#: lpstat.1:90
 #, no-wrap
 msgid "B<-c >[I<class(es)>]"
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:98
+#: lpstat.1:94
 msgid ""
 "Shows the printer classes and the printers that belong to them.  If no "
 "classes are specified then all classes are listed."
 msgstr ""
 
 #. type: TP
-#: lpstat.man:98
+#: lpstat.1:94
 #, no-wrap
 msgid "B<-d>"
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:101
+#: lpstat.1:97
 msgid "Shows the current default destination."
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:104
+#: lpstat.1:100
 msgid "Shows all available destinations on the local network."
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:110
+#: lpstat.1:106
 msgid "Shows a long listing of printers, classes, or jobs."
 msgstr ""
 
 #. type: TP
-#: lpstat.man:110
+#: lpstat.1:106
 #, no-wrap
 msgid "B<-o >[I<destination(s)>]"
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:114
+#: lpstat.1:110
 msgid ""
 "Shows the jobs queued on the specified destinations.  If no destinations are "
 "specified all jobs are shown."
 msgstr ""
 
 #. type: TP
-#: lpstat.man:114
+#: lpstat.1:110
 #, no-wrap
 msgid "B<-p >[I<printer(s)>]"
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:118
+#: lpstat.1:114
 msgid ""
 "Shows the printers and whether they are enabled for printing.  If no "
 "printers are specified then all printers are listed."
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:121
+#: lpstat.1:117
 msgid "Shows whether the CUPS server is running."
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:125
+#: lpstat.1:121
 msgid ""
 "Shows a status summary, including the default destination, a list of classes "
 "and their member printers, and a list of printers and their associated "
@@ -12951,40 +13024,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:129
+#: lpstat.1:125
 msgid ""
 "Shows all status information.  This is equivalent to using the I<-r>, I<-d>, "
 "I<-c>, I<-v>, I<-a>, I<-p>, and I<-o> options."
 msgstr ""
 
 #. type: TP
-#: lpstat.man:129
+#: lpstat.1:125
 #, no-wrap
 msgid "B<-u >[I<user(s)>]"
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:133
+#: lpstat.1:129
 msgid ""
 "Shows a list of print jobs queued by the specified users.  If no users are "
 "specified, lists the jobs queued by the current user."
 msgstr ""
 
 #. type: TP
-#: lpstat.man:133
+#: lpstat.1:129
 #, no-wrap
 msgid "B<-v >[I<printer(s)>]"
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:137
+#: lpstat.1:133
 msgid ""
 "Shows the printers and what device they are attached to.  If no printers are "
 "specified then all printers are listed."
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:140
+#: lpstat.1:136
 msgid ""
 "Unlike the System V printing system, CUPS allows printer names to contain "
 "any printable character except SPACE, TAB, \"/\", and \"#\".  Also, printer "
@@ -12992,70 +13065,70 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:142
+#: lpstat.1:138
 msgid "The I<-h>, I<-e>, I<-E>, I<-U>, and I<-W> options are unique to CUPS."
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:144
+#: lpstat.1:140
 msgid "The Solaris I<-f>, I<-P>, and I<-S> options are silently ignored."
 msgstr ""
 
 #. type: Plain text
-#: lpstat.man:151
+#: lpstat.1:147
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpq>(1), B<lpr>(1), B<lprm>(1), CUPS Online Help "
 "(http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: mailto.conf.man:13
+#: mailto.conf.5:10
 #, no-wrap
 msgid "mailto.conf"
 msgstr ""
 
 #. type: Plain text
-#: mailto.conf.man:16
+#: mailto.conf.5:13
 msgid "mailto.conf - configuration file for cups email notifier"
 msgstr ""
 
 #. type: Plain text
-#: mailto.conf.man:18
+#: mailto.conf.5:15
 msgid ""
 "The B<mailto.conf> file defines the local mail server and email notification "
 "preferences for CUPS."
 msgstr ""
 
 #. type: TP
-#: mailto.conf.man:24
+#: mailto.conf.5:21
 #, no-wrap
 msgid "B<Cc >I<cc-address@domain.com>"
 msgstr ""
 
 #. type: Plain text
-#: mailto.conf.man:27
+#: mailto.conf.5:24
 msgid "Specifies an additional recipient for all email notifications."
 msgstr ""
 
 #. type: TP
-#: mailto.conf.man:27
+#: mailto.conf.5:24
 #, no-wrap
 msgid "B<From >I<from-address@domain.com>"
 msgstr ""
 
 #. type: Plain text
-#: mailto.conf.man:30
+#: mailto.conf.5:27
 msgid "Specifies the sender of email notifications."
 msgstr ""
 
 #. type: TP
-#: mailto.conf.man:30
+#: mailto.conf.5:27
 #, no-wrap
 msgid "B<Sendmail >I<sendmail command and options>"
 msgstr ""
 
 #. type: Plain text
-#: mailto.conf.man:35
+#: mailto.conf.5:32
 msgid ""
 "Specifies the sendmail command to use when sending email notifications.  "
 "Only one I<Sendmail> or I<SMTPServer> line may be present in the "
@@ -13064,13 +13137,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: mailto.conf.man:35
+#: mailto.conf.5:32
 #, no-wrap
 msgid "B<SMTPServer >I<servername>"
 msgstr ""
 
 #. type: Plain text
-#: mailto.conf.man:40
+#: mailto.conf.5:37
 msgid ""
 "Specifies a SMTP server to send email notifications to.  Only one "
 "I<Sendmail> or I<SMTPServer> line may be present in the B<mailto.conf> "
@@ -13078,40 +13151,34 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: mailto.conf.man:40
+#: mailto.conf.5:37
 #, no-wrap
 msgid "B<Subject >I<subject-prefix>"
 msgstr ""
 
 #. type: Plain text
-#: mailto.conf.man:43
+#: mailto.conf.5:40
 msgid "Specifies a prefix string for the subject line of an email notification."
 msgstr ""
 
 #. type: Plain text
-#: mailto.conf.man:46
+#: mailto.conf.5:43
 msgid "B<cupsd>(8), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: mime.convs.man:13
+#: mime.convs.5:10
 #, no-wrap
 msgid "mime.convs"
 msgstr ""
 
-#. type: TH
-#: mime.convs.man:13
-#, no-wrap
-msgid "26 August 2015"
-msgstr ""
-
 #. type: Plain text
-#: mime.convs.man:16
-msgid "mime.convs - mime type conversion file for cups"
+#: mime.convs.5:13
+msgid "mime.convs - mime type conversion file for cups (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:19
+#: mime.convs.5:16
 msgid ""
 "The B<mime.convs> file defines the filters that are available for converting "
 "files from one format to another.  The standard filters support text, PDF, "
@@ -13119,14 +13186,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:21
+#: mime.convs.5:18
 msgid ""
 "Additional filters are specified in files with the extension I<.convs> in "
 "the CUPS configuration directory."
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:26
+#: mime.convs.5:23
 msgid ""
 "Each line in the B<mime.convs> file is a comment, blank, or filter line.  "
 "Comment lines start with the # character.  Filter lines specify the source "
@@ -13135,27 +13202,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:29
+#: mime.convs.5:26
 #, no-wrap
 msgid "    source/type destination/type cost filter\n"
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:32
+#: mime.convs.5:29
 msgid ""
 "The I<source/type> field specifies the source MIME media type that is "
 "consumed by the filter."
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:34
+#: mime.convs.5:31
 msgid ""
 "The I<destination/type> field specifies the destination MIME media type that "
 "is produced by the filter."
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:37
+#: mime.convs.5:34
 msgid ""
 "The I<cost> field specifies the relative cost for running the filter.  A "
 "value of 100 means that the filter uses a large amount of resources while a "
@@ -13163,34 +13230,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:40
+#: mime.convs.5:37
 msgid ""
 "The I<filter> field specifies the filter program filename.  Filenames are "
 "relative to the CUPS filter directory."
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:42 mime.types.man:92
+#: mime.convs.5:39 mime.types.5:89
 msgid "I</etc/cups> - Typical CUPS configuration directory."
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:44
+#: mime.convs.5:41
 msgid "I</usr/lib/cups/filter> - Typical CUPS filter directory."
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:46
+#: mime.convs.5:43
 msgid "I</usr/libexec/cups/filter> - CUPS filter directory on macOS."
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:48
+#: mime.convs.5:45
 msgid "Define a filter that converts PostScript documents to CUPS Raster format:"
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:51
+#: mime.convs.5:48
 #, no-wrap
 msgid ""
 "    application/vnd.cups-postscript application/vnd.cups-raster 50 "
@@ -13198,37 +13265,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: mime.convs.man:60
+#: mime.convs.5:54
+msgid ""
+"CUPS filters are deprecated and will no longer be supported in a future "
+"feature release of CUPS.  Printers that do not support IPP can be supported "
+"using applications such as B<ippeveprinter>(1)."
+msgstr ""
+
+#. type: Plain text
+#: mime.convs.5:61
 msgid ""
 "B<cups-files.conf>(5), B<cupsd.conf>(5), B<cupsd>(8), B<cupsfilter>(8), "
 "B<mime.types>(5), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: mime.types.man:13
+#: mime.types.5:10
 #, no-wrap
 msgid "mime.types"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:16
+#: mime.types.5:13
 msgid "mime.types - mime type description file for cups"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:18
+#: mime.types.5:15
 msgid "The B<mime.types> file defines the recognized file types."
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:20
+#: mime.types.5:17
 msgid ""
 "Additional file types are specified in files with the extension I<.types> in "
 "the CUPS configuration directory."
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:24
+#: mime.types.5:21
 msgid ""
 "Each line in the B<mime.types> file is a comment, blank, or rule line.  "
 "Comment lines start with the # character.  Rule lines start with the MIME "
@@ -13237,20 +13312,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:27
+#: mime.types.5:24
 #, no-wrap
 msgid "    I<mime/type >[ I<rule >... I<rule >]\n"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:30
+#: mime.types.5:27
 msgid ""
 "Rules can be extended over multiple lines using the backslash character "
 "(\\e):"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:34
+#: mime.types.5:31
 #, no-wrap
 msgid ""
 "    I<mime/type >[ I<really-really-really-long-rule >... B<\\e\n"
@@ -13258,7 +13333,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:38
+#: mime.types.5:35
 msgid ""
 "MIME media types specified by the I<mime/type> field are case-insensitive "
 "and are sorted in ascending alphanumeric order for the purposes of "
@@ -13267,7 +13342,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:40
+#: mime.types.5:37
 msgid ""
 "The rules may be grouped using parenthesis, joined using \"+\" for a logical "
 "AND, joined using \",\" or whitespace for a logical OR, and negated using "
@@ -13275,63 +13350,63 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: mime.types.man:40
+#: mime.types.5:37
 #, no-wrap
 msgid "RULES"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:44
+#: mime.types.5:41
 msgid ""
 "Rules take two forms - a filename extension by itself and functions with "
 "test values inside parenthesis.  The following functions are available:"
 msgstr ""
 
 #. type: TP
-#: mime.types.man:44
+#: mime.types.5:41
 #, no-wrap
 msgid "B<match(\">I<pattern>B<\")>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:47
+#: mime.types.5:44
 msgid "True if the filename matches the given shell wildcard I<pattern>."
 msgstr ""
 
 #. type: TP
-#: mime.types.man:47
+#: mime.types.5:44
 #, no-wrap
 msgid "B<ascii(>I<offset>B<,>I<length>B<)>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:50
+#: mime.types.5:47
 msgid ""
 "True if the I<length> bytes starting at I<offset> are valid printable ASCII "
 "(CR, NL, TAB, BS, 32-126)."
 msgstr ""
 
 #. type: TP
-#: mime.types.man:50
+#: mime.types.5:47
 #, no-wrap
 msgid "B<printable(>I<offset>B<,>I<length>B<)>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:53
+#: mime.types.5:50
 msgid ""
 "True if the I<length> bytes starting at I<offset> are printable 8-bit chars "
 "(CR, NL, TAB, BS, 32-126, 128-254)."
 msgstr ""
 
 #. type: TP
-#: mime.types.man:53
+#: mime.types.5:50
 #, no-wrap
 msgid "B<priority(>I<number>B<)>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:58
+#: mime.types.5:55
 msgid ""
 "Specifies the relative priority of this MIME media type.  The default "
 "priority is 100.  Larger values have higher priority while smaller values "
@@ -13339,219 +13414,366 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: mime.types.man:58
+#: mime.types.5:55
 #, no-wrap
 msgid "B<string(>I<offset>B<,\">I<string>B<\")>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:61
+#: mime.types.5:58
 msgid "True if the bytes starting at I<offset> are identical to I<string>."
 msgstr ""
 
 #. type: TP
-#: mime.types.man:61
+#: mime.types.5:58
 #, no-wrap
 msgid "B<istring(>I<offset>B<,\">I<string>B<\")>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:64
+#: mime.types.5:61
 msgid ""
 "True if the bytes starting at I<offset> match I<string> without respect to "
 "case."
 msgstr ""
 
 #. type: TP
-#: mime.types.man:64
+#: mime.types.5:61
 #, no-wrap
 msgid "B<char(>I<offset>B<,>I<value>B<)>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:67
+#: mime.types.5:64
 msgid "True if the byte at I<offset> is identical to I<value>."
 msgstr ""
 
-#. type: TP
-#: mime.types.man:67
-#, no-wrap
-msgid "B<short(>I<offset>B<,>I<value>B<)>"
+#. type: TP
+#: mime.types.5:64
+#, no-wrap
+msgid "B<short(>I<offset>B<,>I<value>B<)>"
+msgstr ""
+
+#. type: Plain text
+#: mime.types.5:67
+msgid "True if the 16-bit big-endian integer at I<offset> is identical to I<value>."
+msgstr ""
+
+#. type: TP
+#: mime.types.5:67
+#, no-wrap
+msgid "B<int(>I<offset>B<,>I<value>B<)>"
+msgstr ""
+
+#. type: Plain text
+#: mime.types.5:70
+msgid "True if the 32-bit big-endian integer at I<offset> is identical to I<value>."
+msgstr ""
+
+#. type: TP
+#: mime.types.5:70
+#, no-wrap
+msgid "B<locale(\">I<string>B<\")>"
+msgstr ""
+
+#. type: Plain text
+#: mime.types.5:73
+msgid "True if current locale matches I<string>."
+msgstr ""
+
+#. type: TP
+#: mime.types.5:73
+#, no-wrap
+msgid "B<contains(>I<offset>B<,>I<range>B<,\">I<string>B<\")>"
+msgstr ""
+
+#. type: Plain text
+#: mime.types.5:76
+msgid ""
+"True if the bytes starting at I<offset> for I<range> bytes contains "
+"I<string>."
+msgstr ""
+
+#. type: SS
+#: mime.types.5:76
+#, no-wrap
+msgid "STRING CONSTANTS"
+msgstr ""
+
+#. type: Plain text
+#: mime.types.5:78
+msgid ""
+"String constants can be specified inside quotes (\"\") for strings "
+"containing whitespace and angle brackets (E<lt>E<gt>) for hexadecimal "
+"strings."
+msgstr ""
+
+#. type: SS
+#: mime.types.5:78
+#, no-wrap
+msgid "TYPE MATCHING AND PRIORITY"
+msgstr ""
+
+#. type: Plain text
+#: mime.types.5:82
+msgid ""
+"When CUPS needs to determine the MIME media type of a given file, it checks "
+"every MIME media type defined in the I<.types> files.  When two or more "
+"types match a given file, the type chosen will depend on the type name and "
+"priority, with higher-priority types being used over lower-priority ones.  "
+"If the types have the same priority, the type names are sorted "
+"alphanumerically in ascending order and the first type is chosen."
+msgstr ""
+
+#. type: Plain text
+#: mime.types.5:87
+msgid ""
+"For example, if two types \"text/bar\" and \"text/foo\" are defined as "
+"matching the extension \"doc\", normally the type \"text/bar\" will be "
+"chosen since its name is alphanumerically smaller than \"text/foo\".  "
+"However, if \"text/foo\" also defines a higher priority than \"text/bar\", "
+"\"text/foo\" will be chosen instead."
+msgstr ""
+
+#. type: Plain text
+#: mime.types.5:91
+msgid ""
+"Define two MIME media types for raster data, with one being a subset with "
+"higher priority:"
+msgstr ""
+
+#. type: Plain text
+#: mime.types.5:96
+#, no-wrap
+msgid ""
+"    application/vnd.cups-raster  string(0,\"RaSt\") string(0,\"tSaR\") \\e\n"
+"                                  string(0,\"RaS2\") string(0,\"2SaR\") "
+"\\e\n"
+"                                  string(0,\"RaS3\") string(0,\"3SaR\")\n"
+msgstr ""
+
+#. type: Plain text
+#: mime.types.5:99
+#, no-wrap
+msgid ""
+"    image/pwg-raster              string(0,\"RaS2\") + \\e\n"
+"                                  string(4,PwgRasterE<lt>00E<gt>) "
+"priority(150)\n"
+msgstr ""
+
+#. type: Plain text
+#: mime.types.5:107
+msgid ""
+"B<cups-files.conf>(5), B<cupsd.conf>(5), B<cupsd>(8), B<cupsfilter>(8), "
+"B<mime.convs>(5), CUPS Online Help (http://localhost:631/help)"
+msgstr ""
+
+#. type: TH
+#: notifier.7:10
+#, no-wrap
+msgid "notifier"
+msgstr ""
+
+#. type: Plain text
+#: notifier.7:13
+msgid "notifier - cups notification interface"
+msgstr ""
+
+#. type: Plain text
+#: notifier.7:19
+msgid "B<notifier> I<recipient> [ I<user-data> ]"
+msgstr ""
+
+#. type: Plain text
+#: notifier.7:22
+msgid ""
+"The CUPS notifier interface provides a standard method for adding support "
+"for new event notification methods to CUPS.  Each notifier delivers one or "
+"more IPP events from the standard input to the specified recipient."
+msgstr ""
+
+#. type: Plain text
+#: notifier.7:31
+msgid ""
+"Notifiers B<MUST> read IPP messages from the standard input using the "
+"B<ippNew>()  and B<ippReadFile>()  functions and exit on error.  Notifiers "
+"are encouraged to exit after a suitable period of inactivity, however they "
+"may exit after reading the first message or stay running until an error is "
+"seen.  Notifiers inherit the environment and can use the logging mechanism "
+"documented in B<filter>(7)."
+msgstr ""
+
+#. type: Plain text
+#: notifier.7:35
+msgid "B<cupsd>(8), B<filter>(7), CUPS Online Help (http://localhost:631/help)"
+msgstr ""
+
+#. type: TH
+#: ppdc.1:10
+#, no-wrap
+msgid "ppdc"
+msgstr ""
+
+#. type: Plain text
+#: ppdc.1:13
+msgid "ppdc - cups ppd compiler (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:70
-msgid "True if the 16-bit big-endian integer at I<offset> is identical to I<value>."
+#: ppdc.1:45
+msgid ""
+"B<ppdc> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] [ "
+"B<-c> I<message-catalog> ] [ B<-d> I<output-directory> ] [ B<-l> "
+"I<language(s)> ] [ B<-m> ] [ B<-t> ] [ B<-v> ] [ B<-z> ] [ B<--cr> ] [ "
+"B<--crlf> ] [ B<--lf> ] I<source-file>"
 msgstr ""
 
-#. type: TP
-#: mime.types.man:70
-#, no-wrap
-msgid "B<int(>I<offset>B<,>I<value>B<)>"
+#. type: Plain text
+#: ppdc.1:48
+msgid ""
+"B<ppdc> compiles PPDC source files into one or more PPD files.  B<This "
+"program is deprecated and will be removed in a future release of CUPS.>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:73
-msgid "True if the 32-bit big-endian integer at I<offset> is identical to I<value>."
+#: ppdc.1:50
+msgid "B<ppdc> supports the following options:"
 msgstr ""
 
 #. type: TP
-#: mime.types.man:73
+#: ppdc.1:50 ppdhtml.1:27 ppdpo.1:30
 #, no-wrap
-msgid "B<locale(\">I<string>B<\")>"
+msgid "B<-D >I<name>[B<=>I<value>]"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:76
-msgid "True if current locale matches I<string>."
+#: ppdc.1:54 ppdhtml.1:31 ppdpo.1:34
+msgid ""
+"Sets the named variable for use in the source file.  It is equivalent to "
+"using the I<#define> directive in the source file."
 msgstr ""
 
 #. type: TP
-#: mime.types.man:76
+#: ppdc.1:54 ppdhtml.1:31 ppdi.1:32 ppdpo.1:34
 #, no-wrap
-msgid "B<contains(>I<offset>B<,>I<range>B<,\">I<string>B<\")>"
+msgid "B<-I >I<include-directory>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:79
+#: ppdc.1:58 ppdhtml.1:35 ppdi.1:36 ppdpo.1:38
 msgid ""
-"True if the bytes starting at I<offset> for I<range> bytes contains "
-"I<string>."
+"Specifies an alternate include directory.  Multiple I<-I> options can be "
+"supplied to add additional directories."
 msgstr ""
 
-#. type: SS
-#: mime.types.man:79
+#. type: TP
+#: ppdc.1:58
 #, no-wrap
-msgid "STRING CONSTANTS"
+msgid "B<-c >I<message-catalog>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:81
+#: ppdc.1:61
 msgid ""
-"String constants can be specified inside quotes (\"\") for strings "
-"containing whitespace and angle brackets (E<lt>E<gt>) for hexadecimal "
-"strings."
+"Specifies a single message catalog file in GNU gettext (filename.po) or "
+"Apple strings (filename.strings) format to be used for localization."
 msgstr ""
 
-#. type: SS
-#: mime.types.man:81
+#. type: TP
+#: ppdc.1:61
 #, no-wrap
-msgid "TYPE MATCHING AND PRIORITY"
+msgid "B<-d >I<output-directory>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:85
+#: ppdc.1:65
 msgid ""
-"When CUPS needs to determine the MIME media type of a given file, it checks "
-"every MIME media type defined in the I<.types> files.  When two or more "
-"types match a given file, the type chosen will depend on the type name and "
-"priority, with higher-priority types being used over lower-priority ones.  "
-"If the types have the same priority, the type names are sorted "
-"alphanumerically in ascending order and the first type is chosen."
+"Specifies the output directory for PPD files.  The default output directory "
+"is \"ppd\"."
 msgstr ""
 
-#. type: Plain text
-#: mime.types.man:90
-msgid ""
-"For example, if two types \"text/bar\" and \"text/foo\" are defined as "
-"matching the extension \"doc\", normally the type \"text/bar\" will be "
-"chosen since its name is alphanumerically smaller than \"text/foo\".  "
-"However, if \"text/foo\" also defines a higher priority than \"text/bar\", "
-"\"text/foo\" will be chosen instead."
+#. type: TP
+#: ppdc.1:65
+#, no-wrap
+msgid "B<-l >I<language(s)>"
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:94
+#: ppdc.1:70
 msgid ""
-"Define two MIME media types for raster data, with one being a subset with "
-"higher priority:"
+"Specifies one or more languages to use when localizing the PPD file(s).  The "
+"default language is \"en\" (English).  Separate multiple languages with "
+"commas, for example \"de_DE,en_UK,es_ES,es_MX,es_US,fr_CA,fr_FR,it_IT\" will "
+"create PPD files with German, UK English, Spanish (Spain, Mexico, and US), "
+"French (France and Canada), and Italian languages in each file."
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:99
-#, no-wrap
+#: ppdc.1:73
 msgid ""
-"    application/vnd.cups-raster  string(0,\"RaSt\") string(0,\"tSaR\") \\e\n"
-"                                  string(0,\"RaS2\") string(0,\"2SaR\") "
-"\\e\n"
-"                                  string(0,\"RaS3\") string(0,\"3SaR\")\n"
+"Specifies that the output filename should be based on the ModelName value "
+"instead of FileName or PCFilenName."
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:102
-#, no-wrap
-msgid ""
-"    image/pwg-raster              string(0,\"RaS2\") + \\e\n"
-"                                  string(4,PwgRasterE<lt>00E<gt>) "
-"priority(150)\n"
+#: ppdc.1:76
+msgid "Specifies that PPD files should be tested instead of generated."
 msgstr ""
 
 #. type: Plain text
-#: mime.types.man:110
+#: ppdc.1:82
 msgid ""
-"B<cups-files.conf>(5), B<cupsd.conf>(5), B<cupsd>(8), B<cupsfilter>(8), "
-"B<mime.convs>(5), CUPS Online Help (http://localhost:631/help)"
+"Specifies verbose output, basically a running status of which files are "
+"being loaded or written.  B<-z> Generates compressed PPD files "
+"(filename.ppd.gz).  The default is to generate uncompressed PPD files."
 msgstr ""
 
-#. type: TH
-#: notifier.man:13
+#. type: TP
+#: ppdc.1:82
 #, no-wrap
-msgid "notifier"
+msgid "B<--cr>"
 msgstr ""
 
-#. type: Plain text
-#: notifier.man:16
-msgid "notifier - cups notification interface"
+#. type: TP
+#: ppdc.1:84
+#, no-wrap
+msgid "B<--crlf>"
 msgstr ""
 
-#. type: Plain text
-#: notifier.man:22
-msgid "B<notifier> I<recipient> [ I<user-data> ]"
+#. type: TP
+#: ppdc.1:86
+#, no-wrap
+msgid "B<--lf>"
 msgstr ""
 
 #. type: Plain text
-#: notifier.man:25
+#: ppdc.1:90
 msgid ""
-"The CUPS notifier interface provides a standard method for adding support "
-"for new event notification methods to CUPS.  Each notifier delivers one or "
-"more IPP events from the standard input to the specified recipient."
+"Specifies the line ending to use - carriage return, carriage return and line "
+"feed, or line feed alone.  The default is to use the line feed character "
+"alone."
 msgstr ""
 
 #. type: Plain text
-#: notifier.man:34
+#: ppdc.1:101
 msgid ""
-"Notifiers B<MUST> read IPP messages from the standard input using the "
-"B<ippNew>()  and B<ippReadFile>()  functions and exit on error.  Notifiers "
-"are encouraged to exit after a suitable period of inactivity, however they "
-"may exit after reading the first message or stay running until an error is "
-"seen.  Notifiers inherit the environment and can use the logging mechanism "
-"documented in B<filter>(7)."
-msgstr ""
-
-#. type: Plain text
-#: notifier.man:38
-msgid "B<cupsd>(8), B<filter>(7), CUPS Online Help (http://localhost:631/help)"
+"B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
+"Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: ppdcfile.man:13
+#: ppdcfile.5:10
 #, no-wrap
 msgid "ppdcfile"
 msgstr ""
 
-#. type: TH
-#: ppdcfile.man:13
-#, no-wrap
-msgid "5 March 2016"
-msgstr ""
-
 #. type: Plain text
-#: ppdcfile.man:16
-msgid "ppdcfile - cups ppd compiler source file format"
+#: ppdcfile.5:13
+msgid "ppdcfile - cups ppd compiler source file format (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: ppdcfile.man:20
+#: ppdcfile.5:17
 msgid ""
 "The CUPS PPD compiler reads meta files that contain descriptions of one or "
 "more PPD files to be generated by B<ppdc>(1).  This man page provides a "
@@ -13560,7 +13782,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ppdcfile.man:22
+#: ppdcfile.5:19
 msgid ""
 "The source file format is plain ASCII text that can be edited using your "
 "favorite text editor. Comments are supported using the C (/* ... */) and C++ "
@@ -13568,7 +13790,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ppdcfile.man:24
+#: ppdcfile.5:21
 msgid ""
 "Printer driver information can be grouped and shared using curly braces ({ "
 "... }); PPD files are written when a close brace or end-of-file is seen and "
@@ -13576,7 +13798,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ppdcfile.man:26
+#: ppdcfile.5:23
 msgid ""
 "Directives may be placed anywhere on a line and are followed by one or more "
 "values. The following is a list of the available directives and the values "
@@ -13584,133 +13806,133 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:26
+#: ppdcfile.5:23
 #, no-wrap
 msgid "B<#define >I<name value>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:28
+#: ppdcfile.5:25
 #, no-wrap
 msgid "B<#elif >{I<name >| I<value>}"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:30
+#: ppdcfile.5:27
 #, no-wrap
 msgid "B<#else>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:32
+#: ppdcfile.5:29
 #, no-wrap
 msgid "B<#endif>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:34
+#: ppdcfile.5:31
 #, no-wrap
 msgid "B<#font >I<name encoding \"version\" charset status>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:36
+#: ppdcfile.5:33
 #, no-wrap
 msgid "B<#if >{I<name >| I<value>}"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:38
+#: ppdcfile.5:35
 #, no-wrap
 msgid "B<#include E<lt>>I<filename>B<E<gt>>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:40
+#: ppdcfile.5:37
 #, no-wrap
 msgid "B<#include \">I<filename>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:42
+#: ppdcfile.5:39
 #, no-wrap
 msgid "B<#media >I<name width length>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:44
+#: ppdcfile.5:41
 #, no-wrap
 msgid "B<#media \">I<name>B</>I<text>B<\" >I<width length>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:46
+#: ppdcfile.5:43
 #, no-wrap
 msgid "B<#po >I<locale >B<\">I<filename>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:48
+#: ppdcfile.5:45
 #, no-wrap
 msgid "B<Attribute >I<name >B<\"\" >I<value>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:50
+#: ppdcfile.5:47
 #, no-wrap
 msgid "B<Attribute >I<name keyword value>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:52
+#: ppdcfile.5:49
 #, no-wrap
 msgid "B<Attribute >I<name >B<\">I<keyword>B</>I<text>B<\" >I<value>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:54
+#: ppdcfile.5:51
 #, no-wrap
 msgid "B<Choice >I<name >B<\">I<code>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:56
+#: ppdcfile.5:53
 #, no-wrap
 msgid "B<Choice \">I<name>B</>I<text>B<\" \">I<code>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:58
+#: ppdcfile.5:55
 #, no-wrap
 msgid "B<ColorDevice >I<boolean-value>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:60
+#: ppdcfile.5:57
 #, no-wrap
 msgid "B<ColorModel >I<name colorspace colororder compression>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:62
+#: ppdcfile.5:59
 #, no-wrap
 msgid "B<ColorModel \">I<name>B</>I<text>B<\" >I<colorspace colororder compression>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:64
+#: ppdcfile.5:61
 #, no-wrap
 msgid "B<ColorProfile >I<resolution>B</>I<mediatype gamma density matrix>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:66
+#: ppdcfile.5:63
 #, no-wrap
 msgid "B<Copyright \">I<text>\""
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:68
+#: ppdcfile.5:65
 #, no-wrap
 msgid ""
 "B<CustomMedia >I<name width length left bottom right top "
@@ -13718,7 +13940,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:70
+#: ppdcfile.5:67
 #, no-wrap
 msgid ""
 "B<CustomMedia \">I<name>B</>I<text>B<\" >I<width length left bottom right "
@@ -13726,193 +13948,193 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:72
+#: ppdcfile.5:69
 #, no-wrap
 msgid "B<Cutter >I<boolean-value>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:74
+#: ppdcfile.5:71
 #, no-wrap
 msgid "B<Darkness >I<temperature name>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:76
+#: ppdcfile.5:73
 #, no-wrap
 msgid "B<Darkness >I<temperature >B<\">I<name>B</>I<text>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:78
+#: ppdcfile.5:75
 #, no-wrap
 msgid "B<DriverType >I<type>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:80
+#: ppdcfile.5:77
 #, no-wrap
 msgid "B<Duplex >I<type>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:82
+#: ppdcfile.5:79
 #, no-wrap
 msgid "B<Filter >I<mime-type cost program>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:84
+#: ppdcfile.5:81
 #, no-wrap
 msgid "B<Finishing >I<name>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:86
+#: ppdcfile.5:83
 #, no-wrap
 msgid "B<Finishing \">I<name>B</>I<text>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:88
+#: ppdcfile.5:85
 #, no-wrap
 msgid "B<Font *>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:90
+#: ppdcfile.5:87
 #, no-wrap
 msgid "B<Font >I<name encoding >B<\">I<version>B<\" >I<charset status>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:92
+#: ppdcfile.5:89
 #, no-wrap
 msgid "B<Group >I<name>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:94
+#: ppdcfile.5:91
 #, no-wrap
 msgid "B<Group \">I<name>B</>I<text>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:96
+#: ppdcfile.5:93
 #, no-wrap
 msgid "B<HWMargins >I<left bottom right top>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:98
+#: ppdcfile.5:95
 #, no-wrap
 msgid "B<InputSlot >I<position name>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:100
+#: ppdcfile.5:97
 #, no-wrap
 msgid "B<InputSlot >I<position >B<\">I<name>B</>I<text>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:102
+#: ppdcfile.5:99
 #, no-wrap
 msgid "B<Installable >I<name>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:104
+#: ppdcfile.5:101
 #, no-wrap
 msgid "B<Installable \">I<name>B</>I<text>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:106
+#: ppdcfile.5:103
 #, no-wrap
 msgid "B<LocAttribute >I<name >B<\">I<keyword>B</>I<text>B<\" >I<value>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:108
+#: ppdcfile.5:105
 #, no-wrap
 msgid "B<ManualCopies >I<boolean-value>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:110
+#: ppdcfile.5:107
 #, no-wrap
 msgid "B<Manufacturer \">I<name>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:112
+#: ppdcfile.5:109
 #, no-wrap
 msgid "B<MaxSize >I<width length>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:114
+#: ppdcfile.5:111
 #, no-wrap
 msgid "B<MediaSize >I<name>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:116
+#: ppdcfile.5:113
 #, no-wrap
 msgid "B<MediaType >I<type name>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:118
+#: ppdcfile.5:115
 #, no-wrap
 msgid "B<MediaType >I<type >B<\">I<name>B</>I<text>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:120
+#: ppdcfile.5:117
 #, no-wrap
 msgid "B<MinSize >I<width length>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:122
+#: ppdcfile.5:119
 #, no-wrap
 msgid "B<ModelName \">I<name>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:124
+#: ppdcfile.5:121
 #, no-wrap
 msgid "B<ModelNumber >I<number>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:126
+#: ppdcfile.5:123
 #, no-wrap
 msgid "B<Option >I<name type section order>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:128
+#: ppdcfile.5:125
 #, no-wrap
 msgid "B<Option \">I<name>B</>I<text>B<\" >I<type section order>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:130
+#: ppdcfile.5:127
 #, no-wrap
 msgid "B<PCFileName \">I<filename.ppd>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:132
+#: ppdcfile.5:129
 #, no-wrap
 msgid "B<Resolution >I<colorspace bits-per-color row-count row-feed row-step name>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:134
+#: ppdcfile.5:131
 #, no-wrap
 msgid ""
 "B<Resolution >I<colorspace bits-per-color row-count row-feed row-step "
@@ -13920,7 +14142,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:136
+#: ppdcfile.5:133
 #, no-wrap
 msgid ""
 "B<SimpleColorProfile >I<resolution>B</>I<mediatype density yellow-density "
@@ -13928,227 +14150,74 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:138
+#: ppdcfile.5:135
 #, no-wrap
 msgid "B<Throughput >I<pages-per-minute>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:140
+#: ppdcfile.5:137
 #, no-wrap
 msgid "B<UIConstraints \">I<*Option1 *Option2>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:142
+#: ppdcfile.5:139
 #, no-wrap
 msgid "B<UIConstraints \">I<*Option1 Choice1 *Option2>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:144
+#: ppdcfile.5:141
 #, no-wrap
 msgid "B<UIConstraints \">I<*Option1 *Option2 Choice2>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:146
+#: ppdcfile.5:143
 #, no-wrap
 msgid "B<UIConstraints \">I<*Option1 Choice1 *Option2 Choice2>B<\">"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:148
+#: ppdcfile.5:145
 #, no-wrap
 msgid "B<VariablePaperSize >I<boolean-value>"
 msgstr ""
 
 #. type: TP
-#: ppdcfile.man:150
+#: ppdcfile.5:147
 #, no-wrap
 msgid "B<Version >I<number>"
 msgstr ""
 
 #. type: Plain text
-#: ppdcfile.man:159
+#: ppdcfile.5:160
 msgid ""
 "B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), CUPS "
 "Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: ppdc.man:13
-#, no-wrap
-msgid "ppdc"
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:16
-msgid "ppdc - cups ppd compiler (deprecated)"
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:48
-msgid ""
-"B<ppdc> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] [ "
-"B<-c> I<message-catalog> ] [ B<-d> I<output-directory> ] [ B<-l> "
-"I<language(s)> ] [ B<-m> ] [ B<-t> ] [ B<-v> ] [ B<-z> ] [ B<--cr> ] [ "
-"B<--crlf> ] [ B<--lf> ] I<source-file>"
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:51
-msgid ""
-"B<ppdc> compiles PPDC source files into one or more PPD files.  B<This "
-"program is deprecated and will be removed in a future release of CUPS.>"
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:53
-msgid "B<ppdc> supports the following options:"
-msgstr ""
-
-#. type: TP
-#: ppdc.man:53 ppdhtml.man:30 ppdpo.man:33
-#, no-wrap
-msgid "B<-D >I<name>[B<=>I<value>]"
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:57 ppdhtml.man:34 ppdpo.man:37
-msgid ""
-"Sets the named variable for use in the source file.  It is equivalent to "
-"using the I<#define> directive in the source file."
-msgstr ""
-
-#. type: TP
-#: ppdc.man:57 ppdhtml.man:34 ppdi.man:35 ppdpo.man:37
-#, no-wrap
-msgid "B<-I >I<include-directory>"
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:61 ppdhtml.man:38 ppdi.man:39 ppdpo.man:41
-msgid ""
-"Specifies an alternate include directory.  Multiple I<-I> options can be "
-"supplied to add additional directories."
-msgstr ""
-
-#. type: TP
-#: ppdc.man:61
-#, no-wrap
-msgid "B<-c >I<message-catalog>"
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:64
-msgid ""
-"Specifies a single message catalog file in GNU gettext (filename.po) or "
-"Apple strings (filename.strings) format to be used for localization."
-msgstr ""
-
-#. type: TP
-#: ppdc.man:64
-#, no-wrap
-msgid "B<-d >I<output-directory>"
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:68
-msgid ""
-"Specifies the output directory for PPD files.  The default output directory "
-"is \"ppd\"."
-msgstr ""
-
-#. type: TP
-#: ppdc.man:68
-#, no-wrap
-msgid "B<-l >I<language(s)>"
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:73
-msgid ""
-"Specifies one or more languages to use when localizing the PPD file(s).  The "
-"default language is \"en\" (English).  Separate multiple languages with "
-"commas, for example \"de_DE,en_UK,es_ES,es_MX,es_US,fr_CA,fr_FR,it_IT\" will "
-"create PPD files with German, UK English, Spanish (Spain, Mexico, and US), "
-"French (France and Canada), and Italian languages in each file."
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:76
-msgid ""
-"Specifies that the output filename should be based on the ModelName value "
-"instead of FileName or PCFilenName."
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:79
-msgid "Specifies that PPD files should be tested instead of generated."
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:85
-msgid ""
-"Specifies verbose output, basically a running status of which files are "
-"being loaded or written.  B<-z> Generates compressed PPD files "
-"(filename.ppd.gz).  The default is to generate uncompressed PPD files."
-msgstr ""
-
-#. type: TP
-#: ppdc.man:85
-#, no-wrap
-msgid "B<--cr>"
-msgstr ""
-
-#. type: TP
-#: ppdc.man:87
-#, no-wrap
-msgid "B<--crlf>"
-msgstr ""
-
-#. type: TP
-#: ppdc.man:89
-#, no-wrap
-msgid "B<--lf>"
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:93
-msgid ""
-"Specifies the line ending to use - carriage return, carriage return and line "
-"feed, or line feed alone.  The default is to use the line feed character "
-"alone."
-msgstr ""
-
-#. type: Plain text
-#: ppdc.man:100
-msgid ""
-"B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
-"Online Help (http://localhost:631/help)"
-msgstr ""
-
-#. type: TH
-#: ppdhtml.man:13
+#: ppdhtml.1:10
 #, no-wrap
 msgid "ppdhtml"
 msgstr ""
 
 #. type: Plain text
-#: ppdhtml.man:16
+#: ppdhtml.1:13
 msgid "ppdhtml - cups html summary generator (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: ppdhtml.man:25
+#: ppdhtml.1:22
 msgid ""
 "B<ppdhtml> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] "
 "I<source-file>"
 msgstr ""
 
 #. type: Plain text
-#: ppdhtml.man:28
+#: ppdhtml.1:25
 msgid ""
 "B<ppdhtml> reads a driver information file and produces a HTML summary page "
 "that lists all of the drivers in a file and the supported options.  B<This "
@@ -14156,37 +14225,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ppdhtml.man:30
+#: ppdhtml.1:27
 msgid "B<ppdhtml> supports the following options:"
 msgstr ""
 
 #. type: Plain text
-#: ppdhtml.man:45
+#: ppdhtml.1:46
 msgid ""
 "B<ppdc>(1), B<ppdcfile>(5), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), CUPS "
 "Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: ppdi.man:13
+#: ppdi.1:10
 #, no-wrap
 msgid "ppdi"
 msgstr ""
 
 #. type: Plain text
-#: ppdi.man:16
+#: ppdi.1:13
 msgid "ppdi - import ppd files (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: ppdi.man:29
+#: ppdi.1:26
 msgid ""
 "B<ppdi> [ B<-I> I<include-directory> ] [ B<-o> I<source-file> ] I<ppd-file> "
 "[ ...  I<ppd-file> ]"
 msgstr ""
 
 #. type: Plain text
-#: ppdi.man:33
+#: ppdi.1:30
 msgid ""
 "B<ppdi> imports one or more PPD files into a PPD compiler source file.  "
 "Multiple languages of the same PPD file are merged into a single printer "
@@ -14195,18 +14264,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ppdi.man:35
+#: ppdi.1:32
 msgid "B<ppdi> supports the following options:"
 msgstr ""
 
 #. type: TP
-#: ppdi.man:39
+#: ppdi.1:36
 #, no-wrap
 msgid "B<-o >I<source-file>"
 msgstr ""
 
 #. type: Plain text
-#: ppdi.man:45
+#: ppdi.1:42
 msgid ""
 "Specifies the PPD source file to update.  If the source file does not exist, "
 "a new source file is created.  Otherwise the existing file is merged with "
@@ -14215,32 +14284,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ppdi.man:52
+#: ppdi.1:53
 msgid ""
 "B<ppdc>(1), B<ppdhtml>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
 "Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: ppdmerge.man:13
+#: ppdmerge.1:10
 #, no-wrap
 msgid "ppdmerge"
 msgstr ""
 
 #. type: Plain text
-#: ppdmerge.man:16
+#: ppdmerge.1:13
 msgid "ppdmerge - merge ppd files (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: ppdmerge.man:27
+#: ppdmerge.1:24
 msgid ""
 "B<ppdmerge> [ B<-o> I<output-ppd-file> ] I<ppd-file> I<ppd-file> [ ...  "
 "I<ppd-file> ]"
 msgstr ""
 
 #. type: Plain text
-#: ppdmerge.man:31
+#: ppdmerge.1:28
 msgid ""
 "B<ppdmerge> merges two or more PPD files into a single, multi-language PPD "
 "file.  B<This program is deprecated and will be removed in a future release "
@@ -14248,18 +14317,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ppdmerge.man:33
+#: ppdmerge.1:30
 msgid "B<ppdmerge> supports the following options:"
 msgstr ""
 
 #. type: TP
-#: ppdmerge.man:33
+#: ppdmerge.1:30
 #, no-wrap
 msgid "B<-o >I<output-ppd-file>"
 msgstr ""
 
 #. type: Plain text
-#: ppdmerge.man:38
+#: ppdmerge.1:35
 msgid ""
 "Specifies the PPD file to create.  If not specified, the merged PPD file is "
 "written to the standard output.  If the output file already exists, it is "
@@ -14267,39 +14336,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ppdmerge.man:41
+#: ppdmerge.1:42
 msgid ""
 "B<ppdmerge> does not check whether the merged PPD files are for the same "
 "device.  Merging of different device PPDs will yield unpredictable results."
 msgstr ""
 
 #. type: Plain text
-#: ppdmerge.man:48
+#: ppdmerge.1:49
 msgid ""
 "B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
 "Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: ppdpo.man:13
+#: ppdpo.1:10
 #, no-wrap
 msgid "ppdpo"
 msgstr ""
 
 #. type: Plain text
-#: ppdpo.man:16
+#: ppdpo.1:13
 msgid "ppdpo - ppd message catalog generator (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: ppdpo.man:28
+#: ppdpo.1:25
 msgid ""
 "B<ppdpo> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] [ "
 "B<-o> I<output-file> ] I<source-file>"
 msgstr ""
 
 #. type: Plain text
-#: ppdpo.man:31
+#: ppdpo.1:28
 msgid ""
 "B<ppdpo> extracts UI strings from PPDC source files and updates either a GNU "
 "gettext or macOS strings format message catalog source file for "
@@ -14308,18 +14377,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ppdpo.man:33
+#: ppdpo.1:30
 msgid "B<ppdpo> supports the following options:"
 msgstr ""
 
 #. type: TP
-#: ppdpo.man:41
+#: ppdpo.1:38
 #, no-wrap
 msgid "B<-o >I<output-file>"
 msgstr ""
 
 #. type: Plain text
-#: ppdpo.man:45
+#: ppdpo.1:42
 msgid ""
 "Specifies the output file.  The supported extensions are I<.po> or I<.po.gz> "
 "for GNU gettext format message catalogs and I<.strings> for macOS strings "
@@ -14327,25 +14396,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ppdpo.man:52
+#: ppdpo.1:53
 msgid ""
 "B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdcfile(5),> CUPS "
 "Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: printers.conf.man:13
+#: printers.conf.5:9
 #, no-wrap
 msgid "printers.conf"
 msgstr ""
 
 #. type: Plain text
-#: printers.conf.man:16
+#: printers.conf.5:12
 msgid "printers.conf - printer configuration file for cups"
 msgstr ""
 
 #. type: Plain text
-#: printers.conf.man:20
+#: printers.conf.5:16
 msgid ""
 "The B<printers.conf> file defines the local printers that are available. It "
 "is normally located in the I</etc/cups> directory and is maintained by the "
@@ -14354,37 +14423,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: printers.conf.man:30
+#: printers.conf.5:27
 msgid ""
-"B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), "
-"B<mime.types>(5), B<subscriptions.conf>(5), CUPS Online Help "
-"(http://localhost:631/help)"
+"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), "
+"B<mime.convs>(5), B<mime.types>(5), B<subscriptions.conf>(5), CUPS Online "
+"Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: TH
-#: subscriptions.conf.man:13
+#: subscriptions.conf.5:10
 #, no-wrap
 msgid "subscriptions.conf"
 msgstr ""
 
 #. type: Plain text
-#: subscriptions.conf.man:16
+#: subscriptions.conf.5:13
 msgid "subscriptions.conf - subscription configuration file for cups"
 msgstr ""
 
 #. type: Plain text
-#: subscriptions.conf.man:20
+#: subscriptions.conf.5:19
 msgid ""
 "The B<subscriptions.conf> file defines the local event notification "
-"subscriptions that are active. It is normally located in the I</etc/cups> "
-"directory and is maintained by the B<cupsd>(8)  program. This file is not "
+"subscriptions that are active.  It is normally located in the I</etc/cups> "
+"directory and is maintained by the B<cupsd>(8)  program.  This file is not "
 "intended to be edited or managed manually."
 msgstr ""
 
 #. type: Plain text
-#: subscriptions.conf.man:30
+#: subscriptions.conf.5:30
 msgid ""
-"B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), "
-"B<mime.types>(5), B<printers.conf>(5), CUPS Online Help "
+"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), "
+"B<mime.convs>(5), B<mime.types>(5), B<printers.conf>(5), CUPS Online Help "
 "(http://localhost:631/help)"
 msgstr ""
diff --git a/debian/manpage-po4a/po/de.po b/debian/manpage-po4a/po/de.po
index e61ff61f0..79b0d5f62 100644
--- a/debian/manpage-po4a/po/de.po
+++ b/debian/manpage-po4a/po/de.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cups man pages 2.2.7-5\n"
-"POT-Creation-Date: 2019-08-17 15:33+0200\n"
+"POT-Creation-Date: 2019-09-02 10:31+0200\n"
 "PO-Revision-Date: 2019-08-18 07:40+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -22,93 +22,94 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: TH
-#: backend.man:13
+#: backend.7:10
 #, no-wrap
 msgid "backend"
 msgstr "Backend"
 
 #. type: TH
-#: backend.man:13 cancel.man:13 classes.conf.man:13 client.conf.man.in:13
-#: cupsaccept.man:13 cupsaddsmb.man.in:13 cups-config.man:13 cupsctl.man:13
-#: cupsd.conf.man.in:13 cupsd-helper.man:13 cupsd-logs.man:13 cupsd.man.in:13
-#: cupsenable.man:13 cups-files.conf.man.in:13 cupsfilter.man:12
-#: cups-lpd.man.in:13 cups.man:13 cups-snmp.conf.man:13 cups-snmp.man.in:12
-#: cupstestdsc.man:13 cupstestppd.man:13 filter.man:13 ippfind.man:12
-#: ../test/ippserver.man:12 ipptoolfile.man:12 ipptool.man:12 lpadmin.man:13
-#: lpc.man:13 lpinfo.man:13 lp.man:13 lpmove.man:13 lpoptions.man.in:13
-#: lpq.man:13 lpr.man:13 lprm.man:13 lpstat.man:13 mailto.conf.man:13
-#: mime.convs.man:13 mime.types.man:13 notifier.man:13 ppdcfile.man:13
-#: ppdc.man:13 ppdhtml.man:13 ppdi.man:13 ppdmerge.man:13 ppdpo.man:13
-#: printers.conf.man:13 subscriptions.conf.man:13
+#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10
+#: cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10
+#: cupsfilter.8:9 cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10
+#: cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ipptool.1:9
+#: ipptoolfile.5:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10 lpmove.8:10
+#: lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9 mailto.conf.5:10
+#: mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10 ppdcfile.5:10
+#: ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10 printers.conf.5:9
+#: subscriptions.conf.5:10
 #, no-wrap
 msgid "CUPS"
 msgstr "CUPS"
 
 #. type: TH
-#: backend.man:13
-#, no-wrap
-msgid "4 April 2014"
-msgstr "4. April 2014"
+#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd-helper.8:10
+#: cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10 cupsfilter.8:9
+#: cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10 cupstestppd.1:10 filter.7:10
+#: ippfind.1:9 ipptool.1:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10
+#: lpmove.8:10 lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9
+#: mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10
+#: ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10
+#: printers.conf.5:9 subscriptions.conf.5:10
+#, fuzzy, no-wrap
+msgid "26 April 2019"
+msgstr "16. April 2014"
 
 #. type: TH
-#: backend.man:13 cancel.man:13 classes.conf.man:13 client.conf.man.in:13
-#: cupsaccept.man:13 cupsaddsmb.man.in:13 cups-config.man:13 cupsctl.man:13
-#: cupsd.conf.man.in:13 cupsd-helper.man:13 cupsd-logs.man:13 cupsd.man.in:13
-#: cupsenable.man:13 cups-files.conf.man.in:13 cupsfilter.man:12
-#: cups-lpd.man.in:13 cups.man:13 cups-snmp.conf.man:13 cups-snmp.man.in:12
-#: cupstestdsc.man:13 cupstestppd.man:13 filter.man:13 ippfind.man:12
-#: ../test/ippserver.man:12 ipptoolfile.man:12 ipptool.man:12 lpadmin.man:13
-#: lpc.man:13 lpinfo.man:13 lp.man:13 lpmove.man:13 lpoptions.man.in:13
-#: lpq.man:13 lpr.man:13 lprm.man:13 lpstat.man:13 mailto.conf.man:13
-#: mime.convs.man:13 mime.types.man:13 notifier.man:13 ppdcfile.man:13
-#: ppdc.man:13 ppdhtml.man:13 ppdi.man:13 ppdmerge.man:13 ppdpo.man:13
-#: printers.conf.man:13 subscriptions.conf.man:13
+#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10
+#: cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10
+#: cupsfilter.8:9 cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10
+#: cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ippfind.1:9
+#: ipptool.1:9 ipptoolfile.5:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10
+#: lpmove.8:10 lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9
+#: mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10
+#: ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10
+#: printers.conf.5:9 subscriptions.conf.5:10
 #, no-wrap
 msgid "Apple Inc."
 msgstr "Apple Inc."
 
 #. type: SH
-#: backend.man:14 cancel.man:14 classes.conf.man:14 client.conf.man.in:14
-#: cupsaccept.man:14 cupsaddsmb.man.in:14 cups-config.man:14 cupsctl.man:14
-#: cupsd.conf.man.in:14 cupsd-helper.man:14 cupsd-logs.man:14 cupsd.man.in:14
-#: cupsenable.man:14 cups-files.conf.man.in:14 cupsfilter.man:13
-#: cups-lpd.man.in:14 cups.man:14 cups-snmp.conf.man:14 cups-snmp.man.in:13
-#: cupstestdsc.man:14 cupstestppd.man:14 filter.man:14 ippfind.man:13
-#: ../test/ippserver.man:13 ipptoolfile.man:13 ipptool.man:13 lpadmin.man:14
-#: lpc.man:14 lpinfo.man:14 lp.man:14 lpmove.man:14 lpoptions.man.in:14
-#: lpq.man:14 lpr.man:14 lprm.man:14 lpstat.man:14 mailto.conf.man:14
-#: mime.convs.man:14 mime.types.man:14 notifier.man:14 ppdcfile.man:14
-#: ppdc.man:14 ppdhtml.man:14 ppdi.man:14 ppdmerge.man:14 ppdpo.man:14
-#: printers.conf.man:14 subscriptions.conf.man:14
+#: backend.7:11 cancel.1:11 classes.conf.5:11 client.conf.5:11 cups.1:11
+#: cupsaccept.8:11 cups-config.1:11 cupsctl.8:11 cupsd.8:11 cupsd.conf.5:11
+#: cupsd-helper.8:11 cupsd-logs.5:11 cupsenable.8:11 cups-files.conf.5:11
+#: cupsfilter.8:10 cups-lpd.8:11 cups-snmp.8:10 cups-snmp.conf.5:11
+#: cupstestppd.1:11 filter.7:11 ippevepcl.7:10 ippeveprinter.1:10 ippfind.1:10
+#: ipptool.1:10 ipptoolfile.5:10 lp.1:11 lpadmin.8:11 lpc.8:11 lpinfo.8:11
+#: lpmove.8:11 lpoptions.1:11 lpq.1:11 lpr.1:11 lprm.1:11 lpstat.1:10
+#: mailto.conf.5:11 mime.convs.5:11 mime.types.5:11 notifier.7:11 ppdc.1:11
+#: ppdcfile.5:11 ppdhtml.1:11 ppdi.1:11 ppdmerge.1:11 ppdpo.1:11
+#: printers.conf.5:10 subscriptions.conf.5:11
 #, no-wrap
 msgid "NAME"
 msgstr "NAME"
 
 #. type: Plain text
-#: backend.man:16
+#: backend.7:13
 msgid "backend - cups backend transmission interfaces"
 msgstr "backend - CUPS Backend-Übertragungsschnittstellen"
 
 #. type: SH
-#: backend.man:16 cancel.man:16 cupsaccept.man:16 cupsaddsmb.man.in:17
-#: cups-config.man:16 cupsctl.man:16 cupsd-helper.man:16 cupsd.man.in:16
-#: cupsenable.man:16 cupsfilter.man:15 cups-lpd.man.in:16 cups-snmp.man.in:15
-#: cupstestdsc.man:16 cupstestppd.man:16 filter.man:16 ippfind.man:15
-#: ../test/ippserver.man:15 ipptool.man:15 lpadmin.man:16 lpc.man:16
-#: lpinfo.man:16 lp.man:16 lpmove.man:16 lpoptions.man.in:16 lpq.man:16
-#: lpr.man:16 lprm.man:16 lpstat.man:16 notifier.man:16 ppdc.man:16
-#: ppdhtml.man:16 ppdi.man:16 ppdmerge.man:16 ppdpo.man:16
+#: backend.7:13 cancel.1:13 cupsaccept.8:13 cups-config.1:13 cupsctl.8:13
+#: cupsd.8:13 cupsd-helper.8:13 cupsenable.8:13 cupsfilter.8:12 cups-lpd.8:13
+#: cups-snmp.8:12 cupstestppd.1:13 filter.7:13 ippevepcl.7:12
+#: ippeveprinter.1:12 ippfind.1:12 ipptool.1:12 lp.1:13 lpadmin.8:13 lpc.8:13
+#: lpinfo.8:13 lpmove.8:13 lpoptions.1:13 lpq.1:13 lpr.1:13 lprm.1:13
+#: lpstat.1:12 notifier.7:13 ppdc.1:13 ppdhtml.1:13 ppdi.1:13 ppdmerge.1:13
+#: ppdpo.1:13
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SYNOPSIS"
 
 #. type: Plain text
-#: backend.man:18
+#: backend.7:15
 msgid "B<backend>"
 msgstr "B<backend>"
 
 #. type: Plain text
-#: backend.man:28
+#: backend.7:25
 msgid ""
 "B<backend> I<job> I<user> I<title> I<num-copies> I<options> [ I<filename> ]"
 msgstr ""
@@ -116,19 +117,19 @@ msgstr ""
 "[ I<Dateiname> ]"
 
 #. type: Plain text
-#: backend.man:31 filter.man:29
+#: backend.7:28 filter.7:26
 #, no-wrap
 msgid "B<#include E<lt>cups/cups.hE<gt>>\n"
 msgstr "B<#include E<lt>cups/cups.hE<gt>>\n"
 
 #. type: Plain text
-#: backend.man:33
+#: backend.7:30
 #, no-wrap
 msgid "B<const char *cupsBackendDeviceURI>(B<char **>I<argv>);\n"
 msgstr "B<const char *cupsBackendDeviceURI>(B<char **>I<argv>);\n"
 
 #. type: Plain text
-#: backend.man:40
+#: backend.7:37
 #, no-wrap
 msgid ""
 "B<void cupsBackendReport>(B<const char *>I<device_scheme>,\n"
@@ -146,7 +147,7 @@ msgstr ""
 "                       B<const char *>I<device_location>);\n"
 
 #. type: Plain text
-#: backend.man:43
+#: backend.7:40
 #, no-wrap
 msgid ""
 "B<ssize_t cupsBackChannelWrite>(B<const char *>I<buffer>,\n"
@@ -156,7 +157,7 @@ msgstr ""
 "                             B<size_t >I<bytes>, B<double >I<timeout>);\n"
 
 #. type: Plain text
-#: backend.man:47
+#: backend.7:44
 #, no-wrap
 msgid ""
 "B<int cupsSideChannelRead>(B<cups_sc_command_t *>I<command>,\n"
@@ -168,7 +169,7 @@ msgstr ""
 "                        B<int *>I<datalen>, B<double >I<timeout>);\n"
 
 #. type: Plain text
-#: backend.man:51
+#: backend.7:48
 #, no-wrap
 msgid ""
 "B<int cupsSideChannelWrite>(B<cups_sc_command_t >I<command>,\n"
@@ -180,24 +181,22 @@ msgstr ""
 "                         B<int >I<datalen>, B<double >I<timeout>);\n"
 
 #. type: SH
-#: backend.man:52 cancel.man:40 classes.conf.man:16 client.conf.man.in:16
-#: cupsaccept.man:43 cupsaddsmb.man.in:50 cups-config.man:52 cupsctl.man:39
-#: cupsd.conf.man.in:16 cupsd-helper.man:49 cupsd-logs.man:16 cupsd.man.in:35
-#: cupsenable.man:49 cups-files.conf.man.in:16 cupsfilter.man:57
-#: cups-lpd.man.in:26 cups.man:16 cups-snmp.conf.man:16 cups-snmp.man.in:26
-#: cupstestdsc.man:31 cupstestppd.man:54 filter.man:54 ippfind.man:35
-#: ../test/ippserver.man:62 ipptoolfile.man:15 ipptool.man:75 lpadmin.man:57
-#: lpc.man:23 lpinfo.man:63 lp.man:87 lpmove.man:40 lpoptions.man.in:56
-#: lpq.man:34 lpr.man:56 lprm.man:34 lpstat.man:69 mailto.conf.man:16
-#: mime.convs.man:16 mime.types.man:16 notifier.man:22 ppdcfile.man:16
-#: ppdc.man:48 ppdhtml.man:25 ppdi.man:29 ppdmerge.man:27 ppdpo.man:28
-#: printers.conf.man:16 subscriptions.conf.man:16
+#: backend.7:49 cancel.1:37 classes.conf.5:13 client.conf.5:13 cups.1:13
+#: cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:13
+#: cupsd-helper.8:46 cupsd-logs.5:13 cupsenable.8:46 cups-files.conf.5:13
+#: cupsfilter.8:54 cups-lpd.8:23 cups-snmp.8:23 cups-snmp.conf.5:13
+#: cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:79 ippfind.1:32
+#: ipptool.1:75 ipptoolfile.5:12 lp.1:84 lpadmin.8:54 lpc.8:20 lpinfo.8:60
+#: lpmove.8:37 lpoptions.1:53 lpq.1:31 lpr.1:53 lprm.1:31 lpstat.1:65
+#: mailto.conf.5:13 mime.convs.5:13 mime.types.5:13 notifier.7:19 ppdc.1:45
+#: ppdcfile.5:13 ppdhtml.1:22 ppdi.1:26 ppdmerge.1:24 ppdpo.1:25
+#: printers.conf.5:12 subscriptions.conf.5:13
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
 
 #. type: Plain text
-#: backend.man:56
+#: backend.7:53
 msgid ""
 "Backends are a special type of B<filter>(7)  which is used to send print "
 "data to and discover different devices on the system."
@@ -207,7 +206,7 @@ msgstr ""
 "Geräte zu ermitteln."
 
 #. type: Plain text
-#: backend.man:58
+#: backend.7:55
 msgid ""
 "Like filters, backends must be capable of reading from a filename on the "
 "command-line or from the standard input, copying the standard input to a "
@@ -219,11 +218,11 @@ msgstr ""
 "gefordert wird."
 
 #. type: Plain text
-#: backend.man:66
+#: backend.7:64
 #, fuzzy
 msgid ""
 "The command name (I<argv[0]>) is set to the device URI of the destination "
-"printer. Authentication information in I<argv[0]> is removed, so backend "
+"printer.  Authentication information in I<argv[0]> is removed, so backend "
 "developers are urged to use the B<DEVICE_URI> environment variable whenever "
 "authentication information is required. The B<cupsBackendDeviceURI>()  "
 "function may be used to retrieve the correct device URI."
@@ -236,7 +235,7 @@ msgstr ""
 "der korrekten Geräte-URI verwandt werden."
 
 #. type: Plain text
-#: backend.man:68
+#: backend.7:66
 msgid ""
 "Back-channel data from the device should be relayed to the job filters using "
 "the I<cupsBackChannelWrite> function."
@@ -245,7 +244,7 @@ msgstr ""
 "der Funktion I<cupsBackChannelWrite> weitergeleitet werden."
 
 #. type: Plain text
-#: backend.man:76
+#: backend.7:74
 msgid ""
 "Backends are responsible for reading side-channel requests using the "
 "B<cupsSideChannelRead>()  function and responding with the "
@@ -259,18 +258,18 @@ msgstr ""
 "sollte."
 
 #. type: SS
-#: backend.man:76
+#: backend.7:74
 #, no-wrap
 msgid "DEVICE DISCOVERY"
 msgstr "GERÄTE-ERMITTLUNG"
 
 #. type: Plain text
-#: backend.man:78
+#: backend.7:77
 #, fuzzy
 msgid ""
 "When run with no arguments, the backend should list the devices and schemes "
-"it supports or is advertising to the standard output. The output consists of "
-"zero or more lines consisting of any of the following forms:"
+"it supports or is advertising to the standard output.  The output consists "
+"of zero or more lines consisting of any of the following forms:"
 msgstr ""
 "Beim Aufruf ohne Argumente sollte das Backend die Geräte und unterstützten "
 "oder beworbenen Schemata auf der Standardausgabe aufführen. Die Ausgabe "
@@ -278,7 +277,7 @@ msgstr ""
 "vorliegen:"
 
 #. type: Plain text
-#: backend.man:84
+#: backend.7:83
 #, no-wrap
 msgid ""
 "    device-class scheme \"Unknown\" \"device-info\"\n"
@@ -292,7 +291,7 @@ msgstr ""
 "    device-class device-uri \"device-make-and-model\" \"device-info\" \"device-id\" \"device-location\"\n"
 
 #. type: Plain text
-#: backend.man:89
+#: backend.7:88
 msgid ""
 "The B<cupsBackendReport>()  function can be used to generate these lines and "
 "handle any necessary escaping of characters in the various strings."
@@ -302,18 +301,18 @@ msgstr ""
 "Zeichen zu maskieren."
 
 #. type: Plain text
-#: backend.man:93
+#: backend.7:92
 msgid "The I<device-class> field is one of the following values:"
 msgstr "Das Feld I<device-class> enthält einen der folgenden Werte:"
 
 #. type: TP
-#: backend.man:93
+#: backend.7:92
 #, no-wrap
 msgid "B<direct>"
 msgstr "B<direct>"
 
 #. type: Plain text
-#: backend.man:96
+#: backend.7:95
 msgid ""
 "The device-uri refers to a specific direct-access device with no options, "
 "such as a parallel, USB, or SCSI device."
@@ -322,24 +321,24 @@ msgstr ""
 "Optionen, wie z.B. Parallelport-, USB- oder SCSI-Geräte."
 
 #. type: TP
-#: backend.man:96
+#: backend.7:95
 #, no-wrap
 msgid "B<file>"
 msgstr "B<file>"
 
 #. type: Plain text
-#: backend.man:99
+#: backend.7:98
 msgid "The device-uri refers to a file on disk."
 msgstr "Die Geräte-URI bezieht sich auf eine Datei auf dem Speichermedium."
 
 #. type: TP
-#: backend.man:99
+#: backend.7:98
 #, no-wrap
 msgid "B<network>"
 msgstr "B<network>"
 
 #. type: Plain text
-#: backend.man:103
+#: backend.7:102
 msgid ""
 "The device-uri refers to a networked device and conforms to the general form "
 "for network URIs."
@@ -348,17 +347,17 @@ msgstr ""
 "allgemeinen Form für vernetzte URIs."
 
 #. type: TP
-#: backend.man:103
+#: backend.7:102
 #, no-wrap
 msgid "B<serial>"
 msgstr "B<serial>"
 
 #. type: Plain text
-#: backend.man:106
+#: backend.7:106
 #, fuzzy
 msgid ""
 "The device-uri refers to a serial device with configurable baud rate and "
-"other options. If the device-uri contains a baud value, it represents the "
+"other options.  If the device-uri contains a baud value, it represents the "
 "maximum baud rate supported by the device."
 msgstr ""
 "Die Geräte-URI bezieht sich auf ein serielles Gerät mit einer "
@@ -367,13 +366,13 @@ msgstr ""
 "Baudrate."
 
 #. type: Plain text
-#: backend.man:112
+#: backend.7:114
 #, fuzzy
 msgid ""
 "The I<scheme> field provides the URI scheme that is supported by the "
-"backend. Backends should use this form only when the backend supports any "
-"URI using that scheme. The I<device-uri> field specifies the full URI to use "
-"when communicating with the device."
+"backend.  Backends should use this form only when the backend supports any "
+"URI using that scheme.  The I<device-uri> field specifies the full URI to "
+"use when communicating with the device."
 msgstr ""
 "Das Feld I<scheme> stellt das vom Backend unterstützte URI-Schema bereit. "
 "Backends sollten diese Form nur verwenden, wenn das Backend jede dem Schema "
@@ -381,11 +380,11 @@ msgstr ""
 "bei der Kommunikation mit dem Gerät verwandt werden soll, fest."
 
 #. type: Plain text
-#: backend.man:116
+#: backend.7:119
 #, fuzzy
 msgid ""
 "The I<device-make-and-model> field specifies the make and model of the "
-"device, e.g. \"Example Foojet 2000\". If the make and model is not known, "
+"device, e.g. \"Example Foojet 2000\".  If the make and model is not known, "
 "you must report \"Unknown\"."
 msgstr ""
 "Das Feld I<device-make-and-model> legt die Marke und das Modell des Gerätes, "
@@ -393,10 +392,10 @@ msgstr ""
 "bekannt ist, müssen Sie »Unknown« melden."
 
 #. type: Plain text
-#: backend.man:120
+#: backend.7:124
 #, fuzzy
 msgid ""
-"The I<device-info> field specifies additional information about the device. "
+"The I<device-info> field specifies additional information about the device.  "
 "Typically this includes the make and model along with the port number or "
 "network address, e.g. \"Example Foojet 2000 USB #1\"."
 msgstr ""
@@ -405,7 +404,7 @@ msgstr ""
 "Nummer oder der Netz-Adresse, z.B. »Beispiel Foojet 2000 USB #1«."
 
 #. type: Plain text
-#: backend.man:124
+#: backend.7:128
 msgid ""
 "The optional I<device-id> field specifies the IEEE-1284 device ID string for "
 "the device, which is used to select a matching driver."
@@ -414,7 +413,7 @@ msgstr ""
 "für das Gerät, die zur Auswahl des passenden Treibers verwandt wird, fest."
 
 #. type: Plain text
-#: backend.man:128
+#: backend.7:132
 msgid ""
 "The optional I<device-location> field specifies the physical location of the "
 "device, which is often used to pre-populate the printer-location attribute "
@@ -425,17 +424,17 @@ msgstr ""
 "zu belegen, wenn ein Drucker hinzugefügt wird."
 
 #. type: SS
-#: backend.man:128
+#: backend.7:132
 #, no-wrap
 msgid "PERMISSIONS"
 msgstr "RECHTE"
 
 #. type: Plain text
-#: backend.man:130
+#: backend.7:135
 #, fuzzy
 msgid ""
 "Backends without world read and execute permissions are run as the root "
-"user. Otherwise, the backend is run using an unprivileged user account, "
+"user.  Otherwise, the backend is run using an unprivileged user account, "
 "typically \"lp\"."
 msgstr ""
 "Backends, denen die Lese- und Ausführungsrechte für »world« (andere) fehlen, "
@@ -443,25 +442,25 @@ msgstr ""
 "einem unprivilegierten Benutzerkonto, typischerweise »lp«."
 
 #. type: SH
-#: backend.man:130 cupsfilter.man:105 cupstestppd.man:113 ippfind.man:217
-#: ../test/ippserver.man:130 ipptool.man:186
+#: backend.7:135 cupsfilter.8:102 cupstestppd.1:110 ippevepcl.7:39
+#: ippeveprinter.1:183 ippfind.1:214 ipptool.1:191
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "EXIT-STATUS"
 
 #. type: Plain text
-#: backend.man:132
+#: backend.7:137
 msgid "The following exit codes are defined for backends:"
 msgstr "Die nachfolgenden Exit-Codes sind für Backends definiert:"
 
 #. type: TP
-#: backend.man:132
+#: backend.7:137
 #, no-wrap
 msgid "B<CUPS_BACKEND_OK>"
 msgstr "B<CUPS_BACKEND_OK>"
 
 #. type: Plain text
-#: backend.man:135
+#: backend.7:140
 msgid ""
 "The print file was successfully transmitted to the device or remote server."
 msgstr ""
@@ -469,17 +468,17 @@ msgstr ""
 "übertragen."
 
 #. type: TP
-#: backend.man:135
+#: backend.7:140
 #, no-wrap
 msgid "B<CUPS_BACKEND_FAILED>"
 msgstr "B<CUPS_BACKEND_FAILED>"
 
 #. type: Plain text
-#: backend.man:141
+#: backend.7:147
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted to the device or remote "
-"server. The scheduler will respond to this by canceling the job, retrying "
+"server.  The scheduler will respond to this by canceling the job, retrying "
 "the job, or stopping the queue depending on the state of the I<printer-error-"
 "policy> attribute."
 msgstr ""
@@ -489,17 +488,17 @@ msgstr ""
 "abhängig vom Zustand des Attributs I<printer-error-policy>."
 
 #. type: TP
-#: backend.man:141
+#: backend.7:147
 #, no-wrap
 msgid "B<CUPS_BACKEND_AUTH_REQUIRED>"
 msgstr "B<CUPS_BACKEND_AUTH_REQUIRED>"
 
 #. type: Plain text
-#: backend.man:144
+#: backend.7:151
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because valid authentication "
-"information is required. The scheduler will respond to this by holding the "
+"information is required.  The scheduler will respond to this by holding the "
 "job and adding the 'cups-held-for-authentication' keyword to the \"job-"
 "reasons\" Job Description attribute."
 msgstr ""
@@ -510,51 +509,51 @@ msgstr ""
 "hinzufügen."
 
 #. type: TP
-#: backend.man:144
+#: backend.7:151
 #, no-wrap
 msgid "B<CUPS_BACKEND_HOLD>"
 msgstr "B<CUPS_BACKEND_HOLD>"
 
 #. type: Plain text
-#: backend.man:147
+#: backend.7:155
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because it cannot be printed "
-"at this time. The scheduler will respond to this by holding the job."
+"at this time.  The scheduler will respond to this by holding the job."
 msgstr ""
 "Die Druckdatei wurde nicht erfolgreich übertragen, da sie derzeit nicht "
 "gedruckt werden kann. Der Auftragsplaner wird darauf durch Halten des "
 "Auftrags reagieren."
 
 #. type: TP
-#: backend.man:147
+#: backend.7:155
 #, no-wrap
 msgid "B<CUPS_BACKEND_STOP>"
 msgstr "B<CUPS_BACKEND_STOP>"
 
 #. type: Plain text
-#: backend.man:150
+#: backend.7:159
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because it cannot be printed "
-"at this time. The scheduler will respond to this by stopping the queue."
+"at this time.  The scheduler will respond to this by stopping the queue."
 msgstr ""
 "Die Druckdatei wurde nicht erfolgreich übertragen, da sie derzeit nicht "
 "gedruckt werden kann. Der Auftragsplaner wird durch Anhalten der "
 "Warteschlange darauf reagieren."
 
 #. type: TP
-#: backend.man:150
+#: backend.7:159
 #, no-wrap
 msgid "B<CUPS_BACKEND_CANCEL>"
 msgstr "B<CUPS_BACKEND_CANCEL>"
 
 #. type: Plain text
-#: backend.man:153
+#: backend.7:163
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because one or more "
-"attributes are not supported or the job was canceled at the printer. The "
+"attributes are not supported or the job was canceled at the printer.  The "
 "scheduler will respond to this by canceling the job."
 msgstr ""
 "Die Druckdatei wurde nicht erfolgreich übertragen, da eine oder mehrere der "
@@ -562,17 +561,17 @@ msgstr ""
 "wurde. Der Auftragsplaner wird durch Abbruch des Auftrages darauf reagieren."
 
 #. type: TP
-#: backend.man:153
+#: backend.7:163
 #, no-wrap
 msgid "B<CUPS_BACKEND_RETRY>"
 msgstr "B<CUPS_BACKEND_RETRY>"
 
 #. type: Plain text
-#: backend.man:156
+#: backend.7:167
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because of a temporary "
-"issue. The scheduler will retry the job at a future time - other jobs may "
+"issue.  The scheduler will retry the job at a future time - other jobs may "
 "print before this one."
 msgstr ""
 "Die Druckdatei wurde aufgrund eines temporären Problems nicht erfolgreich "
@@ -581,17 +580,17 @@ msgstr ""
 "werden."
 
 #. type: TP
-#: backend.man:156
+#: backend.7:167
 #, no-wrap
 msgid "B<CUPS_BACKEND_RETRY_CURRENT>"
 msgstr "B<CUPS_BACKEND_RETRY_CURRENT>"
 
 #. type: Plain text
-#: backend.man:159
+#: backend.7:171
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because of a temporary "
-"issue. The scheduler will retry the job immediately without allowing "
+"issue.  The scheduler will retry the job immediately without allowing "
 "intervening jobs."
 msgstr ""
 "Die Druckdatei wurde aufgrund eines temporären Problems nicht erfolgreich "
@@ -599,19 +598,19 @@ msgstr ""
 "ohne andere Aufträge dazwischen zu erlauben."
 
 #. type: Plain text
-#: backend.man:161
+#: backend.7:173
 msgid "All other exit code values are reserved."
 msgstr "Alle anderen Exit-Codes sind reserviert."
 
 #. type: SH
-#: backend.man:161 cupsfilter.man:108 cups.man:63 cups-snmp.man.in:40
-#: ippfind.man:219 ../test/ippserver.man:141
+#: backend.7:173 cups.1:60 cupsfilter.8:105 cups-snmp.8:37 ippevepcl.7:41
+#: ippeveprinter.1:194 ippfind.1:216
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "UMGEBUNG"
 
 #. type: Plain text
-#: backend.man:167
+#: backend.7:179
 msgid ""
 "In addition to the environment variables listed in B<cups>(1)  and "
 "B<filter>(7), CUPS backends can expect the following environment variable:"
@@ -621,49 +620,51 @@ msgstr ""
 "erwarten:"
 
 #. type: TP
-#: backend.man:167
+#: backend.7:179
 #, no-wrap
 msgid "B<DEVICE_URI>"
 msgstr "B<DEVICE_URI>"
 
 #. type: Plain text
-#: backend.man:170
+#: backend.7:182
 msgid "The device URI associated with the printer."
 msgstr "Die mit dem Drucker verbundene Geräte-URI."
 
 #. type: SH
-#: backend.man:170 cupsd-helper.man:59 cupsd.man.in:74 cupsfilter.man:113
-#: cups-lpd.man.in:57 cups.man:117 cups-snmp.man.in:43 ipptool.man:190
-#: lpoptions.man.in:107 mime.convs.man:40 mime.types.man:90
+#: backend.7:182 cups.1:114 cupsd.8:71 cupsd-helper.8:56 cupsfilter.8:110
+#: cups-lpd.8:54 cups-snmp.8:40 ipptool.1:195 lpoptions.1:104 mime.convs.5:37
+#: mime.types.5:87
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: Plain text
-#: backend.man:172
+#: backend.7:184
 msgid "I</etc/cups/cups-files.conf>"
 msgstr "I</etc/cups/cups-files.conf>"
 
 #. type: SH
-#: backend.man:172 cancel.man:84 classes.conf.man:20 client.conf.man.in:86
-#: cupsfilter.man:120 cups-lpd.man.in:63 cupstestdsc.man:35 filter.man:204
-#: lpadmin.man:199 lpc.man:43 lpr.man:187 ppdmerge.man:38 printers.conf.man:20
-#: subscriptions.conf.man:20
+#: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:110
+#: cups.1:122 cupsd.conf.5:858 cupsd-helper.8:77 cups-files.conf.5:273
+#: cupsfilter.8:117 cups-lpd.8:60 cups-snmp.8:44 cups-snmp.conf.5:58
+#: cupstestppd.1:138 filter.7:201 lpadmin.8:203 lpc.8:40 lpinfo.8:117 lpr.1:151
+#: mime.convs.5:50 ppdc.1:90 ppdcfile.5:149 ppdhtml.1:35 ppdi.1:42
+#: ppdmerge.1:35 ppdpo.1:42 printers.conf.5:16 subscriptions.conf.5:19
 #, no-wrap
 msgid "NOTES"
 msgstr "HINWEISE"
 
 #. type: Plain text
-#: backend.man:178
+#: backend.7:192
 #, fuzzy
 msgid ""
-"CUPS backends are not generally designed to be run directly by the user. "
+"CUPS backends are not generally designed to be run directly by the user.  "
 "Aside from the device URI issue ( I<argv[0]> and B<DEVICE_URI> environment "
 "variable contain the device URI), CUPS backends also expect specific "
 "environment variables and file descriptors, and typically run in a user "
-"session that (on macOS) has additional restrictions that affect how it runs. "
-"Backends can also be installed with restricted permissions (0500 or 0700) "
-"that tell the scheduler to run them as the \"root\" user instead of an "
+"session that (on macOS) has additional restrictions that affect how it "
+"runs.  Backends can also be installed with restricted permissions (0500 or "
+"0700) that tell the scheduler to run them as the \"root\" user instead of an "
 "unprivileged user (typically \"lp\") on the system."
 msgstr ""
 "CUPS-Backends wurden im Allgemeinen nicht dafür entwickelt, um vom Benutzer "
@@ -677,13 +678,13 @@ msgstr ""
 "des unprivilegierten Benutzers (typischerweise »lp«) auszuführen."
 
 #. type: Plain text
-#: backend.man:188
+#: backend.7:204
 #, fuzzy
 msgid ""
 "Unless you are a developer and know what you are doing, please do not run "
-"backends directly. Instead, use the B<lp>(1)  or B<lpr>(1)  programs to send "
-"print jobs or B<lpinfo>(8)  to query for available printers using the "
-"backend. The one exception is the SNMP backend - see B<cups-snmp>(8)  for "
+"backends directly.  Instead, use the B<lp>(1)  or B<lpr>(1)  programs to "
+"send print jobs or B<lpinfo>(8)  to query for available printers using the "
+"backend.  The one exception is the SNMP backend - see B<cups-snmp>(8)  for "
 "more information."
 msgstr ""
 "Sofern Sie kein Entwickler sind und nicht wissen, was Sie tun, führen Sie "
@@ -693,25 +694,31 @@ msgstr ""
 "Ausnahme ist das SNMP-Backend - lesen Sie B<cups-snmp>(8) für weitere "
 "Informationen."
 
+#. type: Plain text
+#: backend.7:208 filter.7:205 lpadmin.8:207 lpinfo.8:121
+msgid ""
+"CUPS printer drivers and backends are deprecated and will no longer be "
+"supported in a future feature release of CUPS.  Printers that do not support "
+"IPP can be supported using applications such as B<ippeveprinter>(1)."
+msgstr ""
+
 #. type: SH
-#: backend.man:188 cancel.man:87 classes.conf.man:22 client.conf.man.in:98
-#: cupsaccept.man:80 cupsaddsmb.man.in:119 cups-config.man:107 cupsctl.man:95
-#: cupsd.conf.man.in:869 cupsd-helper.man:80 cupsd-logs.man:219
-#: cupsd.man.in:112 cupsenable.man:91 cups-files.conf.man.in:276
-#: cupsfilter.man:130 cups-lpd.man.in:111 cups.man:125 cups-snmp.conf.man:60
-#: cups-snmp.man.in:49 cupstestdsc.man:41 cupstestppd.man:141 filter.man:211
-#: ippfind.man:258 ../test/ippserver.man:164 ipptoolfile.man:646
-#: ipptool.man:241 lpadmin.man:210 lpc.man:48 lpinfo.man:120 lp.man:255
-#: lpmove.man:69 lpoptions.man.in:113 lpq.man:59 lpr.man:207 lprm.man:77
-#: lpstat.man:144 mailto.conf.man:43 mime.convs.man:53 mime.types.man:103
-#: notifier.man:34 ppdcfile.man:152 ppdc.man:93 ppdhtml.man:38 ppdi.man:45
-#: ppdmerge.man:41 ppdpo.man:45 printers.conf.man:22 subscriptions.conf.man:22
+#: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:122 cups.1:126
+#: cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:895
+#: cupsd-helper.8:81 cupsd-logs.5:216 cupsenable.8:88 cups-files.conf.5:280
+#: cupsfilter.8:131 cups-lpd.8:111 cups-snmp.8:49 cups-snmp.conf.5:62
+#: cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:251
+#: ippfind.1:255 ipptool.1:246 ipptoolfile.5:649 lp.1:219 lpadmin.8:224
+#: lpc.8:47 lpinfo.8:121 lpmove.8:66 lpoptions.1:110 lpq.1:56 lpr.1:171
+#: lprm.1:74 lpstat.1:140 mailto.conf.5:40 mime.convs.5:54 mime.types.5:100
+#: notifier.7:31 ppdc.1:94 ppdcfile.5:153 ppdhtml.1:39 ppdi.1:46 ppdmerge.1:42
+#: ppdpo.1:46 printers.conf.5:18 subscriptions.conf.5:21
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: backend.man:197
+#: backend.7:217
 msgid ""
 "I<cups>(1), I<cups-files.conf>(5), I<cups-snmp>(8), I<cupsd>(8), "
 "I<filter>(7), I<lp>(1), I<lpinfo>(8), I<lpr>(1),"
@@ -720,62 +727,52 @@ msgstr ""
 "I<filter>(7), I<lp>(1), I<lpinfo>(8), I<lpr>(1),"
 
 #. type: Plain text
-#: backend.man:199 cupsaccept.man:88 cupsctl.man:100 filter.man:219
-#: lpmove.man:76
+#: backend.7:219 cupsaccept.8:85 cupsctl.8:97 filter.7:220 lpmove.8:73
 msgid "CUPS Online Help (http://localhost:631/help)"
 msgstr "CUPS-Online-Hilfe (http://localhost:631/help)"
 
 #. type: SH
-#: backend.man:199 cancel.man:93 classes.conf.man:30 client.conf.man.in:102
-#: cupsaccept.man:88 cupsaddsmb.man.in:125 cups-config.man:110 cupsctl.man:100
-#: cupsd.conf.man.in:878 cupsd-helper.man:88 cupsd-logs.man:224
-#: cupsd.man.in:128 cupsenable.man:99 cups-files.conf.man.in:286
-#: cupsfilter.man:137 cups-lpd.man.in:118 cups.man:141 cups-snmp.conf.man:63
-#: cups-snmp.man.in:55 cupstestdsc.man:45 cupstestppd.man:145 filter.man:219
-#: ippfind.man:260 ../test/ippserver.man:166 ipptoolfile.man:651
-#: ipptool.man:246 lpadmin.man:216 lpc.man:58 lpinfo.man:123 lp.man:264
-#: lpmove.man:76 lpoptions.man.in:120 lpq.man:66 lpr.man:216 lprm.man:84
-#: lpstat.man:151 mailto.conf.man:46 mime.convs.man:60 mime.types.man:110
-#: notifier.man:38 ppdcfile.man:159 ppdc.man:100 ppdhtml.man:45 ppdi.man:52
-#: ppdmerge.man:48 ppdpo.man:52 printers.conf.man:30 subscriptions.conf.man:30
+#: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:126 cups.1:142
+#: cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:904
+#: cupsd-helper.8:89 cupsd-logs.5:221 cupsenable.8:96 cups-files.conf.5:290
+#: cupsfilter.8:138 cups-lpd.8:118 cups-snmp.8:55 cups-snmp.conf.5:65
+#: cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:255
+#: ippfind.1:257 ipptool.1:251 ipptoolfile.5:654 lp.1:228 lpadmin.8:230
+#: lpc.8:57 lpinfo.8:124 lpmove.8:73 lpoptions.1:117 lpq.1:63 lpr.1:180
+#: lprm.1:81 lpstat.1:147 mailto.conf.5:43 mime.convs.5:61 mime.types.5:107
+#: notifier.7:35 ppdc.1:101 ppdcfile.5:160 ppdhtml.1:46 ppdi.1:53 ppdmerge.1:49
+#: ppdpo.1:53 printers.conf.5:27 subscriptions.conf.5:30
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 #. type: Plain text
-#: backend.man:200 cancel.man:94 classes.conf.man:31 client.conf.man.in:103
-#: cupsaccept.man:89 cupsaddsmb.man.in:126 cups-config.man:111 cupsctl.man:101
-#: cupsd-helper.man:89 cupsd.man.in:129 cupsenable.man:100 cupsfilter.man:138
-#: cups-lpd.man.in:119 cups.man:142 cups-snmp.conf.man:64 cups-snmp.man.in:56
-#: cupstestdsc.man:46 cupstestppd.man:146 filter.man:220 ipptool.man:247
-#: lpc.man:59 lpinfo.man:124 lp.man:265 lpmove.man:77 lpq.man:67 lpr.man:217
-#: lprm.man:85 lpstat.man:152 mailto.conf.man:47 mime.convs.man:61
-#: mime.types.man:111 notifier.man:39 ppdcfile.man:160 ppdc.man:101
-#: ppdhtml.man:46 ppdi.man:53 ppdmerge.man:49 ppdpo.man:53 printers.conf.man:31
-#: subscriptions.conf.man:31
-msgid "Copyright \\[co] 2007-2017 by Apple Inc."
-msgstr "Copyright \\[co] 2007-2017 by Apple Inc."
+#: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:127 cups.1:143
+#: cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:905
+#: cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cups-files.conf.5:291
+#: cupsfilter.8:139 cups-lpd.8:119 cups-snmp.8:56 cups-snmp.conf.5:66
+#: cupstestppd.1:147 filter.7:221 ippeveprinter.1:256 ipptool.1:252
+#: ipptoolfile.5:655 lp.1:229 lpadmin.8:231 lpc.8:58 lpinfo.8:125 lpmove.8:74
+#: lpoptions.1:118 lpq.1:64 lpr.1:181 lprm.1:82 lpstat.1:148 mailto.conf.5:44
+#: mime.convs.5:62 mime.types.5:108 notifier.7:36 ppdc.1:102 ppdcfile.5:161
+#: ppdhtml.1:47 ppdi.1:54 ppdmerge.1:50 ppdpo.1:54 printers.conf.5:28
+#: subscriptions.conf.5:31
+msgid "Copyright \\[co] 2007-2019 by Apple Inc."
+msgstr "Copyright \\[co] 2007-2019 by Apple Inc."
 
 #. type: TH
-#: cancel.man:13
+#: cancel.1:10
 #, no-wrap
 msgid "cancel"
 msgstr "cancel"
 
-#. type: TH
-#: cancel.man:13 classes.conf.man:13 cups-config.man:13 cupsd-helper.man:13
-#: printers.conf.man:13 subscriptions.conf.man:13
-#, no-wrap
-msgid "15 April 2014"
-msgstr "15. April 2014"
-
 #. type: Plain text
-#: cancel.man:16
+#: cancel.1:13
 msgid "cancel - cancel jobs"
 msgstr "cancel - Aufträge abbrechen"
 
 #. type: Plain text
-#: cancel.man:40
+#: cancel.1:37
 msgid ""
 "B<cancel> [ B<-E> ] [ B<-U> I<username> ] [ B<-a> ] [ B<-h> I<hostname[:"
 "port]> ] [ B<-u> I<username> ] [ B<-x> ] [ I<id> ] [ I<destination> ] "
@@ -786,7 +783,7 @@ msgstr ""
 "Id> ]"
 
 #. type: Plain text
-#: cancel.man:43
+#: cancel.1:40
 msgid ""
 "The B<cancel> command cancels print jobs.  If no I<destination> or I<id> is "
 "specified, the currently printing job on the default destination is canceled."
@@ -796,30 +793,29 @@ msgstr ""
 "abgebrochen."
 
 #. type: SH
-#: cancel.man:43 cupsaccept.man:53 cupsaddsmb.man.in:99 cups-config.man:55
-#: cupsctl.man:43 cupsd.conf.man.in:479 cupsd.man.in:40 cupsenable.man:54
-#: cupsfilter.man:62 cups-lpd.man.in:35 cupstestppd.man:61 filter.man:63
-#: ippfind.man:194 ../test/ippserver.man:65 ipptool.man:88 lpadmin.man:76
-#: lpinfo.man:66 lp.man:97 lpmove.man:42 lpoptions.man.in:71 lpq.man:39
-#: lpr.man:67 lprm.man:39 lpstat.man:72 ppdc.man:51 ppdhtml.man:28 ppdi.man:33
-#: ppdmerge.man:31 ppdpo.man:31
+#: cancel.1:40 cupsaccept.8:50 cups-config.1:52 cupsctl.8:40 cupsd.8:37
+#: cupsd.conf.5:485 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:32
+#: cupstestppd.1:58 filter.7:60 ippeveprinter.1:82 ippfind.1:191 ipptool.1:88
+#: lp.1:94 lpadmin.8:73 lpinfo.8:63 lpmove.8:39 lpoptions.1:68 lpq.1:36
+#: lpr.1:64 lprm.1:36 lpstat.1:68 ppdc.1:48 ppdhtml.1:25 ppdi.1:30
+#: ppdmerge.1:28 ppdpo.1:28
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONEN"
 
 #. type: Plain text
-#: cancel.man:45
+#: cancel.1:42
 msgid "The following options are recognized by B<cancel>:"
 msgstr "Die folgenden Optionen werden von B<cancel> erkannt:"
 
 #. type: TP
-#: cancel.man:45 cupsaddsmb.man.in:108 lpq.man:50
+#: cancel.1:42 lpq.1:47
 #, no-wrap
 msgid "B<-a>"
 msgstr "B<-a>"
 
 #. type: Plain text
-#: cancel.man:49
+#: cancel.1:46
 msgid ""
 "Cancel all jobs on the named destination, or all jobs on all destinations if "
 "none is provided."
@@ -828,77 +824,77 @@ msgstr ""
 "Zielen, falls kein Ziel angegeben ist) ab."
 
 #. type: TP
-#: cancel.man:49 cupsaccept.man:58 cupsctl.man:45 cupsenable.man:56
-#: ipptool.man:120 lpadmin.man:183 lpinfo.man:68 lp.man:102 lpmove.man:44
-#: lpoptions.man.in:73 lpq.man:41 lpr.man:69 lprm.man:43 lpstat.man:74
+#: cancel.1:46 cupsaccept.8:55 cupsctl.8:42 cupsenable.8:53 ipptool.1:125
+#: lp.1:99 lpadmin.8:175 lpinfo.8:65 lpmove.8:41 lpoptions.1:70 lpq.1:38
+#: lpr.1:66 lprm.1:40 lpstat.1:70
 #, no-wrap
 msgid "B<-E>"
 msgstr "B<-E>"
 
 #. type: Plain text
-#: cancel.man:52 cupsaccept.man:61 lpinfo.man:71 lp.man:105 lpmove.man:47
-#: lpq.man:44 lpr.man:72 lprm.man:46 lpstat.man:77
+#: cancel.1:49 cupsaccept.8:58 lp.1:102 lpinfo.8:68 lpmove.8:44 lpq.1:41
+#: lpr.1:69 lprm.1:43 lpstat.1:73
 msgid "Forces encryption when connecting to the server."
 msgstr "Erzwingt Verschlüsselung bei Verbindungen zum Server."
 
 #. type: TP
-#: cancel.man:52
+#: cancel.1:49
 #, no-wrap
 msgid "B<-h >I<hostname>[I<:port>]"
 msgstr "B<-h> I<Hostname>[I<:Port>]"
 
 #. type: Plain text
-#: cancel.man:55 lpmove.man:53 lpq.man:56 lpr.man:75 lprm.man:55 lpstat.man:107
+#: cancel.1:52 lpmove.8:50 lpq.1:53 lpr.1:72 lprm.1:52 lpstat.1:103
 msgid "Specifies an alternate server."
 msgstr "Legt einen alternativen Server fest."
 
 #. type: TP
-#: cancel.man:55 cupsaccept.man:61 cupsctl.man:48 cupsenable.man:59 lp.man:105
-#: lpmove.man:47 lpq.man:47 lpr.man:85 lprm.man:49 lpstat.man:83
+#: cancel.1:52 cupsaccept.8:58 cupsctl.8:45 cupsenable.8:56 lp.1:102
+#: lpmove.8:44 lpq.1:44 lpr.1:82 lprm.1:46 lpstat.1:79
 #, no-wrap
 msgid "B<-U >I<username>"
 msgstr "B<-U >I<Benutzername>"
 
 #. type: Plain text
-#: cancel.man:58 lp.man:108
+#: cancel.1:55 lp.1:105
 msgid "Specifies the username to use when connecting to the server."
 msgstr ""
 "Legt den Benutzernamen, der zur Kommunikation mit dem Server verwandt wird, "
 "fest."
 
 #. type: TP
-#: cancel.man:58
+#: cancel.1:55
 #, no-wrap
 msgid "B<-u >I<username>"
 msgstr "B<-u >I<Benutzername>"
 
 #. type: Plain text
-#: cancel.man:61
+#: cancel.1:58
 msgid "Cancels jobs owned by I<username>."
 msgstr "Bricht den Auftrag von I<Benutzername> ab."
 
 #. type: TP
-#: cancel.man:61
+#: cancel.1:58
 #, no-wrap
 msgid "B<-x>"
 msgstr "B<-x>"
 
 #. type: Plain text
-#: cancel.man:64
+#: cancel.1:61
 msgid "Deletes job data files in addition to canceling."
 msgstr "Löscht Auftragsdatendateien zusätzlich zum Abbruch."
 
 #. type: SH
-#: cancel.man:64 cupsaccept.man:70 cupsd.conf.man.in:847 cupsd.man.in:84
-#: cupsenable.man:80 cups-lpd.man.in:49 cups.man:122 cups-snmp.man.in:47
-#: filter.man:202 ../test/ippserver.man:137 ipptool.man:224 lpadmin.man:194
-#: lpinfo.man:100 lp.man:232 lpoptions.man.in:111 lprm.man:55 lpstat.man:137
+#: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:873
+#: cupsenable.8:77 cups-lpd.8:46 cups-snmp.8:47 filter.7:199
+#: ippeveprinter.1:190 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97
+#: lpoptions.1:108 lprm.1:52 lpstat.1:133
 #, no-wrap
 msgid "CONFORMING TO"
 msgstr "KONFORMITÄT"
 
 #. type: Plain text
-#: cancel.man:66
+#: cancel.1:63
 msgid ""
 "Unlike the System V printing system, CUPS allows printer names to contain "
 "any printable character except SPACE, TAB, \"/\", or \"#\". Also, printer "
@@ -909,49 +905,48 @@ msgstr ""
 "sind Drucker- und Klassennamen I<unabhängig> von der Groß-/Kleinschreibung."
 
 #. type: SH
-#: cancel.man:66 cups-config.man:94 cupsctl.man:69 cupsd.conf.man.in:849
-#: cupsd.man.in:87 cupstestppd.man:128 ippfind.man:245
-#: ../test/ippserver.man:148 ipptool.man:228 lpinfo.man:102 lp.man:237
-#: lpmove.man:53 lpr.man:189 lprm.man:59 mime.convs.man:46 mime.types.man:92
+#: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:875
+#: cupstestppd.1:125 ippeveprinter.1:235 ippfind.1:242 ipptool.1:233 lp.1:201
+#: lpinfo.8:99 lpmove.8:50 lpr.1:153 lprm.1:56 mime.convs.5:43 mime.types.5:89
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "BEISPIELE"
 
 #. type: Plain text
-#: cancel.man:68
+#: cancel.1:65
 msgid "Cancel the current print job:"
 msgstr "Den aktuellen Druckauftrag abbrechen:"
 
 #. type: Plain text
-#: cancel.man:71
+#: cancel.1:68
 #, no-wrap
 msgid "    cancel\n"
 msgstr "    cancel\n"
 
 #. type: Plain text
-#: cancel.man:74
+#: cancel.1:71
 msgid "Cancel job \"myprinter-42\":"
 msgstr "Den Druckauftrag »meindrucker-42« abbrechen:"
 
 #. type: Plain text
-#: cancel.man:77
+#: cancel.1:74
 #, no-wrap
 msgid "    cancel myprinter-42\n"
 msgstr "    cancel meindrucker-42\n"
 
 #. type: Plain text
-#: cancel.man:80 lprm.man:73
+#: cancel.1:77 lprm.1:70
 msgid "Cancel all jobs:"
 msgstr "Alle Aufträge abbrechen:"
 
 #. type: Plain text
-#: cancel.man:83
+#: cancel.1:80
 #, no-wrap
 msgid "    cancel -a\n"
 msgstr "    cancel -a\n"
 
 #. type: Plain text
-#: cancel.man:87
+#: cancel.1:84
 msgid ""
 "Administrators wishing to prevent unauthorized cancellation of jobs via the "
 "I<-u> option should require authentication for Cancel-Jobs operations in "
@@ -962,7 +957,7 @@ msgstr ""
 "Authentifizierung für Abbruchvorgänge einstellen."
 
 #. type: Plain text
-#: cancel.man:93
+#: cancel.1:90
 msgid ""
 "B<cupsd.conf>(5), B<lp>(1), B<lpmove>(8), B<lpstat>(1), CUPS Online Help "
 "(http://localhost:631/help)"
@@ -971,23 +966,23 @@ msgstr ""
 "(http://localhost:631/help)"
 
 #. type: TH
-#: classes.conf.man:13
+#: classes.conf.5:10
 #, no-wrap
 msgid "classes.conf"
 msgstr "classes.conf"
 
 #. type: Plain text
-#: classes.conf.man:16
+#: classes.conf.5:13
 msgid "classes.conf - class configuration file for cups"
 msgstr "classes.conf - Klassenkonfigurationsdatei für CUPS"
 
 #. type: Plain text
-#: classes.conf.man:20
+#: classes.conf.5:19
 #, fuzzy
 msgid ""
 "The B<classes.conf> file defines the local printer classes that are "
-"available. It is normally located in the I</etc/cups> directory and is "
-"maintained by the B<cupsd>(8)  program. This file is not intended to be "
+"available.  It is normally located in the I</etc/cups> directory and is "
+"maintained by the B<cupsd>(8)  program.  This file is not intended to be "
 "edited or managed manually."
 msgstr ""
 "Die Datei B<classes.conf> definiert lokal verfügbare Druckerklassen. Sie "
@@ -996,7 +991,7 @@ msgstr ""
 "bearbeitet oder verwaltet zu werden."
 
 #. type: Plain text
-#: classes.conf.man:22 printers.conf.man:22 subscriptions.conf.man:22
+#: classes.conf.5:21 printers.conf.5:18 subscriptions.conf.5:21
 msgid ""
 "The name, location, and format of this file are an implementation detail "
 "that will change in future releases of CUPS."
@@ -1006,7 +1001,7 @@ msgstr ""
 "CUPS ändern."
 
 #. type: Plain text
-#: classes.conf.man:30
+#: classes.conf.5:29
 msgid ""
 "B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime.types>(5), "
 "B<printers.conf>(5), B<subscriptions.conf>(5), CUPS Online Help (http://"
@@ -1017,26 +1012,19 @@ msgstr ""
 "localhost:631/help)"
 
 #. type: TH
-#: client.conf.man.in:13
+#: client.conf.5:10
 #, no-wrap
 msgid "client.conf"
 msgstr "client.conf"
 
-#. type: TH
-#: client.conf.man.in:13
-#, no-wrap
-msgid "19 October 2017"
-msgstr "19. Oktober 2017"
-
 #. type: Plain text
-#: client.conf.man.in:16
+#: client.conf.5:13
 #, fuzzy
-#| msgid "classes.conf - class configuration file for cups"
-msgid "client.conf - client configuration file for cups"
-msgstr "classes.conf - Klassenkonfigurationsdatei für CUPS"
+msgid "client.conf - client configuration file for cups (deprecated on macos)"
+msgstr "client.conf - Client-Konfigurationsdatei für CUPS"
 
 #. type: Plain text
-#: client.conf.man.in:19
+#: client.conf.5:16
 msgid ""
 "The B<client.conf> file configures the CUPS client and is normally located "
 "in the I</etc/cups> and/or I<~/.cups> directories.  Each line in the file "
@@ -1049,7 +1037,7 @@ msgstr ""
 "Kommentar sein. Kommentarzeilen beginnen mit dem Zeichen »#«."
 
 #. type: Plain text
-#: client.conf.man.in:24
+#: client.conf.5:21
 msgid ""
 "B<Note:> Starting with macOS 10.7, this file is only used by command-line "
 "and X11 applications plus the IPP backend.  The B<ServerName> directive is "
@@ -1067,14 +1055,13 @@ msgstr ""
 "Informationen."
 
 #. type: SS
-#: client.conf.man.in:24 cups-files.conf.man.in:25 cups-snmp.conf.man:24
-#: mailto.conf.man:23
+#: client.conf.5:21 cups-files.conf.5:22 cups-snmp.conf.5:21 mailto.conf.5:20
 #, no-wrap
 msgid "DIRECTIVES"
 msgstr "DIREKTIVEN"
 
 #. type: Plain text
-#: client.conf.man.in:26
+#: client.conf.5:23
 msgid ""
 "The following directives are understood by the client. Consult the online "
 "help for detailed descriptions:"
@@ -1083,19 +1070,19 @@ msgstr ""
 "Online-Hilfe für detailliertere Beschreibungen:"
 
 #. type: TP
-#: client.conf.man.in:26
+#: client.conf.5:23
 #, no-wrap
 msgid "B<AllowAnyRoot Yes>"
 msgstr "B<AllowAnyRoot Yes>"
 
 #. type: TP
-#: client.conf.man.in:28
+#: client.conf.5:25
 #, no-wrap
 msgid "B<AllowAnyRoot No>"
 msgstr "B<AllowAnyRoot No>"
 
 #. type: Plain text
-#: client.conf.man.in:32
+#: client.conf.5:29
 msgid ""
 "Specifies whether to allow TLS with certificates that have not been signed "
 "by a trusted Certificate Authority.  The default is \"Yes\"."
@@ -1104,19 +1091,19 @@ msgstr ""
 "Zertifizierungsstelle signiert wurden, erlaubt wird. Die Vorgabe ist »Yes«."
 
 #. type: TP
-#: client.conf.man.in:32
+#: client.conf.5:29
 #, no-wrap
 msgid "B<AllowExpiredCerts Yes>"
 msgstr "B<AllowExpiredCerts Yes>"
 
 #. type: TP
-#: client.conf.man.in:34
+#: client.conf.5:31
 #, no-wrap
 msgid "B<AllowExpiredCerts No>"
 msgstr "B<AllowExpiredCerts No>"
 
 #. type: Plain text
-#: client.conf.man.in:38
+#: client.conf.5:35
 msgid ""
 "Specifies whether to allow TLS with expired certificates.  The default is "
 "\"No\"."
@@ -1125,36 +1112,36 @@ msgstr ""
 "ist »No«."
 
 #. type: TP
-#: client.conf.man.in:38 cupsd.conf.man.in:722
+#: client.conf.5:35 cupsd.conf.5:732
 #, no-wrap
 msgid "B<Encryption IfRequested>"
 msgstr "B<Encryption IfRequested>"
 
 #. type: TP
-#: client.conf.man.in:40 cupsd.conf.man.in:724
+#: client.conf.5:37 cupsd.conf.5:734
 #, no-wrap
 msgid "B<Encryption Never>"
 msgstr "B<Encryption Never>"
 
 #. type: TP
-#: client.conf.man.in:42 cupsd.conf.man.in:726
+#: client.conf.5:39 cupsd.conf.5:736
 #, no-wrap
 msgid "B<Encryption Required>"
 msgstr "B<Encryption Required>"
 
 #. type: Plain text
-#: client.conf.man.in:45
+#: client.conf.5:42
 msgid "Specifies the level of encryption that should be used."
 msgstr "Legt die zu verwendende Verschlüsselungsstufe fest."
 
 #. type: TP
-#: client.conf.man.in:45 cupsd.conf.man.in:161
+#: client.conf.5:42 cupsd.conf.5:165
 #, no-wrap
 msgid "B<GSSServiceName >I<name>"
 msgstr "B<GSSServiceName >I<Name>"
 
 #. type: Plain text
-#: client.conf.man.in:49
+#: client.conf.5:46
 msgid ""
 "Specifies the Kerberos service name that is used for authentication, "
 "typically \"host\", \"http\", or \"ipp\".  CUPS adds the remote hostname "
@@ -1166,19 +1153,19 @@ msgstr ""
 "Standardname lautet »http«."
 
 #. type: TP
-#: client.conf.man.in:49
+#: client.conf.5:46
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]"
 msgstr "B<ServerName >I<Hostname-oder-IP-Adresse>[I<:Port>]"
 
 #. type: TP
-#: client.conf.man.in:51
+#: client.conf.5:48
 #, no-wrap
 msgid "B<ServerName >I</domain/socket>"
 msgstr "B<ServerName >I</Domäne/Socket>"
 
 #. type: Plain text
-#: client.conf.man.in:55
+#: client.conf.5:52
 msgid ""
 "Specifies the address and optionally the port to use when connecting to the "
 "server.  B<Note: This directive is not supported on macOS 10.7 or later.>"
@@ -1188,13 +1175,13 @@ msgstr ""
 "oder neuer nicht unterstützt.>"
 
 #. type: TP
-#: client.conf.man.in:55
+#: client.conf.5:52
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]B</version=1.1>"
 msgstr "B<ServerName >I<Hostname-oder-IP-Adresse>[I<:Port>]B</version=1.1>"
 
 #. type: Plain text
-#: client.conf.man.in:58
+#: client.conf.5:55
 msgid ""
 "Specifies the address and optionally the port to use when connecting to a "
 "server running CUPS 1.3.12 and earlier."
@@ -1203,19 +1190,21 @@ msgstr ""
 "verwandt werden sollen, auf dem CUPS 1.3.12 oder älter läuft, fest."
 
 #. type: TP
-#: client.conf.man.in:58 cupsd.conf.man.in:434
+#: client.conf.5:55 cupsd.conf.5:437
 #, no-wrap
-msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
-msgstr "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
+msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>] [I<MaxTLS1.0>] [I<MaxTLS1.1>] [I<MaxTLS1.2>] [I<MaxTLS1.3>] [I<MinTLS1.0>] [I<MinTLS1.1>] [I<MinTLS1.2>] [I<MinTLS1.3>]"
+msgstr ""
 
 #. type: TP
-#: client.conf.man.in:60 cupsd.conf.man.in:436
+#: client.conf.5:57 cupsd.conf.5:439
 #, no-wrap
 msgid "B<SSLOptions None>"
 msgstr "B<SSLOptions None>"
 
+#. #SSLPort
 #. type: Plain text
-#: client.conf.man.in:71
+#: client.conf.5:71 cupsd.conf.5:454
+#, fuzzy
 msgid ""
 "Sets encryption options (only in /etc/cups/client.conf).  By default, CUPS "
 "only supports encryption using TLS v1.0 or higher using known secure cipher "
@@ -1227,7 +1216,9 @@ msgid ""
 "option enables SSL v3.0, which is required for some older clients that do "
 "not support TLS v1.0.  The I<DenyCBC> option disables all CBC cipher "
 "suites.  The I<DenyTLS1.0> option disables TLS v1.0 support - this sets the "
-"minimum protocol version to TLS v1.1."
+"minimum protocol version to TLS v1.1.  The I<MinTLS> options set the minimum "
+"TLS version to support.  The I<MaxTLS> options set the maximum TLS version "
+"to support.  Not all operating systems support TLS 1.3 at this time."
 msgstr ""
 "Setzt die Verschlüsselungsoptionen (nur in /etc/cups/client.conf). "
 "Standardmäßig unterstützt CUPS nur Verschlüsselung mit TLS v1.0 oder höher "
@@ -1244,19 +1235,19 @@ msgstr ""
 "Protokollversion auf TLS v1.1 gesetzt."
 
 #. type: TP
-#: client.conf.man.in:71
+#: client.conf.5:71
 #, no-wrap
 msgid "B<TrustOnFirstUse Yes>"
 msgstr "B<TrustOnFirstUse Yes>"
 
 #. type: TP
-#: client.conf.man.in:73
+#: client.conf.5:73
 #, no-wrap
 msgid "B<TrustOnFirstUse No>"
 msgstr "B<TrustOnFirstUse No>"
 
 #. type: Plain text
-#: client.conf.man.in:77
+#: client.conf.5:77
 msgid ""
 "Specifies whether to trust new TLS certificates by default.  The default is "
 "\"Yes\"."
@@ -1265,30 +1256,92 @@ msgstr ""
 "Vorgabe ist »Yes«."
 
 #. type: TP
-#: client.conf.man.in:77
+#: client.conf.5:77
 #, no-wrap
 msgid "B<User >I<name>"
 msgstr "B<User >I<Name>"
 
+#. #UserAgentTokens
 #. type: Plain text
-#: client.conf.man.in:80
+#: client.conf.5:81
 msgid "Specifies the default user name to use for requests."
 msgstr "Legt den für Anfragen standardmäßig zu verwendenden Benutzer fest."
 
 #. type: TP
-#: client.conf.man.in:80
+#: client.conf.5:81
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens None>"
+msgstr "B<ServerTokens None>"
+
+#. type: TP
+#: client.conf.5:83
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens ProductOnly>"
+msgstr "B<ServerTokens ProductOnly>"
+
+#. type: TP
+#: client.conf.5:85
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens Major>"
+msgstr "B<ServerTokens Major>"
+
+#. type: TP
+#: client.conf.5:87
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens Minor>"
+msgstr "B<ServerTokens Minor>"
+
+#. type: TP
+#: client.conf.5:89
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens Minimal>"
+msgstr "B<ServerTokens Minimal>"
+
+#. type: TP
+#: client.conf.5:91
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens OS>"
+msgstr "B<ServerTokens OS>"
+
+#. type: TP
+#: client.conf.5:93
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens Full>"
+msgstr "B<ServerTokens Full>"
+
+#. type: Plain text
+#: client.conf.5:104
+#, fuzzy
+msgid ""
+"Specifies what information is included in the User-Agent header of HTTP "
+"requests.  \"None\" disables the User-Agent header.  \"ProductOnly\" reports "
+"\"CUPS\".  \"Major\" reports \"CUPS/major IPP/2\".  \"Minor\" reports \"CUPS/"
+"major.minor IPP/2.1\".  \"Minimal\" reports \"CUPS/major.minor.patch "
+"IPP/2.1\".  \"OS\" reports \"CUPS/major.minor.path (osname osversion) "
+"IPP/2.1\".  \"Full\" reports \"CUPS/major.minor.path (osname osversion; "
+"architecture) IPP/2.1\".  The default is \"Minimal\"."
+msgstr ""
+"Legt fest, welche Informationen in die Server-Kopfzeilen von HTTP-Antworten "
+"aufgenommen werden. »None« deaktiviert die Server-Kopfzeilen. »ProductOnly« "
+"meldet »CUPS«. »Major« berichtet »CUPS 2.0«. »Minimal« berichtet »CUPS "
+"2.0.0«. »OS« berichtet »CUPS 2.0.0 (UNAME)«, wobei UNAME die Ausgabe des "
+"Befehls B<uname>(1) ist. »Full« berichtet »CUPS 2.0.0 (UNAME) IPP/2.0«. Die "
+"Vorgabe ist »Minimal«."
+
+#. type: TP
+#: client.conf.5:104
 #, no-wrap
 msgid "B<ValidateCerts Yes>"
 msgstr "B<ValidateCerts Yes>"
 
 #. type: TP
-#: client.conf.man.in:82
+#: client.conf.5:106
 #, no-wrap
 msgid "B<ValidateCerts No>"
 msgstr "B<ValidateCerts No>"
 
 #. type: Plain text
-#: client.conf.man.in:86
+#: client.conf.5:110
 msgid ""
 "Specifies whether to only allow TLS with certificates whose common name "
 "matches the hostname.  The default is \"No\"."
@@ -1297,7 +1350,7 @@ msgstr ""
 "den Rechnernamen passt. Die Vorgabe ist »No«."
 
 #. type: Plain text
-#: client.conf.man.in:91
+#: client.conf.5:115
 msgid ""
 "The B<client.conf> file is deprecated on macOS and will no longer be "
 "supported in a future version of CUPS.  Configuration settings can instead "
@@ -1309,7 +1362,7 @@ msgstr ""
 "werden:"
 
 #. type: Plain text
-#: client.conf.man.in:94
+#: client.conf.5:118
 #, no-wrap
 msgid ""
 "defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required\n"
@@ -1319,13 +1372,13 @@ msgstr ""
 "defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO\n"
 
 #. type: Plain text
-#: client.conf.man.in:96
+#: client.conf.5:120
 #, no-wrap
 msgid "defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption\n"
 msgstr "defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption\n"
 
 #. type: Plain text
-#: client.conf.man.in:98
+#: client.conf.5:122
 msgid ""
 "On Linux and other systems using GNU TLS, the I</etc/cups/ssl/site.crl> "
 "file, if present, provides a list of revoked X.509 certificates and is used "
@@ -1336,6914 +1389,6511 @@ msgstr ""
 "X.509-Zertifikate. Sie wird dann zur Prüfung von Zertifikaten verwandt."
 
 #. type: Plain text
-#: client.conf.man.in:102
+#: client.conf.5:126
 msgid "B<cups>(1), B<default>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 "B<cups>(1), B<default>(1), CUPS-Online Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: cupsaccept.man:13
-#, no-wrap
-msgid "cupsaccept"
-msgstr "cupsaccept"
-
-#. type: TH
-#: cupsaccept.man:13 cups-snmp.conf.man:13 cups-snmp.man.in:12
+#: cups.1:10
 #, no-wrap
-msgid "10 June 2014"
-msgstr "10. Juni 2014"
+msgid "cups"
+msgstr "cups"
 
 #. type: Plain text
-#: cupsaccept.man:16
-msgid "cupsaccept/cupsreject - accept/reject jobs sent to a destination"
-msgstr ""
-"cupsaccept/cupsreject - Druckaufträge für ein Ziel akzeptieren/ablehnen"
+#: cups.1:13
+msgid "cups - a standards-based, open source printing system"
+msgstr "cups - ein Standard-basiertes, Open-Source-Drucksystem"
 
 #. type: Plain text
-#: cupsaccept.man:28
+#: cups.1:16
 msgid ""
-"B<cupsaccept> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] "
-"I<destination(s)>"
+"B<CUPS> is the software you use to print from applications like word "
+"processors, email readers, photo editors, and web browsers. It converts the "
+"page descriptions produced by your application (put a paragraph here, draw a "
+"line there, and so forth) into something your printer can understand and "
+"then sends the information to the printer for printing."
 msgstr ""
-"B<cupsaccept> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-h> I<Hostname[:"
-"Port]> ] I<Ziel(e)>"
+"B<CUPS> ist die Software, die Sie verwenden, um aus Anwendungen wie "
+"Textverarbeitungen, E-Mail-Programmen, Bildbearbeitungen und Web-Browsern zu "
+"drucken. Sie konvertiert die von Ihrer Anwendung erstellte "
+"Seitenbeschreibung (ein Absatz hier hin setzen, eine Linie dort zeichnen und "
+"so weiter) in etwas, das Ihr Drucker versteht und schickt dann die "
+"Informationen zum Drucker für den Ausdruck."
 
 #. type: Plain text
-#: cupsaccept.man:43
+#: cups.1:22
 msgid ""
-"B<cupsreject> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] "
-"[ B<-r> I<reason> ] I<destination(s)>"
+"Now, since every printer manufacturer does things differently, printing can "
+"be very complicated.  B<CUPS> does its best to hide this from you and your "
+"application so that you can concentrate on printing and less on how to "
+"print. Generally, the only time you need to know anything about your printer "
+"is when you use it for the first time, and even then B<CUPS> can often "
+"figure things out on its own."
 msgstr ""
-"B<cupsreject> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-h> I<Hostname[:"
-"Port]> ] [ B<-r> I<Grund> ] I<Ziel()>"
+"Da jeder Druckerhersteller sein eigenes Vorgehen hat, kann Drucken sehr "
+"kompliziert sein. B<CUPS> tut sein Möglichstes, um dies vor Ihnen und Ihrer "
+"Anwendung zu verstecken, so dass Sie sich auf das Ausdrucken konzentrieren "
+"können und weniger auf die Druck-Einzelheiten. Im Allgemeinen müssen Sie nur "
+"etwas über Ihren Drucker wissen, wenn Sie ihn das erste Mal benutzen, und "
+"selbst dann kann B<CUPS> oft die Details selbst herausfinden."
 
-#. type: Plain text
-#: cupsaccept.man:47
-msgid ""
-"The B<cupsaccept> command instructs the printing system to accept print jobs "
-"to the specified destinations."
-msgstr ""
-"Der Befehl I<cupsaccept> weist das Drucksystem an, Druckaufträge für die "
-"angegebenen Ziele zu akzeptieren."
+#. type: SS
+#: cups.1:22
+#, no-wrap
+msgid "HOW DOES IT WORK?"
+msgstr "WIE FUNKTIONIERT ES?"
 
 #. type: Plain text
-#: cupsaccept.man:53
+#: cups.1:26
 msgid ""
-"The B<cupsreject> command instructs the printing system to reject print jobs "
-"to the specified destinations.  The I<-r> option sets the reason for "
-"rejecting print jobs. If not specified, the reason defaults to \"Reason "
-"Unknown\"."
+"The first time you print to a printer, B<CUPS> creates a queue to keep track "
+"of the current status of the printer (everything OK, out of paper, etc.) and "
+"any pages you have printed. Most of the time the queue points to a printer "
+"connected directly to your computer via a USB port, however it can also "
+"point to a printer on your network, a printer on the Internet, or multiple "
+"printers depending on the configuration. Regardless of where the queue "
+"points, it will look like any other printer to you and your applications."
 msgstr ""
-"Der Befehl I<cupsreject> weist das Drucksystem an, Druckaufträge für die "
-"angegebenen Ziele abzuweisen. Die Option I<-r> setzt den Grund für das "
-"Abweisen der Druckaufträge. Falls nicht angegeben, wird der Grund auf "
-"»Reason Unknown« gesetzt."
+"Wenn Sie das erste Mal auf einem Drucker drucken, erstellt B<CUPS> eine "
+"Warteschlange, um den aktuellen Zustand des Druckers (alles i.O., kein "
+"Papier mehr usw.) und aller ausgedruckten Seiten nachzuvollziehen. Meistens "
+"zeigt die Warteschlange auf einen Drucker, der über eine USB-Schnittstelle "
+"direkt an Ihrem Rechner angebunden ist. Sie kann aber auch auf einen Drucker "
+"im Netz zeigen oder einem Drucker im Internet oder mehreren Druckern "
+"abhängig von der Konfiguration. Unabhängig davon, worauf die Warteschlange "
+"zeigt, wird dies für Sie und Ihre Anwendung wie jeder andere Drucker auch "
+"aussehen."
 
 #. type: Plain text
-#: cupsaccept.man:58
+#: cups.1:32
 msgid ""
-"The following options are supported by both B<cupsaccept> and B<cupsreject>:"
+"Every time you print something, B<CUPS> creates a job which contains the "
+"queue you are sending the print to, the name of the document you are "
+"printing, and the page descriptions. Job are numbered (queue-1, queue-2, and "
+"so forth) so you can monitor the job as it is printed or cancel it if you "
+"see a mistake. When B<CUPS> gets a job for printing, it determines the best "
+"programs (filters, printer drivers, port monitors, and backends) to convert "
+"the pages into a printable format and then runs them to actually print the "
+"job."
 msgstr ""
-"Die folgenden Optionen werden von B<cupsaccept> und B<cupsreject> erkannt:"
+"Jedes Mal, wenn Sie etwas drucken, erstellt B<CUPS> einen Auftrag, der die "
+"Warteschlange enthält, an die Sie den Druck senden, den Namen des Dokuments, "
+"das Sie drucken und die Seitenbeschreibung. Die Aufträge sind nummeriert "
+"(queue-1, queue-2 und so weiter), so dass Sie die Aufträge beim Drucken "
+"überwachen können oder sie abbrechen können, falls Sie einen Fehler gemacht "
+"haben. Wenn B<CUPS> einen Druckauftrag bekommt, bestimmt es das beste "
+"Programm (Filter, Druckertreiber, Port-Monitore und Backends), um die Seiten "
+"in ein druckbares Format zu wandeln. Dann führt es dieses Programm aus, um "
+"den Auftrag tatsächlich zu drucken."
 
 #. type: Plain text
-#: cupsaccept.man:64
-msgid "Sets the username that is sent when connecting to the server."
+#: cups.1:36
+msgid ""
+"When the print job is completely printed, B<CUPS> removes the job from the "
+"queue and moves on to any other jobs you have submitted. You can also be "
+"notified when the job is finished, or if there are any errors during "
+"printing, in several different ways."
 msgstr ""
-"Setzt den Benutzernamen, der bei Verbindungen zum Server gesandt werden wird."
-
-#. type: TP
-#: cupsaccept.man:64
-#, no-wrap
-msgid "B<-h >I<hostname[:port]>"
-msgstr "B<-h >I<Hostname[:Port]>"
-
-#. type: Plain text
-#: cupsaccept.man:67 lp.man:118
-msgid "Chooses an alternate server."
-msgstr "Wählt einen alternativen Server."
+"Wenn der Druckauftrag vollständig gedruckt ist, entfernt B<CUPS> den Auftrag "
+"aus der Warteschlange und fährt mit weiteren von Ihnen eingereichten "
+"Aufträgen fort. Sie können auch darüber auf verschiedene Arten informiert "
+"werden, wenn ein Auftrag abgeschlossen ist oder falls es während des "
+"Druckens Fehler gab."
 
-#. type: TP
-#: cupsaccept.man:67
+#. type: SS
+#: cups.1:36
 #, no-wrap
-msgid "B<-r >\"I<reason>\""
-msgstr "B<-r >\"I<Grund>\""
-
-#. type: Plain text
-#: cupsaccept.man:70
-msgid ""
-"Sets the reason string that is shown for a printer that is rejecting jobs."
-msgstr ""
-"Setzt die Begründungszeichenkette, die für einen Drucker angezeigt wird, der "
-"Druckaufträge abweist."
+msgid "WHERE DO I BEGIN?"
+msgstr "WO FANGE ICH AN?"
 
 #. type: Plain text
-#: cupsaccept.man:78
+#: cups.1:38
 msgid ""
-"The B<cupsaccept> and B<cupsreject> commands correspond to the System V "
-"printing system commands \"accept\" and \"reject\", respectively.  Unlike "
-"the System V printing system, CUPS allows printer names to contain any "
-"printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer and "
-"class names are I<not> case-sensitive."
+"The easiest way to start is by using the web interface to configure your "
+"printer. Go to \"http://localhost:631\" and choose the Administration tab at "
+"the top of the page. Click/press on the Add Printer button and follow the "
+"prompts."
 msgstr ""
-"Die Befehle B<cupsaccept> und B<cupsreject> entsprechend den System-V-"
-"Drucksystembefehlen »accept« respektive »reject«. Anders als das System-V-"
-"Drucksystem erlaubt es CUPS, dass Druckernamen alle druckbaren Zeichen außer "
-"Leertaste, Tabulator, »/« und »#« enthalten. Auch sind Drucker- und "
-"Klassennamen I<unabhängig> von der Groß-/Kleinschreibung."
+"Am einfachsten gelingt der Anfang mit der Weboberfläche, um Ihren Drucker zu "
+"konfigurieren. Öffnen Sie »http://localhost:631« und wählen Sie den Reiter "
+"»Administration« am oberen Ende der Seite aus. Klicken/Drücken Sie auf den "
+"Knopf »Drucker Hinzufügen« und folgen Sie den Abfragen."
 
 #. type: Plain text
-#: cupsaccept.man:80
+#: cups.1:40
 msgid ""
-"Finally, the CUPS versions may ask the user for an access password depending "
-"on the printing system configuration."
+"When you are asked for a username and password, enter your login username "
+"and password or the \"root\" username and password."
 msgstr ""
-"Die CUPS-Versionen könnten den Benutzer zudem, abhängig von der "
-"Konfiguration des Drucksystems, nach einem Zugriffspasswort fragen."
-
-#. type: Plain text
-#: cupsaccept.man:86
-msgid "B<cancel>(1), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), B<lpstat>(1),"
-msgstr "B<cancel>(1), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), B<lpstat>(1),"
-
-#. type: TH
-#: cupsaddsmb.man.in:13
-#, no-wrap
-msgid "cupsaddsmb"
-msgstr "cupsaddsmb"
-
-#. type: TH
-#: cupsaddsmb.man.in:13 cupsenable.man:13 cupsfilter.man:12 cupstestdsc.man:13
-#: cupstestppd.man:13 lpc.man:13
-#, no-wrap
-msgid "11 June 2014"
-msgstr "11. Juni 2014"
-
-#. type: Plain text
-#: cupsaddsmb.man.in:16
-msgid "cupsaddsmb - export printers to samba for windows clients"
-msgstr "cupsaddsmb - exportiere Drucker an Samba für Windows-Clients"
+"Wenn Sie nach einem Benutzernamen und Passwort gefragt werden, geben Sie "
+"Ihren Benutzernamen und Ihr Passwort oder den Benutzernamen »root« und "
+"dessen Passwort ein."
 
 #. type: Plain text
-#: cupsaddsmb.man.in:32
+#: cups.1:42
 msgid ""
-"B<cupsaddsmb> [ B<-H> I<samba-server> ] [ B<-U> I<samba-user[%samba-"
-"password]> ] [ B<-h> I<cups-server[:port]> ] [ B<-v> ] B<-a>"
+"After the printer is added you will be asked to set the default printer "
+"options (paper size, output mode, etc.) for the printer. Make any changes as "
+"needed and then click/press on the Set Default Options button to save them. "
+"Some printers also support auto-configuration - click/press on the Query "
+"Printer for Default Options button to update the options automatically."
 msgstr ""
-"B<cupsaddsmb> [ B<-H> I<Samba-Server> ] [ B<-U> I<Samba-Benutzer[%samba-"
-"Passwort]> ] [ B<-h> I<CUPS-Server[:Port]> ] [ B<-v> ] B<-a>"
+"Nachdem der Drucker hinzugefügt ist, werden Sie gebeten, die "
+"Standarddruckoptionen (Papiergröße, Ausgabemodus usw.) zu setzen. Wählen Sie "
+"die benötigten Optionen und klicken/drücken Sie auf »Standardoptionen "
+"setzten«, um sie zu speichern. Einige Drucker unterstützen auch die "
+"automatische Konfiguration - klicken/drücken Sie auf den Knopf »Drucker "
+"abfragen«, um die Optionen automatisch zu aktualisieren."
 
 #. type: Plain text
-#: cupsaddsmb.man.in:50
+#: cups.1:44
 msgid ""
-"B<cupsaddsmb> [ B<-H> I<samba-server> ] [ B<-U> I<samba-user[%samba-"
-"password]> ] [ B<-h> I<cups-server[:port]> ] [ B<-v> ] I<printer> [ ...  "
-"I<printer> ]"
+"Once you have added the printer, you can print to it from any application. "
+"You can also choose Print Test Page from the maintenance menu to print a "
+"simple test page and verify that everything is working properly."
 msgstr ""
-"B<cupsaddsmb> [ B<-H> I<Samba-Server> ] [ B<-U> I<Samba-Benutzer[%samba-"
-"Passwort]> ] [ B<-h> I<CUPS-Server[:Port]> ] [ B<-v> ] I<Drucker> [ …  "
-"I<Drucker> ]"
+"Sobald Sie den Drucker hinzugefügt haben, können Sie auf ihm von jeder "
+"Anwendung drucken. Sie können auch »Testseite drucken« aus dem "
+"Verwaltungsmenü auswählen, um eine einfache Testseite zu drucken und zu "
+"bestätigen, dass alles korrekt funktioniert."
 
 #. type: Plain text
-#: cupsaddsmb.man.in:54
+#: cups.1:52
 msgid ""
-"The B<cupsaddsmb> program exports printers to the SAMBA software (version "
-"2.2.0 or higher) for use with Windows clients.  Depending on the SAMBA "
-"configuration, you may need to provide a password to export the printers.  "
-"This program requires the Windows printer driver files described below."
+"You can also use the B<lpadmin>(8)  and B<lpinfo>(8)  commands to add "
+"printers to B<CUPS>.  Additionally, your operating system may include "
+"graphical user interfaces or automatically create printer queues when you "
+"connect a printer to your computer."
 msgstr ""
-"Das Programm B<cupsaddsmb> exportiert Drucker an die Samba-Software (Version "
-"2.2.0 oder höher) zur Verwendung mit Windows-Clients. Abhängig von der Samba-"
-"Konfiguration müssen Sie ein Passwort bereitstellen, um die Drucker zu "
-"exportieren. Dieses Programm benötigt die im folgenden beschriebenen Windows-"
-"Treiberdateien."
+"Sie können auch die Befehle B<lpadmin>(8) und B<lpinfo>(8) verwenden, um "
+"Drucker zu B<CUPS> hinzuzufügen. Zusätzlich könnte Ihr Betriebssystem eine "
+"graphische Benutzeroberfläche enthalten oder Druckerwarteschlangen "
+"automatisch erstellen, wenn Sie einen Drucker zum Computer hinzufügen."
 
 #. type: SS
-#: cupsaddsmb.man.in:54
+#: cups.1:52
 #, no-wrap
-msgid "SAMBA CONFIGURATION"
-msgstr "SAMBA-KONFIGURATION"
+msgid "HOW DO I GET HELP?"
+msgstr "WIE ERHALTE ICH HILFE?"
 
 #. type: Plain text
-#: cupsaddsmb.man.in:60
+#: cups.1:60
 msgid ""
-"B<cupsaddsmb> uses the RPC-based printing support in SAMBA to provide "
-"printer drivers and PPD files to Windows client machines.  In order to use "
-"this functionality, you must first configure the SAMBA B<smb.conf>(5)  file "
-"to support printing through CUPS and provide a printer driver download "
-"share, as follows:"
-msgstr ""
-"I<cupsaddsmb> verwendet die RPC-basierte Druck-Unterstützung in SAMBA, um "
-"Windows-Client-Maschinen Druckertreiber und PPD-Dateien bereitzustellen. Um "
-"diese Funktionalität zu benutzen, müssen Sie erst die Datei B<smb.conf>(5) "
-"von SAMBA so konfigurieren, dass das Drucken via CUPS erfolgt, und eine "
-"Freigabe für den Druckertreiber bereitstellt. Diese Konfiguration sieht wie "
-"folgt aus:"
-
-#. type: Plain text
-#: cupsaddsmb.man.in:66
-#, no-wrap
-msgid ""
-"    [global]\n"
-"\tload printers = yes\n"
-"\tprinting = cups\n"
-"\tprintcap name = cups\n"
+"The B<CUPS> web site (http://www.CUPS.org) provides access to the I<cups> "
+"and I<cups-devel> mailing lists, additional documentation and resources, and "
+"a bug report database. Most vendors also provide online discussion forums to "
+"ask printing questions for your operating system of choice."
 msgstr ""
-"    [global]\n"
-"\tload printers = yes\n"
-"\tprinting = cups\n"
-"\tprintcap name = cups\n"
+"Die Website von B<CUPS> (http://www.CUPS.org) bietet Zugriff auf die "
+"Mailinglisten I<cups> und I<cups-devel>, zusätzliche Dokumentation und "
+"zusätzliche Ressourcen und eine Fehlerdatenbank. Die meisten Anbieter "
+"stellen auch Online-Diskussionsforen bereit, bei denen Sie Druck-bezogene "
+"Fragen für Ihr ausgewähltes Betriebssystem stellen können."
 
 #. type: Plain text
-#: cupsaddsmb.man.in:75
-#, no-wrap
+#: cups.1:63
 msgid ""
-"    [printers]\n"
-"\tcomment = All Printers\n"
-"\tpath = /var/spool/samba\n"
-"\tbrowseable = no\n"
-"\tpublic = yes\n"
-"\tguest ok = yes\n"
-"\twritable = no\n"
-"\tprintable = yes\n"
+"B<CUPS> commands use the following environment variables to override the "
+"default locations of files and so forth. For security reasons, these "
+"environment variables are ignored for setuid programs:"
 msgstr ""
-"    [printers]\n"
-"\tcomment = Alle Drucker\n"
-"\tpath = /var/spool/samba\n"
-"\tbrowseable = no\n"
-"\tpublic = yes\n"
-"\tguest ok = yes\n"
-"\twritable = no\n"
-"\tprintable = yes\n"
+"Die B<CUPS>-Befehle benutzen die folgenden Umgebungsvariablen, um die "
+"Vorgabeorte von Dateien und ähnlichem außer Kraft zu setzen. Aus "
+"Sicherheitsgründen werden diese Umgebungsvariablen für »setuid«-Programme "
+"ignoriert."
 
-#. type: Plain text
-#: cupsaddsmb.man.in:83
+#. type: TP
+#: cups.1:63
 #, no-wrap
-msgid ""
-"    [print$]\n"
-"\tcomment = Printer Drivers\n"
-"\tpath = /etc/samba/drivers\n"
-"\tbrowseable = yes\n"
-"\tguest ok = no\n"
-"\tread only = yes\n"
-"\twrite list = root\n"
-msgstr ""
-"    [print$]\n"
-"\tcomment = Druckertreiber\n"
-"\tpath = /etc/samba/drivers\n"
-"\tbrowseable = yes\n"
-"\tguest ok = no\n"
-"\tread only = yes\n"
-"\twrite list = root\n"
+msgid "B<CUPS_ANYROOT>"
+msgstr "B<CUPS_ANYROOT>"
 
 #. type: Plain text
-#: cupsaddsmb.man.in:86
-msgid ""
-"This configuration assumes a FHS-compliant installation of SAMBA; adjust the "
-"[printers] and [print$] share paths accordingly on your system as needed."
-msgstr ""
-"In dieser Konfiguration wird eine FHS-gemäße Installation von SAMBA "
-"angenommen; passen Sie die [printers]- und [print$]-Freigabepfade gemäß der "
-"Notwendigkeiten Ihres Systems an."
+#: cups.1:66
+msgid "Whether to allow any X.509 certificate root (Y or N)."
+msgstr "Ob jede X.509-Zertifikatswurzel erlaubt werden soll (Y oder N)."
 
-#. type: SS
-#: cupsaddsmb.man.in:86
+#. type: TP
+#: cups.1:66 filter.7:156
 #, no-wrap
-msgid "MICROSOFT POSTSCRIPT DRIVERS FOR WINDOWS"
-msgstr "MICROSOFT-POSTSCRIPT-TREIBER FÜR WINDOWS"
-
-#. type: Plain text
-#: cupsaddsmb.man.in:88
-msgid ""
-"The base driver for Windows 2000 and higher is the Microsoft PostScript "
-"driver, which is available on any system running Windows 2000 or higher in "
-"the %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eW32X86\\e3 folder for 32-bit "
-"drivers and %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eX64\\e3 folder for 64-"
-"bit drivers."
-msgstr ""
-"Der Basis-Treiber für Windows 2000 und höher ist der Microsoft PostScript-"
-"Treiber, der auf jedem System, das unter Windows 2000 oder höher läuft, im "
-"Ordner %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eW32X86\\e3 für 32-bit-Treiber "
-"und im Ordner %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eX64\\e3 für 64-bit-"
-"Treiber verfügbar ist."
+msgid "B<CUPS_CACHEDIR>"
+msgstr "B<CUPS_CACHEDIR>"
 
 #. type: Plain text
-#: cupsaddsmb.man.in:90
-msgid ""
-"Copy the 32-bit drivers to the I</usr/share/cups/drivers> directory and the "
-"64-bit drivers to the I</usr/share/cups/drivers/x64> directory exactly as "
-"named below:"
+#: cups.1:69
+msgid "The directory where semi-persistent cache files can be found."
 msgstr ""
-"Kopieren Sie die 32-Bit-Treiber in das Verzeichnis I</usr/share/cups/"
-"drivers> und die 64-Bit-Treiber in das Verzeichnis I</usr/share/cups/drivers/"
-"x64>, genau wie unten benannt:"
+"Das Verzeichnis in dem halb-beständige Zwischenspeicherdateien gefunden "
+"werden können."
 
-#. type: Plain text
-#: cupsaddsmb.man.in:96
+#. type: TP
+#: cups.1:69 filter.7:159
 #, no-wrap
-msgid ""
-"    ps5ui.dll\n"
-"    pscript.hlp\n"
-"    pscript.ntf\n"
-"    pscript5.dll\n"
-msgstr ""
-"    ps5ui.dll\n"
-"    pscript.hlp\n"
-"    pscript.ntf\n"
-"    pscript5.dll\n"
-
-#. type: Plain text
-#: cupsaddsmb.man.in:99
-msgid ""
-"B<Note:> Unlike Windows, case is significant - make sure that you use the "
-"lowercase filenames shown above, otherwise B<cupsaddsmb> will fail to export "
-"the drivers."
-msgstr ""
-"B<Hinweis:> Anders als unter Windows ist die Groß-/Kleinschreibung relevant. "
-"Stellen Sie sicher, dass Sie die Dateinamen wie oben klein schreiben, "
-"andernfalls kann B<cupsaddsmb> die Treiber nicht exportieren."
+msgid "B<CUPS_DATADIR>"
+msgstr "B<CUPS_DATADIR>"
 
 #. type: Plain text
-#: cupsaddsmb.man.in:101
-msgid "B<cupsaddsmb> supports the following options:"
-msgstr "B<cupsaddsmb> unterstützt die folgenden Optionen:"
+#: cups.1:72 filter.7:162
+msgid "The directory where data files can be found."
+msgstr "Das Verzeichnis, in dem Datendateien gefunden werden können."
 
 #. type: TP
-#: cupsaddsmb.man.in:101
+#: cups.1:72
 #, no-wrap
-msgid "B<-H >I<samba-server>"
-msgstr "B<-H >I<Samba-Server>"
+msgid "B<CUPS_ENCRYPTION>"
+msgstr "B<CUPS_ENCRYPTION>"
 
 #. type: Plain text
-#: cupsaddsmb.man.in:104
-msgid "Specifies the SAMBA server which defaults to the CUPS server."
+#: cups.1:75
+msgid "The default level of encryption (Always, IfRequested, Never, Required)."
 msgstr ""
-"Legt den Samba-Server, der standardmäßig auf den CUPS-Server gesetzt wird, "
-"fest."
+"Den Standardgrad an Verschlüsselung (Always, IfRequested, Never, Required)."
 
 #. type: TP
-#: cupsaddsmb.man.in:104
+#: cups.1:75
 #, no-wrap
-msgid "B<-U >I<samba-user>[B<%>I<samba-password>]"
-msgstr "B<-U >I<Samba-Benutzer>[B<%>I<Samba-Passwort>]"
-
-#. type: Plain text
-#: cupsaddsmb.man.in:108
-msgid ""
-"Specifies the SAMBA print admin username which defaults to your current "
-"username.  If the username contains a percent (%) character, then the text "
-"following the percent is treated as the SAMBA password to use."
-msgstr ""
-"Legt den Benutzernamen des Samba-Druck-Administrators, standardmäßig Ihr "
-"aktueller Benutzername, fest. Falls der Benutzername ein Prozentzeichen (%) "
-"enthält, wird der Text, der dem Prozentzeichen folgt, als zu verwendendes "
-"Samba-Passwort behandelt."
+msgid "B<CUPS_EXPIREDCERTS>"
+msgstr "B<CUPS_EXPIREDCERTS>"
 
 #. type: Plain text
-#: cupsaddsmb.man.in:112
-msgid ""
-"Exports all known printers.  Otherwise only the named printers are exported."
-msgstr ""
-"Exportiert alle bekannten Drucker. Andernfalls werden nur die benannten "
-"Drucker exportiert."
+#: cups.1:78
+msgid "Whether to allow expired X.509 certificates (Y or N)."
+msgstr "Ob abgelaufene X.509-Zertifikate erlaubt werden sollen (Y oder N)."
 
 #. type: TP
-#: cupsaddsmb.man.in:112
+#: cups.1:78
 #, no-wrap
-msgid "B<-h >I<cups-server>[B<:>I<port>]"
-msgstr "B<-h >I<CUPS-Server>[B<:>I<port>]"
+msgid "B<CUPS_GSSSERVICENAME>"
+msgstr "B<CUPS_GSSSERVICENAME>"
 
 #. type: Plain text
-#: cupsaddsmb.man.in:115
-msgid "Specifies a different CUPS server to use."
-msgstr "Legt einen anderen zu verwendenden CUPS-Server fest."
+#: cups.1:81
+msgid "The Kerberos service name used for authentication."
+msgstr "Der für die Authentifizierung verwandte Kerberos-Dienstename."
 
 #. type: TP
-#: cupsaddsmb.man.in:115 cupstestppd.man:105 ipptool.man:182 ppdc.man:79
+#: cups.1:81
 #, no-wrap
-msgid "B<-v>"
-msgstr "B<-v>"
-
-#. type: Plain text
-#: cupsaddsmb.man.in:119
-msgid ""
-"Specifies that verbose information should be shown.  This is useful for "
-"debugging SAMBA configuration problems."
-msgstr ""
-"Legt fest, dass ausführliche Informationen angezeigt werden sollen. Dies ist "
-"für die Fehlersuche bei Samba-Konfigurationsproblemen nützlich."
+msgid "B<CUPS_SERVER>"
+msgstr "B<CUPS_SERVER>"
 
 #. type: Plain text
-#: cupsaddsmb.man.in:125
+#: cups.1:84
 msgid ""
-"B<rpcclient>(1), B<smbclient>(1), B<smbd>(8), B<smb.conf>(5), CUPS Online "
-"Help (http://localhost:631/help)"
+"The hostname/IP address and port number of the CUPS scheduler (hostname:port "
+"or ipaddress:port)."
 msgstr ""
-"B<rpcclient>(1), B<smbclient>(1), B<smbd>(8), B<smb.conf>(5), CUPS-Online-"
-"Hilfe (http://localhost:631/help)"
+"Der Hostname/die IP-Adresse und Portnummer des CUPS-Auftragsplaners "
+"(Hostname:Port oder IP-Adresse:Port)."
 
-#. type: TH
-#: cups-config.man:13
+#. type: TP
+#: cups.1:84
 #, no-wrap
-msgid "cups-config"
-msgstr "cups-config"
-
-#. type: Plain text
-#: cups-config.man:16
-msgid "cups-config - get cups api, compiler, directory, and link information."
-msgstr ""
-"cups-config - ermittelt CUPS-API-, -Compiler-, -Verzeichnis- und -Link-"
-"Informationen."
-
-#. type: Plain text
-#: cups-config.man:19
-msgid "B<cups-config> I<--api-version>"
-msgstr "B<cups-config> I<--api-version>"
-
-#. type: Plain text
-#: cups-config.man:22
-msgid "B<cups-config> I<--build>"
-msgstr "B<cups-config> I<--build>"
-
-#. type: Plain text
-#: cups-config.man:25
-msgid "B<cups-config> I<--cflags>"
-msgstr "B<cups-config> I<--cflags>"
-
-#. type: Plain text
-#: cups-config.man:28
-msgid "B<cups-config> I<--datadir>"
-msgstr "B<cups-config> I<--datadir>"
-
-#. type: Plain text
-#: cups-config.man:31
-msgid "B<cups-config> I<--help>"
-msgstr "B<cups-config> I<--help>"
-
-#. type: Plain text
-#: cups-config.man:34
-msgid "B<cups-config> I<--ldflags>"
-msgstr "B<cups-config> I<--ldflags>"
-
-#. type: Plain text
-#: cups-config.man:42
-msgid "B<cups-config> [ I<--image> ] [ I<--static> ] I<--libs>"
-msgstr "B<cups-config> [ I<--image> ] [ I<--static> ] I<--libs>"
-
-#. type: Plain text
-#: cups-config.man:45
-msgid "B<cups-config> I<--serverbin>"
-msgstr "B<cups-config> I<--serverbin>"
-
-#. type: Plain text
-#: cups-config.man:48
-msgid "B<cups-config> I<--serverroot>"
-msgstr "B<cups-config> I<--serverroot>"
-
-#. type: Plain text
-#: cups-config.man:51
-msgid "B<cups-config> I<--version>"
-msgstr "B<cups-config> I<--version>"
+msgid "B<CUPS_SERVERBIN>"
+msgstr "B<CUPS_SERVERBIN>"
 
 #. type: Plain text
-#: cups-config.man:55
+#: cups.1:87
 msgid ""
-"The B<cups-config> command allows application developers to determine the "
-"necessary command-line options for the compiler and linker, as well as the "
-"installation directories for filters, configuration files, and drivers.  All "
-"values are reported to the standard output."
-msgstr ""
-"Der Befehl B<cups-config> erlaubt es Anwendungsentwicklern, die notwendigen "
-"Befehlszeilen-Optionen für den Compiler und Linker zu bestimmen, sowie die "
-"Installationsverzeichnisse für Filter, Konfigurationsdateien und Treiber zu "
-"ermitteln. Alle Werte werden auf die Standardausgabe ausgegeben."
-
-#. type: Plain text
-#: cups-config.man:57
-msgid "The B<cups-config> command accepts the following command-line options:"
+"The directory where server helper programs, filters, backend, etc. can be "
+"found."
 msgstr ""
-"Der Befehl B<cups-config> akzeptiert die folgenden Befehlszeilen-Optionen:"
+"Das Verzeichnis, in dem die Hilfsprogramme des Servers, Filter, Backend usw. "
+"gefunden werden können."
 
 #. type: TP
-#: cups-config.man:57
+#: cups.1:87 filter.7:169
 #, no-wrap
-msgid "B<--api-version>"
-msgstr "B<--api-version>"
+msgid "B<CUPS_SERVERROOT>"
+msgstr "B<CUPS_SERVERROOT>"
 
 #. type: Plain text
-#: cups-config.man:60
-msgid "Reports the current API version (major.minor)."
-msgstr "Berichtet die aktuelle API-Version (Hauptversion.Unterversion)."
+#: cups.1:90 filter.7:172
+msgid "The root directory of the server."
+msgstr "Das Wurzelverzeichnis des Servers."
 
 #. type: TP
-#: cups-config.man:60
+#: cups.1:90
 #, no-wrap
-msgid "B<--build>"
-msgstr "B<--build>"
+msgid "B<CUPS_STATEDIR>"
+msgstr "B<CUPS_STATEDIR>"
 
 #. type: Plain text
-#: cups-config.man:63
-msgid "Reports a system-specific build number."
-msgstr "Berichtet eine systemabhängige Build-Nummer."
+#: cups.1:93
+msgid "The directory where state files can be found."
+msgstr "Das Verzeichnis, in dem Zustandsdateien gefunden werden können."
 
 #. type: TP
-#: cups-config.man:63
+#: cups.1:93
 #, no-wrap
-msgid "B<--cflags>"
-msgstr "B<--cflags>"
+msgid "B<CUPS_USER>"
+msgstr "B<CUPS_USER>"
 
 #. type: Plain text
-#: cups-config.man:66
-msgid "Reports the necessary compiler options."
-msgstr "Berichtet die notwendigen Compiler-Optionen."
+#: cups.1:96
+msgid "Specifies the name of the user for print requests."
+msgstr "Legt den Benutzernamen für Druckanfragen fest."
 
 #. type: TP
-#: cups-config.man:66
+#: cups.1:96
 #, no-wrap
-msgid "B<--datadir>"
-msgstr "B<--datadir>"
+msgid "B<HOME>"
+msgstr "B<HOME>"
 
 #. type: Plain text
-#: cups-config.man:69
-msgid "Reports the default CUPS data directory."
-msgstr "Berichtet das Standard-CUPS-Datenverzeichnis."
+#: cups.1:99
+msgid "Specifies the home directory of the current user."
+msgstr "Legt das Home-Verzeichnis des aktuellen Benutzers fest."
 
 #. type: TP
-#: cups-config.man:69 ippfind.man:196 ipptool.man:91
+#: cups.1:99
 #, no-wrap
-msgid "B<--help>"
-msgstr "B<--help>"
+msgid "B<IPP_PORT>"
+msgstr "B<IPP_PORT>"
 
 #. type: Plain text
-#: cups-config.man:72
-msgid "Reports the program usage message."
-msgstr "Berichtet die Programm-Verwendungshinweise."
+#: cups.1:102
+msgid "Specifies the default port number for IPP requests."
+msgstr "Legt die Standard-Port-Nummer für IPP-Anfragen fest."
 
 #. type: TP
-#: cups-config.man:72
+#: cups.1:102
 #, no-wrap
-msgid "B<--image>"
-msgstr "B<--image>"
+msgid "B<LOCALEDIR>"
+msgstr "B<LOCALEDIR>"
 
 #. type: Plain text
-#: cups-config.man:76
-#, fuzzy
-msgid ""
-"When used with I<--libs>, adds the CUPS imaging library to the list of "
-"libraries."
-msgstr ""
-"Wird dies mit I<--libs> verwandt, wird die CUPS Imaging-Bibliothek zu der "
-"Liste der Bibliotheken hinzugefügt."
+#: cups.1:105
+msgid "Specifies the location of localization files."
+msgstr "Legt den Ort der Lokalisierungsdateien fest."
 
 #. type: TP
-#: cups-config.man:76
+#: cups.1:105
 #, no-wrap
-msgid "B<--ldflags>"
-msgstr "B<--ldflags>"
+msgid "B<LPDEST>"
+msgstr "B<LPDEST>"
 
 #. type: Plain text
-#: cups-config.man:79
-msgid "Reports the necessary linker options."
-msgstr "Berichtet die notwendigen Linker-Optionen."
+#: cups.1:108
+msgid "Specifies the default print queue (System V standard)."
+msgstr "Legt die Standard-Druckwarteschlange (System-V-Standard) fest."
 
 #. type: TP
-#: cups-config.man:79
+#: cups.1:108 filter.7:184
 #, no-wrap
-msgid "B<--libs>"
-msgstr "B<--libs>"
+msgid "B<PRINTER>"
+msgstr "B<PRINTER>"
 
 #. type: Plain text
-#: cups-config.man:82
-msgid "Reports the necessary libraries to link to."
-msgstr "Berichtet die zum Linken notwendigen Bibliotheken."
+#: cups.1:111
+msgid "Specifies the default print queue (Berkeley standard)."
+msgstr "Legt die Standard-Druckwarteschlange (Berkeley-Standard) fest."
 
 #. type: TP
-#: cups-config.man:82
+#: cups.1:111
 #, no-wrap
-msgid "B<--serverbin>"
-msgstr "B<--serverbin>"
+msgid "B<TMPDIR>"
+msgstr "B<TMPDIR>"
 
 #. type: Plain text
-#: cups-config.man:85
-msgid ""
-"Reports the default CUPS binary directory, where filters and backends are "
-"stored."
-msgstr ""
-"Berichtet das Standard-CUPS-Verzeichnis, in dem Filter und Backends "
-"gespeichert werden."
-
-#. type: TP
-#: cups-config.man:85
-#, no-wrap
-msgid "B<--serverroot>"
-msgstr "B<--serverroot>"
+#: cups.1:114
+msgid "Specifies the location of temporary files."
+msgstr "Legt den Ort von temporären Dateien fest."
 
 #. type: Plain text
-#: cups-config.man:88
-msgid "Reports the default CUPS configuration file directory."
-msgstr "Berichtet das Standard-CUPS-Konfigurationsverzeichnis."
-
-#. type: TP
-#: cups-config.man:88
+#: cups.1:118
 #, no-wrap
-msgid "B<--static>"
-msgstr "B<--static>"
+msgid ""
+"I<~/.cups/client.conf>\n"
+"I<~/.cups/lpoptions>\n"
+msgstr ""
+"I<~/.cups/client.conf>\n"
+"I<~/.cups/lpoptions>\n"
 
 #. type: Plain text
-#: cups-config.man:91
+#: cups.1:122
 msgid ""
-"When used with I<--libs>, reports the static libraries instead of the "
-"default (shared) libraries."
-msgstr ""
-"Berichtet die statischen Bibliotheken, statt der Standard "
-"(Laufzeit-)Bibliotheken, wenn mit I<--libs> verwandt."
-
-#. type: TP
-#: cups-config.man:91 ippfind.man:199 ipptool.man:101
-#, no-wrap
-msgid "B<--version>"
-msgstr "B<--version>"
+"B<CUPS> conforms to the Internet Printing Protocol version 2.1 and "
+"implements the Berkeley and System V UNIX print commands."
+msgstr ""
+"B<CUPS> ist zum »Internet Printing Protocol« Version 2.1 konform und "
+"implementiert die Berkeley- und System-V-UNIX-Druckbefehle."
 
 #. type: Plain text
-#: cups-config.man:94
+#: cups.1:126 cupsd-helper.8:81
 msgid ""
-"Reports the full version number of the CUPS installation (major.minor.patch)."
+"CUPS printer drivers, backends, and PPD files are deprecated and will no "
+"longer be supported in a future feature release of CUPS.  Printers that do "
+"not support IPP can be supported using applications such as "
+"B<ippeveprinter>(1)."
 msgstr ""
-"Berichtet die vollständige Versionsnummer der CUPS-Installation "
-"(Hauptversion.Unterversion.Patch)."
-
-#. type: Plain text
-#: cups-config.man:96
-msgid "Show the currently installed version of CUPS:"
-msgstr "Zeigt die aktuell installierte Version von CUPS:"
-
-#. type: Plain text
-#: cups-config.man:99
-#, no-wrap
-msgid "    cups-config --version\n"
-msgstr "    cups-config --version\n"
 
 #. type: Plain text
-#: cups-config.man:102
-msgid "Compile a simple one-file CUPS filter:"
-msgstr "Einen einfachen CUPS-Filter in einer Datei übersetzen:"
-
-#. type: Plain text
-#: cups-config.man:106
-#, no-wrap
+#: cups.1:142
 msgid ""
-"    cc `cups-config --cflags --ldflags` -o filter filter.c \\e\n"
-"        `cups-config --libs`\n"
+"B<cancel>(1), B<client.conf>(7), B<cupsctl>(8), B<cupsd>(8), B<lp>(1), "
+"B<lpadmin>(8), B<lpinfo>(8), B<lpoptions>(1), B<lpr>(1), B<lprm>(1), "
+"B<lpq>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help), CUPS "
+"Web Site (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup "
+"(http://www.pwg.org/ipp)"
 msgstr ""
-"    cc `cups-config --cflags --ldflags` -o filter filter.c \\e\n"
-"        `cups-config --libs`\n"
-
-#. type: Plain text
-#: cups-config.man:110
-msgid "B<cups>(1), CUPS Online Help (http://localhost:631/help)"
-msgstr "B<cups>(1), CUPS-Online-Hilfe (http://localhost:631/help)"
-
-#. type: TH
-#: cupsctl.man:13
-#, no-wrap
-msgid "cupsctl"
-msgstr "cupsctl"
+"B<cancel>(1), B<client.conf>(7), B<cupsctl>(8), B<cupsd>(8), B<lp>(1), "
+"B<lpadmin>(8), B<lpinfo>(8), B<lpoptions>(1), B<lpr>(1), B<lprm>(1), "
+"B<lpq>(1), B<lpstat>(1), CUPS-Online-Hilfe (http://localhost:631/help), CUPS-"
+"Website (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup "
+"(http://www.pwg.org/ipp)"
 
 #. type: TH
-#: cupsctl.man:13
+#: cupsaccept.8:10
 #, no-wrap
-msgid "30 May 2016"
-msgstr "30. Mai 2016"
+msgid "cupsaccept"
+msgstr "cupsaccept"
 
 #. type: Plain text
-#: cupsctl.man:16
-msgid "cupsctl - configure cupsd.conf options"
-msgstr "cupsctl - konfiguriere cupsd.conf-Optionen"
+#: cupsaccept.8:13
+msgid "cupsaccept/cupsreject - accept/reject jobs sent to a destination"
+msgstr ""
+"cupsaccept/cupsreject - Druckaufträge für ein Ziel akzeptieren/ablehnen"
 
 #. type: Plain text
-#: cupsctl.man:39
+#: cupsaccept.8:25
 msgid ""
-"B<cupsctl> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<server>[B<:>I<port>] ] "
-"[ B<-->[B<no->]B<debug-logging> ] [ B<-->[B<no->]B<remote-admin> ] [ B<--"
-">[B<no->]B<remote-any> ] [ B<-->[B<no->]B<share-printers> ] [ B<-->[B<no-"
-">]B<user-cancel-any> ] [ I<name=value> ]"
+"B<cupsaccept> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] "
+"I<destination(s)>"
 msgstr ""
-"B<cupsctl> [ B<-E> ] [ B<-U> I<Benutzer> ] [ B<-h> I<Server>[B<:>I<Port>] ] "
-"[ B<-->[B<no->]B<debug-logging> ] [ B<-->[B<no->]B<remote-admin> ] [ B<--"
-">[B<no->]B<remote-any> ] [ B<-->[B<no->]B<share-printers> ] [ B<-->[B<no-"
-">]B<user-cancel-any> ] [ I<Name=Wert> ]"
+"B<cupsaccept> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-h> I<Hostname[:"
+"Port]> ] I<Ziel(e)>"
 
 #. type: Plain text
-#: cupsctl.man:43
+#: cupsaccept.8:40
 msgid ""
-"B<cupsctl> updates or queries the I<cupsd.conf> file for a server. When no "
-"changes are requested, the current configuration values are written to the "
-"standard output in the format \"name=value\", one per line."
+"B<cupsreject> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] "
+"[ B<-r> I<reason> ] I<destination(s)>"
 msgstr ""
-"B<cupsctl> aktualisiert die Datei I<cupsd.conf> oder ermittelt aus ihr einen "
-"Server. Falls keine Änderungen erbeten wurden, werden die aktuellen "
-"Konfigurationsoptionen, jeweils eine pro Zeile, im Format »Name=Wert« auf "
-"die Standardausgabe geschrieben."
-
-#. type: Plain text
-#: cupsctl.man:45
-msgid "The following options are recognized:"
-msgstr "Die folgenden Optionen werden erkannt:"
+"B<cupsreject> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-h> I<Hostname[:"
+"Port]> ] [ B<-r> I<Grund> ] I<Ziel()>"
 
 #. type: Plain text
-#: cupsctl.man:48
-msgid "Enables encryption on the connection to the scheduler."
+#: cupsaccept.8:44
+msgid ""
+"The B<cupsaccept> command instructs the printing system to accept print jobs "
+"to the specified destinations."
 msgstr ""
-"Aktiviert Verschlüsselung bei der Verbindung mit dem Auftragsplaner "
-"(Scheduler)."
+"Der Befehl I<cupsaccept> weist das Drucksystem an, Druckaufträge für die "
+"angegebenen Ziele zu akzeptieren."
 
 #. type: Plain text
-#: cupsctl.man:51
+#: cupsaccept.8:50
 msgid ""
-"Specifies an alternate username to use when authenticating with the "
-"scheduler."
+"The B<cupsreject> command instructs the printing system to reject print jobs "
+"to the specified destinations.  The I<-r> option sets the reason for "
+"rejecting print jobs. If not specified, the reason defaults to \"Reason "
+"Unknown\"."
 msgstr ""
-"Legt einen alternativen Benutzernamen, der bei Authentifizierung mit dem "
-"Auftragsplaner verwandt werden soll, fest."
-
-#. type: TP
-#: cupsctl.man:51 cupsenable.man:65 lpinfo.man:71 lpmove.man:50
-#: lpoptions.man.in:81 lpq.man:53 lpstat.man:104
-#, no-wrap
-msgid "B<-h >I<server>[B<:>I<port>]"
-msgstr "B<-h> I<Server>[B<:>I<Port>]"
+"Der Befehl I<cupsreject> weist das Drucksystem an, Druckaufträge für die "
+"angegebenen Ziele abzuweisen. Die Option I<-r> setzt den Grund für das "
+"Abweisen der Druckaufträge. Falls nicht angegeben, wird der Grund auf "
+"»Reason Unknown« gesetzt."
 
 #. type: Plain text
-#: cupsctl.man:54
-msgid "Specifies the server address."
-msgstr "Legt die Server-Adresse fest."
-
-#. type: TP
-#: cupsctl.man:54
-#, no-wrap
-msgid "B<-->[B<no->]B<debug-logging>"
-msgstr "B<-->[B<no->]B<debug-logging>"
+#: cupsaccept.8:55
+msgid ""
+"The following options are supported by both B<cupsaccept> and B<cupsreject>:"
+msgstr ""
+"Die folgenden Optionen werden von B<cupsaccept> und B<cupsreject> erkannt:"
 
 #. type: Plain text
-#: cupsctl.man:57
-msgid "Enables (disables) debug logging to the I<error_log> file."
+#: cupsaccept.8:61
+msgid "Sets the username that is sent when connecting to the server."
 msgstr ""
-"Aktiviert (Deaktiviert) das Protokollieren von Fehlersuchmeldungen in der "
-"Datei I<error_log>."
+"Setzt den Benutzernamen, der bei Verbindungen zum Server gesandt werden wird."
 
 #. type: TP
-#: cupsctl.man:57
+#: cupsaccept.8:61
 #, no-wrap
-msgid "B<-->[B<no->]B<remote-admin>"
-msgstr "B<-->[B<no->]B<remote-admin>"
+msgid "B<-h >I<hostname[:port]>"
+msgstr "B<-h >I<Hostname[:Port]>"
 
 #. type: Plain text
-#: cupsctl.man:60
-msgid "Enables (disables) remote administration."
-msgstr "Aktiviert (Deaktiviert) Administration aus der Ferne."
+#: cupsaccept.8:64 lp.1:115
+msgid "Chooses an alternate server."
+msgstr "Wählt einen alternativen Server."
 
 #. type: TP
-#: cupsctl.man:60
+#: cupsaccept.8:64
 #, no-wrap
-msgid "B<-->[B<no->]B<remote-any>"
-msgstr "B<-->[B<no->]B<remote-any>"
+msgid "B<-r >\"I<reason>\""
+msgstr "B<-r >\"I<Grund>\""
 
 #. type: Plain text
-#: cupsctl.man:63
-msgid "Enables (disables) printing from any address, e.g., the Internet."
+#: cupsaccept.8:67
+msgid ""
+"Sets the reason string that is shown for a printer that is rejecting jobs."
 msgstr ""
-"Aktiviert (Deaktiviert) Drucken von beliebigen Adressen, z.B. aus dem "
-"Internet."
-
-#. type: TP
-#: cupsctl.man:63
-#, no-wrap
-msgid "B<-->[B<no->]B<share-printers>"
-msgstr "B<-->[B<no->]B<share-printers>"
+"Setzt die Begründungszeichenkette, die für einen Drucker angezeigt wird, der "
+"Druckaufträge abweist."
 
 #. type: Plain text
-#: cupsctl.man:66
-msgid "Enables (disables) sharing of local printers with other computers."
+#: cupsaccept.8:75
+msgid ""
+"The B<cupsaccept> and B<cupsreject> commands correspond to the System V "
+"printing system commands \"accept\" and \"reject\", respectively.  Unlike "
+"the System V printing system, CUPS allows printer names to contain any "
+"printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer and "
+"class names are I<not> case-sensitive."
 msgstr ""
-"Aktiviert (Deaktiviert) das gemeinsame Benutzen lokaler Drucker mit anderen "
-"Computern."
-
-#. type: TP
-#: cupsctl.man:66
-#, no-wrap
-msgid "B<-->[B<no->]B<user-cancel-any>"
-msgstr "B<-->[B<no->]B<user-cancel-any>"
+"Die Befehle B<cupsaccept> und B<cupsreject> entsprechend den System-V-"
+"Drucksystembefehlen »accept« respektive »reject«. Anders als das System-V-"
+"Drucksystem erlaubt es CUPS, dass Druckernamen alle druckbaren Zeichen außer "
+"Leertaste, Tabulator, »/« und »#« enthalten. Auch sind Drucker- und "
+"Klassennamen I<unabhängig> von der Groß-/Kleinschreibung."
 
 #. type: Plain text
-#: cupsctl.man:69
-msgid "Allows (prevents) users to cancel jobs owned by others."
+#: cupsaccept.8:77
+msgid ""
+"Finally, the CUPS versions may ask the user for an access password depending "
+"on the printing system configuration."
 msgstr ""
-"Ermöglicht Benutzern, Aufträge anderer Benutzer abzubrechen oder hindert sie "
-"daran."
+"Die CUPS-Versionen könnten den Benutzer zudem, abhängig von der "
+"Konfiguration des Drucksystems, nach einem Zugriffspasswort fragen."
 
 #. type: Plain text
-#: cupsctl.man:71
-msgid "Display the current settings:"
-msgstr "Zeige die aktuellen Einstellungen an:"
+#: cupsaccept.8:83
+msgid "B<cancel>(1), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), B<lpstat>(1),"
+msgstr "B<cancel>(1), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), B<lpstat>(1),"
 
-#. type: Plain text
-#: cupsctl.man:74
+#. type: TH
+#: cups-config.1:10
 #, no-wrap
-msgid "    cupsctl\n"
-msgstr "    cupsctl\n"
+msgid "cups-config"
+msgstr "cups-config"
 
 #. type: Plain text
-#: cupsctl.man:77
-msgid "Enable debug logging:"
-msgstr "Aktiviert Fehlersucheprotokollierung:"
+#: cups-config.1:13
+msgid "cups-config - get cups api, compiler, directory, and link information."
+msgstr ""
+"cups-config - ermittelt CUPS-API-, -Compiler-, -Verzeichnis- und -Link-"
+"Informationen."
 
 #. type: Plain text
-#: cupsctl.man:80
-#, no-wrap
-msgid "    cupsctl --debug-logging\n"
-msgstr "    cupsctl --debug-logging\n"
+#: cups-config.1:16
+msgid "B<cups-config> I<--api-version>"
+msgstr "B<cups-config> I<--api-version>"
 
 #. type: Plain text
-#: cupsctl.man:83
-msgid "Get the current debug logging state:"
-msgstr "Den aktuellen Fehlersucheprotokollierzustand abfragen:"
+#: cups-config.1:19
+msgid "B<cups-config> I<--build>"
+msgstr "B<cups-config> I<--build>"
 
 #. type: Plain text
-#: cupsctl.man:86
-#, no-wrap
-msgid "    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'\n"
-msgstr "    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'\n"
+#: cups-config.1:22
+msgid "B<cups-config> I<--cflags>"
+msgstr "B<cups-config> I<--cflags>"
 
 #. type: Plain text
-#: cupsctl.man:89
-msgid "Disable printer sharing:"
-msgstr "Deaktiviere Druckerfreigabe:"
+#: cups-config.1:25
+msgid "B<cups-config> I<--datadir>"
+msgstr "B<cups-config> I<--datadir>"
 
 #. type: Plain text
-#: cupsctl.man:92
-#, no-wrap
-msgid "    cupsctl --no-share-printers\n"
-msgstr "    cupsctl --no-share-printers\n"
-
-#. type: SH
-#: cupsctl.man:93
-#, no-wrap
-msgid "KNOWN ISSUES"
-msgstr "BEKANNTE PROBLEME"
+#: cups-config.1:28
+msgid "B<cups-config> I<--help>"
+msgstr "B<cups-config> I<--help>"
 
 #. type: Plain text
-#: cupsctl.man:95
-msgid "You cannot set the Listen or Port directives using B<cupsctl>."
-msgstr ""
-"Sie können die Direktiven »Listen« oder »Port« nicht mit B<cupsctl> setzen."
+#: cups-config.1:31
+msgid "B<cups-config> I<--ldflags>"
+msgstr "B<cups-config> I<--ldflags>"
 
 #. type: Plain text
-#: cupsctl.man:98
-msgid "B<cupsd.conf>(5), B<cupsd>(8),"
-msgstr "B<cupsd.conf>(5), B<cupsd>(8),"
+#: cups-config.1:39
+msgid "B<cups-config> [ I<--image> ] [ I<--static> ] I<--libs>"
+msgstr "B<cups-config> [ I<--image> ] [ I<--static> ] I<--libs>"
 
-#. type: TH
-#: cupsd.conf.man.in:13
-#, no-wrap
-msgid "cupsd.conf"
-msgstr "cupsd.conf"
+#. type: Plain text
+#: cups-config.1:42
+msgid "B<cups-config> I<--serverbin>"
+msgstr "B<cups-config> I<--serverbin>"
 
-#. type: TH
-#: cupsd.conf.man.in:13
-#, no-wrap
-msgid "2 May 2019"
-msgstr "2. Mai 2019"
+#. type: Plain text
+#: cups-config.1:45
+msgid "B<cups-config> I<--serverroot>"
+msgstr "B<cups-config> I<--serverroot>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:16
-msgid "cupsd.conf - server configuration file for cups"
-msgstr "cupsd.conf - Server-Konfigurationsdatei für CUPS"
+#: cups-config.1:48
+msgid "B<cups-config> I<--version>"
+msgstr "B<cups-config> I<--version>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:27
-#, fuzzy
+#: cups-config.1:52
 msgid ""
-"The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
-"normally located in the I</etc/cups> directory.  B<Note:> File, directory, "
-"and user configuration directives that used to be allowed in the B<cupsd."
-"conf> file are now stored in the B<cups-files.conf>(5)  file instead in "
-"order to prevent certain types of privilege escalation attacks."
+"The B<cups-config> command allows application developers to determine the "
+"necessary command-line options for the compiler and linker, as well as the "
+"installation directories for filters, configuration files, and drivers.  All "
+"values are reported to the standard output."
 msgstr ""
-"Die Datei I<cupsd.conf> konfiguriert den CUPS-Auftragsplaner (Scheduler), "
-"B<cupsd>(8). Sie befindet sich normalerweise in dem Verzeichnis I</etc/"
-"cups>. B<Hinweis:> Datei-, Verzeichnis- und "
-"Benutzerkonfigurationsdirektiven, die früher in der Datei B<cupsd.conf> "
-"erlaubt wurden, werden jetzt stattdessen in der Datei B<cups-files.conf>(5) "
-"gespeichert, um bestimmte Arten von Angriffen zur Rechteerweiterung zu "
-"vermeiden."
+"Der Befehl B<cups-config> erlaubt es Anwendungsentwicklern, die notwendigen "
+"Befehlszeilen-Optionen für den Compiler und Linker zu bestimmen, sowie die "
+"Installationsverzeichnisse für Filter, Konfigurationsdateien und Treiber zu "
+"ermitteln. Alle Werte werden auf die Standardausgabe ausgegeben."
 
 #. type: Plain text
-#: cupsd.conf.man.in:32 cups-files.conf.man.in:25 mailto.conf.man:23
-msgid ""
-"Each line in the file can be a configuration directive, a blank line, or a "
-"comment.  Configuration directives typically consist of a name and zero or "
-"more values separated by whitespace.  The configuration directive name and "
-"values are case-insensitive.  Comment lines start with the # character."
+#: cups-config.1:54
+msgid "The B<cups-config> command accepts the following command-line options:"
 msgstr ""
-"Jede Zeile in der Datei kann eine Konfigurationsdirektive, eine leere Zeile "
-"oder ein Kommentar sein. Konfigurationsdirektiven bestehen typischerweise "
-"aus einem Namen und keinem oder mehren, durch Leerzeichen getrennten Werten. "
-"Die Groß- und Kleinschreibung der Namen und Werte der "
-"Konfigurationsdirektiven ist nicht relevant. Kommentarzeilen beginnen mit "
-"dem Zeichen »#«. "
+"Der Befehl B<cups-config> akzeptiert die folgenden Befehlszeilen-Optionen:"
 
-#. type: SS
-#: cupsd.conf.man.in:32 ipptoolfile.man:86
+#. type: TP
+#: cups-config.1:54
 #, no-wrap
-msgid "TOP-LEVEL DIRECTIVES"
-msgstr "OBERSTE DIREKTIVEN"
+msgid "B<--api-version>"
+msgstr "B<--api-version>"
 
-#. #AccessLogLevel
 #. type: Plain text
-#: cupsd.conf.man.in:36
-msgid "The following top-level directives are understood by B<cupsd>(8):"
-msgstr ""
-"Die nachfolgenden obersten Direktiven werden von B<cupsd>(8) verstanden:"
+#: cups-config.1:57
+msgid "Reports the current API version (major.minor)."
+msgstr "Berichtet die aktuelle API-Version (Hauptversion.Unterversion)."
 
 #. type: TP
-#: cupsd.conf.man.in:36
+#: cups-config.1:57
 #, no-wrap
-msgid "B<AccessLogLevel config>"
-msgstr "B<AccessLogLevel config>"
+msgid "B<--build>"
+msgstr "B<--build>"
 
-#. type: TP
-#: cupsd.conf.man.in:38
-#, no-wrap
-msgid "B<AccessLogLevel actions>"
-msgstr "B<AccessLogLevel actions>"
+#. type: Plain text
+#: cups-config.1:60
+msgid "Reports a system-specific build number."
+msgstr "Berichtet eine systemabhängige Build-Nummer."
 
 #. type: TP
-#: cupsd.conf.man.in:40
+#: cups-config.1:60
 #, no-wrap
-msgid "B<AccessLogLevel all>"
-msgstr "B<AccessLogLevel all>"
+msgid "B<--cflags>"
+msgstr "B<--cflags>"
 
-#. #AutoPurgeJobs
 #. type: Plain text
-#: cupsd.conf.man.in:48
-msgid ""
-"Specifies the logging level for the AccessLog file.  The \"config\" level "
-"logs when printers and classes are added, deleted, or modified and when "
-"configuration files are accessed or updated.  The \"actions\" level logs "
-"when print jobs are submitted, held, released, modified, or canceled, and "
-"any of the conditions for \"config\".  The \"all\" level logs all requests.  "
-"The default access log level is \"actions\"."
-msgstr ""
-"Legt die Protokollierstufe für die Datei AccessLog fest. Die Stufe »config« "
-"protokolliert, wenn Drucker und Klassen hinzugefügt, gelöscht oder verändert "
-"werden und wenn auf Konfigurationsdateien zugegriffen oder diese geändert "
-"werden. Die Stufe »actions« protokolliert, wenn Druckaufträge hinzugefügt, "
-"gehalten, freigegeben, verändert oder abgebrochen werden oder einer der "
-"Bedingungen für »config« zutrifft. Die Stufe »all« protokolliert alle "
-"Anfragen. Die Vorgabestufe ist »actions«."
-
-#. type: TP
-#: cupsd.conf.man.in:48
-#, no-wrap
-msgid "B<AutoPurgeJobs Yes>"
-msgstr "B<AutoPurgeJobs Yes>"
+#: cups-config.1:63
+msgid "Reports the necessary compiler options."
+msgstr "Berichtet die notwendigen Compiler-Optionen."
 
 #. type: TP
-#: cupsd.conf.man.in:50
+#: cups-config.1:63
 #, no-wrap
-msgid "B<AutoPurgeJobs No>"
-msgstr "B<AutoPurgeJobs No>"
+msgid "B<--datadir>"
+msgstr "B<--datadir>"
 
-#. #BrowseLocalProtocols
 #. type: Plain text
-#: cupsd.conf.man.in:56
-msgid ""
-"Specifies whether to purge job history data automatically when it is no "
-"longer required for quotas.  The default is \"No\"."
-msgstr ""
-"Legt fest, ob die Verlaufsdaten des Auftrags automatisch bereinigt "
-"(gelöscht) werden sollen, wenn sie nicht mehr für Quotas benötigt werden. "
-"Die Vorgabe ist »No«."
+#: cups-config.1:66
+msgid "Reports the default CUPS data directory."
+msgstr "Berichtet das Standard-CUPS-Datenverzeichnis."
 
 #. type: TP
-#: cupsd.conf.man.in:56
+#: cups-config.1:66 ippeveprinter.1:85 ippfind.1:193 ipptool.1:91
 #, no-wrap
-msgid "B<BrowseLocalProtocols all>"
-msgstr "B<BrowseLocalProtocols all>"
+msgid "B<--help>"
+msgstr "B<--help>"
 
-#. type: TP
-#: cupsd.conf.man.in:58
-#, no-wrap
-msgid "B<BrowseLocalProtocols dnssd>"
-msgstr "B<BrowseLocalProtocols dnssd>"
+#. type: Plain text
+#: cups-config.1:69
+msgid "Reports the program usage message."
+msgstr "Berichtet die Programm-Verwendungshinweise."
 
 #. type: TP
-#: cupsd.conf.man.in:60
+#: cups-config.1:69
 #, no-wrap
-msgid "B<BrowseLocalProtocols none>"
-msgstr "B<BrowseLocalProtocols none>"
+msgid "B<--ldflags>"
+msgstr "B<--ldflags>"
 
-#. #BrowseWebIF
 #. type: Plain text
-#: cupsd.conf.man.in:65
-msgid ""
-"Specifies which protocols to use for local printer sharing.  The default is "
-"\"dnssd\" on systems that support Bonjour and \"none\" otherwise."
-msgstr ""
-"Spezifziert, welches Protokoll für die lokale Druckerfreigabe verwandt wird. "
-"Die Vorgabe ist »dnssd« auf Systemen, die Bonjour unterstützen und "
-"andernfalls »none«."
+#: cups-config.1:72
+msgid "Reports the necessary linker options."
+msgstr "Berichtet die notwendigen Linker-Optionen."
 
 #. type: TP
-#: cupsd.conf.man.in:65
+#: cups-config.1:72
 #, no-wrap
-msgid "B<BrowseWebIF Yes>"
-msgstr "B<BrowseWebIF Yes>"
+msgid "B<--libs>"
+msgstr "B<--libs>"
+
+#. type: Plain text
+#: cups-config.1:75
+msgid "Reports the necessary libraries to link to."
+msgstr "Berichtet die zum Linken notwendigen Bibliotheken."
 
 #. type: TP
-#: cupsd.conf.man.in:67
+#: cups-config.1:75
 #, no-wrap
-msgid "B<BrowseWebIF No>"
-msgstr "B<BrowseWebIF No>"
+msgid "B<--serverbin>"
+msgstr "B<--serverbin>"
 
-#. #Browsing
 #. type: Plain text
-#: cupsd.conf.man.in:73
+#: cups-config.1:78
 msgid ""
-"Specifies whether the CUPS web interface is advertised.  The default is \"No"
-"\"."
+"Reports the default CUPS binary directory, where filters and backends are "
+"stored."
 msgstr ""
-"Legt fest, ob die CUPS-Web-Schnittstelle bekanntgemacht wird. Die Vorgabe "
-"ist »No«."
+"Berichtet das Standard-CUPS-Verzeichnis, in dem Filter und Backends "
+"gespeichert werden."
 
 #. type: TP
-#: cupsd.conf.man.in:73
+#: cups-config.1:78
 #, no-wrap
-msgid "B<Browsing Yes>"
-msgstr "B<Browsing Yes>"
+msgid "B<--serverroot>"
+msgstr "B<--serverroot>"
+
+#. type: Plain text
+#: cups-config.1:81
+msgid "Reports the default CUPS configuration file directory."
+msgstr "Berichtet das Standard-CUPS-Konfigurationsverzeichnis."
 
 #. type: TP
-#: cupsd.conf.man.in:75
+#: cups-config.1:81
 #, no-wrap
-msgid "B<Browsing No>"
-msgstr "B<Browsing No>"
+msgid "B<--static>"
+msgstr "B<--static>"
 
-#. #DefaultAuthType
 #. type: Plain text
-#: cupsd.conf.man.in:81
+#: cups-config.1:84
 msgid ""
-"Specifies whether shared printers are advertised.  The default is \"No\"."
+"When used with I<--libs>, reports the static libraries instead of the "
+"default (shared) libraries."
 msgstr ""
-"Legt fest, ob freigegebene Drucker bekanntgemacht werden. Die Vorgabe ist "
-"»No«."
-
-#. type: TP
-#: cupsd.conf.man.in:81
-#, no-wrap
-msgid "B<DefaultAuthType Basic>"
-msgstr "B<DefaultAuthType Basic>"
+"Berichtet die statischen Bibliotheken, statt der Standard "
+"(Laufzeit-)Bibliotheken, wenn mit I<--libs> verwandt."
 
 #. type: TP
-#: cupsd.conf.man.in:83
+#: cups-config.1:84 ippeveprinter.1:91 ippfind.1:196 ipptool.1:106
 #, no-wrap
-msgid "B<DefaultAuthType Negotiate>"
-msgstr "B<DefaultAuthType Negotiate>"
+msgid "B<--version>"
+msgstr "B<--version>"
 
-#. #DefaultEncryption
 #. type: Plain text
-#: cupsd.conf.man.in:89
+#: cups-config.1:87
 msgid ""
-"Specifies the default type of authentication to use.  The default is \"Basic"
-"\"."
+"Reports the full version number of the CUPS installation (major.minor.patch)."
 msgstr ""
-"Legt den standardmäßig zu verwendenden Authentifizierungstyp fest. Die "
-"Vorgabe ist »Basic«."
+"Berichtet die vollständige Versionsnummer der CUPS-Installation "
+"(Hauptversion.Unterversion.Patch)."
 
-#. type: TP
-#: cupsd.conf.man.in:89
-#, no-wrap
-msgid "B<DefaultEncryption Never>"
-msgstr "B<DefaultEncryption Never>"
+#. type: Plain text
+#: cups-config.1:89
+msgid "Show the currently installed version of CUPS:"
+msgstr "Zeigt die aktuell installierte Version von CUPS:"
 
-#. type: TP
-#: cupsd.conf.man.in:91
+#. type: Plain text
+#: cups-config.1:92
 #, no-wrap
-msgid "B<DefaultEncryption IfRequested>"
-msgstr "B<DefaultEncryption IfRequested>"
+msgid "    cups-config --version\n"
+msgstr "    cups-config --version\n"
 
-#. type: TP
-#: cupsd.conf.man.in:93
-#, no-wrap
-msgid "B<DefaultEncryption Required>"
-msgstr "B<DefaultEncryption Required>"
+#. type: Plain text
+#: cups-config.1:95
+msgid "Compile a simple one-file CUPS filter:"
+msgstr "Einen einfachen CUPS-Filter in einer Datei übersetzen:"
 
-#. #DefaultLanguage
 #. type: Plain text
-#: cupsd.conf.man.in:98
+#: cups-config.1:99
+#, no-wrap
 msgid ""
-"Specifies whether encryption will be used for authenticated requests.  The "
-"default is \"Required\"."
+"    cc `cups-config --cflags --ldflags` -o filter filter.c \\e\n"
+"        `cups-config --libs`\n"
 msgstr ""
-"Gibt an, ob Verschlüsselung für authentifizierte Anfragen benutzt werden "
-"soll. Die Vorgabe ist »Required«."
+"    cc `cups-config --cflags --ldflags` -o filter filter.c \\e\n"
+"        `cups-config --libs`\n"
 
-#. type: TP
-#: cupsd.conf.man.in:98
-#, no-wrap
-msgid "B<DefaultLanguage >I<locale>"
-msgstr "B<DefaultLanguage >I<Standorteinstellung>"
+#. type: SH
+#: cups-config.1:100 lpadmin.8:186
+#, fuzzy, no-wrap
+msgid "DEPRECATED OPTIONS"
+msgstr "VERALTETE DIREKTIVEN"
 
-#. #DefaultPaperSize
 #. type: Plain text
-#: cupsd.conf.man.in:103
+#: cups-config.1:102
 msgid ""
-"Specifies the default language to use for text and web content.  The default "
-"is \"en\"."
+"The following options are deprecated but continue to work for backwards "
+"compatibility:"
 msgstr ""
-"Legt die Standardsprache, die für Text und Webinhalte verwandt werden soll, "
-"fest. Die Vorgabe ist »en«."
-
-#. type: TP
-#: cupsd.conf.man.in:103
-#, no-wrap
-msgid "B<DefaultPaperSize Auto>"
-msgstr "B<DefaultPaperSize Auto>"
 
 #. type: TP
-#: cupsd.conf.man.in:105
+#: cups-config.1:102
 #, no-wrap
-msgid "B<DefaultPaperSize None>"
-msgstr "B<DefaultPaperSize None>"
-
-#. type: TP
-#: cupsd.conf.man.in:107
-#, no-wrap
-msgid "B<DefaultPaperSize >I<sizename>"
-msgstr "B<DefaultPaperSize >I<Größenname>"
+msgid "B<--image>"
+msgstr "B<--image>"
 
-#. #DefaultPolicy
 #. type: Plain text
-#: cupsd.conf.man.in:113
-msgid ""
-"Specifies the default paper size for new print queues. \"Auto\" uses a "
-"locale-specific default, while \"None\" specifies there is no default paper "
-"size.  Specific size names are typically \"Letter\" or \"A4\".  The default "
-"is \"Auto\"."
+#: cups-config.1:105
+#, fuzzy
+msgid "Formerly used to add the CUPS imaging library to the list of libraries."
 msgstr ""
-"Gibt die Standardpapiergröße für neue Druckerwarteschlangen an. »Auto« "
-"benutzt eine standortabhängige Vorgabe, während »None« angibt, dass keine "
-"Papiergröße vorgegeben ist. Bestimmte Größennamen sind typischerweise "
-"»Letter« oder »A4«. Die Vorgabe ist »Auto«."
+"Wird dies mit I<--libs> verwandt, wird die CUPS Imaging-Bibliothek zu der "
+"Liste der Bibliotheken hinzugefügt."
 
-#. type: TP
-#: cupsd.conf.man.in:113
+#. type: Plain text
+#: cups-config.1:108
+msgid "B<cups>(1), CUPS Online Help (http://localhost:631/help)"
+msgstr "B<cups>(1), CUPS-Online-Hilfe (http://localhost:631/help)"
+
+#. type: TH
+#: cupsctl.8:10
 #, no-wrap
-msgid "B<DefaultPolicy >I<policy-name>"
-msgstr "B<DefaultPolicy >I<Richtlinienname>"
+msgid "cupsctl"
+msgstr "cupsctl"
+
+#. type: Plain text
+#: cupsctl.8:13
+msgid "cupsctl - configure cupsd.conf options"
+msgstr "cupsctl - konfiguriere cupsd.conf-Optionen"
 
-#. #DefaultShared
 #. type: Plain text
-#: cupsd.conf.man.in:118
+#: cupsctl.8:36
 msgid ""
-"Specifies the default access policy to use.  The default access policy is "
-"\"default\"."
-msgstr ""
-"Legt die zu verwendende Standardzugriffsrichtlinie fest. Die "
-"Standardzugriffsrichtlinie ist »default«."
-
-#. type: TP
-#: cupsd.conf.man.in:118
-#, no-wrap
-msgid "B<DefaultShared Yes>"
-msgstr "B<DefaultShared Yes>"
-
-#. type: TP
-#: cupsd.conf.man.in:120
-#, no-wrap
-msgid "B<DefaultShared No>"
-msgstr "B<DefaultShared No>"
+"B<cupsctl> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<server>[B<:>I<port>] ] "
+"[ B<-->[B<no->]B<debug-logging> ] [ B<-->[B<no->]B<remote-admin> ] [ B<--"
+">[B<no->]B<remote-any> ] [ B<-->[B<no->]B<share-printers> ] [ B<-->[B<no-"
+">]B<user-cancel-any> ] [ I<name=value> ]"
+msgstr ""
+"B<cupsctl> [ B<-E> ] [ B<-U> I<Benutzer> ] [ B<-h> I<Server>[B<:>I<Port>] ] "
+"[ B<-->[B<no->]B<debug-logging> ] [ B<-->[B<no->]B<remote-admin> ] [ B<--"
+">[B<no->]B<remote-any> ] [ B<-->[B<no->]B<share-printers> ] [ B<-->[B<no-"
+">]B<user-cancel-any> ] [ I<Name=Wert> ]"
 
-#. #DirtyCleanInterval
 #. type: Plain text
-#: cupsd.conf.man.in:125
+#: cupsctl.8:40
 msgid ""
-"Specifies whether local printers are shared by default.  The default is \"Yes"
-"\"."
+"B<cupsctl> updates or queries the I<cupsd.conf> file for a server. When no "
+"changes are requested, the current configuration values are written to the "
+"standard output in the format \"name=value\", one per line."
 msgstr ""
-"Legt fest, ob lokale Drucker standardmäßig freigegeben sind. Die Vorgabe ist "
-"»Yes«."
+"B<cupsctl> aktualisiert die Datei I<cupsd.conf> oder ermittelt aus ihr einen "
+"Server. Falls keine Änderungen erbeten wurden, werden die aktuellen "
+"Konfigurationsoptionen, jeweils eine pro Zeile, im Format »Name=Wert« auf "
+"die Standardausgabe geschrieben."
 
-#. type: TP
-#: cupsd.conf.man.in:125
-#, no-wrap
-msgid "B<DirtyCleanInterval >I<seconds>"
-msgstr "B<DirtyCleanInterval >I<Sekunden>"
+#. type: Plain text
+#: cupsctl.8:42
+msgid "The following options are recognized:"
+msgstr "Die folgenden Optionen werden erkannt:"
+
+#. type: Plain text
+#: cupsctl.8:45
+msgid "Enables encryption on the connection to the scheduler."
+msgstr ""
+"Aktiviert Verschlüsselung bei der Verbindung mit dem Auftragsplaner "
+"(Scheduler)."
 
-#. #ErrorPolicy
 #. type: Plain text
-#: cupsd.conf.man.in:131
+#: cupsctl.8:48
 msgid ""
-"Specifies the delay for updating of configuration and state files.  A value "
-"of 0 causes the update to happen as soon as possible, typically within a few "
-"milliseconds.  The default value is \"30\"."
+"Specifies an alternate username to use when authenticating with the "
+"scheduler."
 msgstr ""
-"Gibt die Verzögerungszeit für die Aktualisierung von Konfigurations- und "
-"Statusdateien an. Ein Wert von 0 veranlasst, dass die Aktualisierung so "
-"schnell wie möglich erfolgt, typischerweise innerhalb von wenigen "
-"Millisekunden. Die Vorgabe ist »30«."
+"Legt einen alternativen Benutzernamen, der bei Authentifizierung mit dem "
+"Auftragsplaner verwandt werden soll, fest."
 
 #. type: TP
-#: cupsd.conf.man.in:131
+#: cupsctl.8:48 cupsenable.8:62 lpinfo.8:68 lpmove.8:47 lpoptions.1:78 lpq.1:50
+#: lpstat.1:100
 #, no-wrap
-msgid "B<ErrorPolicy abort-job>"
-msgstr "B<ErrorPolicy abort-job>"
+msgid "B<-h >I<server>[B<:>I<port>]"
+msgstr "B<-h> I<Server>[B<:>I<Port>]"
 
 #. type: Plain text
-#: cupsd.conf.man.in:134
-msgid ""
-"Specifies that a failed print job should be aborted (discarded) unless "
-"otherwise specified for the printer."
-msgstr ""
-"Legt fest, dass ein fehlgeschlagener Druckauftrag abgebrochen (verworfen) "
-"werden soll, es sei denn, es wurde anders für den Drucker festgelegt."
+#: cupsctl.8:51
+msgid "Specifies the server address."
+msgstr "Legt die Server-Adresse fest."
 
 #. type: TP
-#: cupsd.conf.man.in:134
+#: cupsctl.8:51
 #, no-wrap
-msgid "B<ErrorPolicy retry-current-job>"
-msgstr "B<ErrorPolicy retry-current-job>"
+msgid "B<-->[B<no->]B<debug-logging>"
+msgstr "B<-->[B<no->]B<debug-logging>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:137
-msgid ""
-"Specifies that a failed print job should be retried immediately unless "
-"otherwise specified for the printer."
+#: cupsctl.8:54
+msgid "Enables (disables) debug logging to the I<error_log> file."
 msgstr ""
-"Legt fest, dass ein fehlgeschlagener Druckauftrag sofort neu versucht werden "
-"soll, es sei denn, es wurde anders für den Drucker festgelegt."
+"Aktiviert (Deaktiviert) das Protokollieren von Fehlersuchmeldungen in der "
+"Datei I<error_log>."
 
 #. type: TP
-#: cupsd.conf.man.in:137
+#: cupsctl.8:54
 #, no-wrap
-msgid "B<ErrorPolicy retry-job>"
-msgstr "B<ErrorPolicy retry-job>"
+msgid "B<-->[B<no->]B<remote-admin>"
+msgstr "B<-->[B<no->]B<remote-admin>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:140
-msgid ""
-"Specifies that a failed print job should be retried at a later time unless "
-"otherwise specified for the printer. The 'retry-job' error policy is the "
-"default."
-msgstr ""
-"Legt fest, dass ein fehlgeschlagener Druckauftrag zu einem späteren "
-"Zeitpunkt neu versucht werden soll, es sei denn, es wurde anders für den "
-"Drucker festgelegt. Die Fehler-Richtlinie »retry-job« ist die Vorgabe."
+#: cupsctl.8:57
+msgid "Enables (disables) remote administration."
+msgstr "Aktiviert (Deaktiviert) Administration aus der Ferne."
 
 #. type: TP
-#: cupsd.conf.man.in:140
+#: cupsctl.8:57
 #, no-wrap
-msgid "B<ErrorPolicy stop-printer>"
-msgstr "B<ErrorPolicy stop-printer>"
+msgid "B<-->[B<no->]B<remote-any>"
+msgstr "B<-->[B<no->]B<remote-any>"
 
-#. #FilterLimit
 #. type: Plain text
-#: cupsd.conf.man.in:144
-msgid ""
-"Specifies that a failed print job should stop the printer unless otherwise "
-"specified for the printer."
+#: cupsctl.8:60
+msgid "Enables (disables) printing from any address, e.g., the Internet."
 msgstr ""
-"Legt fest, dass ein fehlgeschlagener Druckauftrag den Drucker anhalten soll, "
-"es sei denn, es wurde anders für den Drucker festgelegt."
+"Aktiviert (Deaktiviert) Drucken von beliebigen Adressen, z.B. aus dem "
+"Internet."
 
 #. type: TP
-#: cupsd.conf.man.in:144
+#: cupsctl.8:60
 #, no-wrap
-msgid "B<FilterLimit >I<limit>"
-msgstr "B<FilterLimit >I<Beschränkung>"
+msgid "B<-->[B<no->]B<share-printers>"
+msgstr "B<-->[B<no->]B<share-printers>"
 
-#. #FilterNice
 #. type: Plain text
-#: cupsd.conf.man.in:153
-msgid ""
-"Specifies the maximum cost of filters that are run concurrently, which can "
-"be used to minimize disk, memory, and CPU resource problems.  A limit of 0 "
-"disables filter limiting.  An average print to a non-PostScript printer "
-"needs a filter limit of about 200.  A PostScript printer needs about half "
-"that (100).  Setting the limit below these thresholds will effectively limit "
-"the scheduler to printing a single job at any time.  The default limit is "
-"\"0\"."
+#: cupsctl.8:63
+msgid "Enables (disables) sharing of local printers with other computers."
 msgstr ""
-"Legt die maximale Belastung gleichzeitig ausgeführter Filter fest. Damit "
-"können Platten-, Arbeitsspeicher- und CPU-Ressourcenprobleme minimiert "
-"werden. Eine Beschränkung von 0 deaktiviert die Beschränkung von Filtern. "
-"Ein durchschnittlicher Ausdruck auf einem Nicht-PostScript-Drucker benötigt "
-"eine Filter-Beschränkung von ungefähr 200. Ein PostScript-Drucker benötigt "
-"ungefähr die Hälfte (100) davon. Wird die Beschränkung unterhalb dieser "
-"Schwellen gesetzt, wird der Auftragsplaner effektiv darauf eingeschränkt, "
-"immer nur einen einzelnen Auftrag gleichzeitig zu drucken. Die Vorgabe ist "
-"»0«."
+"Aktiviert (Deaktiviert) das gemeinsame Benutzen lokaler Drucker mit anderen "
+"Computern."
 
 #. type: TP
-#: cupsd.conf.man.in:153
+#: cupsctl.8:63
 #, no-wrap
-msgid "B<FilterNice >I<nice-value>"
-msgstr "B<FilterNice >I<Nice-Wert>"
+msgid "B<-->[B<no->]B<user-cancel-any>"
+msgstr "B<-->[B<no->]B<user-cancel-any>"
 
-#. #GSSServiceName
 #. type: Plain text
-#: cupsd.conf.man.in:161
-msgid ""
-"Specifies the scheduling priority ( B<nice>(8)  value) of filters that are "
-"run to print a job.  The nice value ranges from 0, the highest priority, to "
-"19, the lowest priority.  The default is 0."
+#: cupsctl.8:66
+msgid "Allows (prevents) users to cancel jobs owned by others."
 msgstr ""
-"Legt die Planungspriorität (B<nice>(8)-Wert) von Filtern, die laufen, um "
-"einen Druckauftrag auszudrucken, fest. Die »nice«-Werte liegen im Bereich "
-"von 0 (der höchsten Priorität) bis zu 19, der niedrigsten Priorität. Die "
-"Vorgabe ist 0."
+"Ermöglicht Benutzern, Aufträge anderer Benutzer abzubrechen oder hindert sie "
+"daran."
 
 #. type: Plain text
-#: cupsd.conf.man.in:165
-msgid ""
-"Specifies the service name when using Kerberos authentication.  The default "
-"service name is \"http.\""
-msgstr ""
-"Legt den Dienstenamen, wenn Kerberos-Authentifizierung eingesetzt wird, "
-"fest. Der Vorgabedienstname ist »http«."
+#: cupsctl.8:68
+msgid "Display the current settings:"
+msgstr "Zeige die aktuellen Einstellungen an:"
 
-#. #HostNameLookups
-#. type: TP
-#: cupsd.conf.man.in:165
+#. type: Plain text
+#: cupsctl.8:71
 #, no-wrap
-msgid "B<HostNameLookups On>"
-msgstr "B<HostNameLookups On>"
+msgid "    cupsctl\n"
+msgstr "    cupsctl\n"
 
-#. type: TP
-#: cupsd.conf.man.in:168
-#, no-wrap
-msgid "B<HostNameLookups Off>"
-msgstr "B<HostNameLookups Off>"
+#. type: Plain text
+#: cupsctl.8:74
+msgid "Enable debug logging:"
+msgstr "Aktiviert Fehlersucheprotokollierung:"
 
-#. type: TP
-#: cupsd.conf.man.in:170
+#. type: Plain text
+#: cupsctl.8:77
 #, no-wrap
-msgid "B<HostNameLookups Double>"
-msgstr "B<HostNameLookups Double>"
+msgid "    cupsctl --debug-logging\n"
+msgstr "    cupsctl --debug-logging\n"
 
-#. #IdleExitTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:180
-msgid ""
-"Specifies whether to do reverse lookups on connecting clients.  The \"Double"
-"\" setting causes B<cupsd>(8)  to verify that the hostname resolved from the "
-"address matches one of the addresses returned for that hostname.  Double "
-"lookups also prevent clients with unregistered addresses from connecting to "
-"your server.  The default is \"Off\" to avoid the potential server "
-"performance problems with hostname lookups.  Only set this option to \"On\" "
-"or \"Double\" if absolutely required."
-msgstr ""
-"Legt fest, ob Rückwärtsauflösung bei sich verbindenden Clients durchgeführt "
-"werden soll. Die Einstellung »Double« veranlasst B<cupsd>(8) zu prüfen, ob "
-"der über die Adresse aufgelöste Rechnername zu einer der dafür "
-"zurückgegebenen Adressen passt. Das Nachschlagen mit »Double« verhindert "
-"außerdem, dass sich Clients mit nicht registrierten Adressen mit Ihrem "
-"Server verbinden. Die Voreinstellung ist »Off«, um potenzielle Probleme mit "
-"der Systemleistung durch das Nachschlagen von Rechnernamen zu vermeiden. "
-"Setzen Sie diese Option nur auf »On« oder »Double«, wenn dies unbedingt "
-"erforderlich ist. "
+#: cupsctl.8:80
+msgid "Get the current debug logging state:"
+msgstr "Den aktuellen Fehlersucheprotokollierzustand abfragen:"
 
-#. type: TP
-#: cupsd.conf.man.in:180
+#. type: Plain text
+#: cupsctl.8:83
 #, no-wrap
-msgid "B<IdleExitTimeout >I<seconds>"
-msgstr "B<IdleExitTimeout >I<Sekunden>"
+msgid "    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'\n"
+msgstr "    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'\n"
 
-#. #JobKillDelay
 #. type: Plain text
-#: cupsd.conf.man.in:188
-msgid ""
-"Specifies the length of time to wait before shutting down due to "
-"inactivity.  The default is \"60\" seconds.  Note: Only applicable when "
-"B<cupsd>(8)  is run on-demand (e.g., with B<-l>)."
-msgstr ""
-"Legt die Wartedauer fest, bevor aufgrund von Inaktivität abgeschaltet wird. "
-"Die Vorgabe ist »60« Sekunden. Beachten Sie: Dies trifft nur zu, wenn "
-"B<cupsd>(8) auf Anforderung (z.B. mit B<-l>) läuft."
+#: cupsctl.8:86
+msgid "Disable printer sharing:"
+msgstr "Deaktiviere Druckerfreigabe:"
 
-#. type: TP
-#: cupsd.conf.man.in:188
+#. type: Plain text
+#: cupsctl.8:89
 #, no-wrap
-msgid "B<JobKillDelay >I<seconds>"
-msgstr "B<JobKillDelay >I<Sekunden>"
+msgid "    cupsctl --no-share-printers\n"
+msgstr "    cupsctl --no-share-printers\n"
+
+#. type: SH
+#: cupsctl.8:90
+#, no-wrap
+msgid "KNOWN ISSUES"
+msgstr "BEKANNTE PROBLEME"
 
-#. #JobRetryInterval
 #. type: Plain text
-#: cupsd.conf.man.in:193
-msgid ""
-"Specifies the number of seconds to wait before killing the filters and "
-"backend associated with a canceled or held job.  The default is \"30\"."
+#: cupsctl.8:92
+msgid "You cannot set the Listen or Port directives using B<cupsctl>."
 msgstr ""
-"Legt die Anzahl von Sekunden zum Warten, bevor die Filter und Backends "
-"beendet werden, die mit einem abgebrochenen oder angehaltenen Druckauftrag "
-"verbunden sind, fest. Die Vorgabe ist »30«."
+"Sie können die Direktiven »Listen« oder »Port« nicht mit B<cupsctl> setzen."
 
-#. type: TP
-#: cupsd.conf.man.in:193
+#. type: Plain text
+#: cupsctl.8:95
+msgid "B<cupsd.conf>(5), B<cupsd>(8),"
+msgstr "B<cupsd.conf>(5), B<cupsd>(8),"
+
+#. type: TH
+#: cupsd.8:10
 #, no-wrap
-msgid "B<JobRetryInterval >I<seconds>"
-msgstr "B<JobRetryInterval >I<Sekunden>"
+msgid "cupsd"
+msgstr "cupsd"
+
+#. type: Plain text
+#: cupsd.8:13
+msgid "cupsd - cups scheduler"
+msgstr "cupsd - Cups-Autragsplaner"
 
-#. #JobRetryLimit
 #. type: Plain text
-#: cupsd.conf.man.in:199
+#: cupsd.8:32
 msgid ""
-"Specifies the interval between retries of jobs in seconds.  This is "
-"typically used for fax queues but can also be used with normal print queues "
-"whose error policy is \"retry-job\" or \"retry-current-job\".  The default "
-"is \"30\"."
-msgstr ""
-"Legt das Intervall in Sekunden, in dem der Auftrag erneut versucht wird, "
-"fest. Dies wird typischerweise für Fax-Warteschlangen verwandt, kann aber "
-"auch mit normalen Druckwarteschlangen verwendet werden, deren "
-"Fehlerrichtlinie »retry-job« oder »retry-current-job« ist. Die Vorgabe ist "
-"»30«."
-
-#. type: TP
-#: cupsd.conf.man.in:199
-#, no-wrap
-msgid "B<JobRetryLimit >I<count>"
-msgstr "B<JobRetryLimit >I<Anzahl>"
+"B<cupsd> [ B<-c> I<cupsd.conf> ] [ B<-f> ] [ B<-F> ] [ B<-h> ] [ B<-l> ] "
+"[ B<-s> I<cups-files.conf> ] [ B<-t> ]"
+msgstr ""
+"B<cupsd> [ B<-c> I<cupsd.conf> ] [ B<-f> ] [ B<-F> ] [ B<-h> ] [ B<-l> ] "
+"[ B<-s> I<cups-files.conf> ] [ B<-t> ]"
 
-#. #KeepAlive
 #. type: Plain text
-#: cupsd.conf.man.in:205
+#: cupsd.8:37
 msgid ""
-"Specifies the number of retries that are done for jobs.  This is typically "
-"used for fax queues but can also be used with normal print queues whose "
-"error policy is \"retry-job\" or \"retry-current-job\".  The default is "
-"\"5\"."
+"B<cupsd> is the scheduler for CUPS. It implements a printing system based "
+"upon the Internet Printing Protocol, version 2.1, and supports most of the "
+"requirements for IPP Everywhere. If no options are specified on the command-"
+"line then the default configuration file I</etc/cups/cupsd.conf> will be "
+"used."
 msgstr ""
-"Legt die Anzahl der Wiederholungen für Aufträge fest. Dies wird "
-"typischerweise für Fax-Warteschlangen verwandt, kann aber auch mit normalen "
-"Druckwarteschlangen verwendet werden, deren Fehlerrichtlinie »retry-job« "
-"oder »retry-current-job« ist. Die Vorgabe ist »5«."
-
-#. type: TP
-#: cupsd.conf.man.in:205
-#, no-wrap
-msgid "B<KeepAlive Yes>"
-msgstr "B<KeepAlive Yes>"
+"B<cupsd> ist der Auftragsplaner (Scheduler) für das Common UNIX Printing "
+"System. Es implementiert ein Drucksystem, das auf dem Internet Printing "
+"Protocol Version 2.1 basiert und die meisten der Anforderungen von »IPP "
+"Everywhere« erfüllt. Falls auf der Befehlszeile keine Optionen angegeben "
+"werden, wird stattdessen die Standard-Konfigurationsdatei I</etc/cups/cupsd."
+"conf> verwandt."
 
 #. type: TP
-#: cupsd.conf.man.in:207
+#: cupsd.8:38
 #, no-wrap
-msgid "B<KeepAlive No>"
-msgstr "B<KeepAlive No>"
+msgid "B<-c>I<\\ cupsd.conf>"
+msgstr "B<-c>I<\\ cupsd.conf>"
 
-#. #KeepAliveTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:212
-msgid ""
-"Specifies whether to support HTTP keep-alive connections.  The default is "
-"\"Yes\"."
-msgstr ""
-"Legt fest, ob HTTP-keep-alive-Verbindungen unterstützt werden. Die Vorgabe "
-"ist »Yes«."
+#: cupsd.8:41
+msgid "Uses the named cupsd.conf configuration file."
+msgstr "Verwendet die benannte cupsd.conf-Konfigurationsdatei."
 
 #. type: TP
-#: cupsd.conf.man.in:212
+#: cupsd.8:41
 #, no-wrap
-msgid "B<KeepAliveTimeout >I<seconds>"
-msgstr "B<KeepAliveTimeout >I<Sekunden>"
+msgid "B<-f>"
+msgstr "B<-f>"
 
-#. #LimitIPP
 #. type: Plain text
-#: cupsd.conf.man.in:217
+#: cupsd.8:46
 msgid ""
-"Specifies how long an idle client connection remains open.  The default is "
-"\"30\"."
+"Run B<cupsd> in the foreground; the default is to run in the background as a "
+"\"daemon\"."
 msgstr ""
-"Legt fest, wie lange leer laufende Client-Verbindungen offen bleiben sollen. "
-"Die Vorgabe ist »30«."
+"Führt B<cupsd> im Vordergrund aus; standardmäßig wird er im Hintergrund als "
+"»Daemon« ausgeführt."
 
 #. type: TP
-#: cupsd.conf.man.in:217
+#: cupsd.8:46
 #, no-wrap
-msgid "B<E<lt>Limit >I<operation >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
-msgstr "B<E<lt>Limit >I<Vorgang >…B<E<gt> >… B<E<lt>/LimitE<gt>>"
+msgid "B<-F>"
+msgstr "B<-F>"
 
-#. #Limit
 #. type: Plain text
-#: cupsd.conf.man.in:221
+#: cupsd.8:54
 msgid ""
-"Specifies the IPP operations that are being limited inside a Policy section. "
-"IPP operation names are listed below in the section \"IPP OPERATION NAMES\"."
+"Run B<cupsd> in the foreground but detach the process from the controlling "
+"terminal and current directory. This is useful for running B<cupsd> from "
+"B<init>(8)."
 msgstr ""
-"Legt die IPP-Vorgänge, die innerhalb eines Richtlinienabschnitts begrenzt "
-"werden, fest. IPP-Vorgangsnamen sind weiter unten im Abschnitt »IPP-"
-"VORGANGSNAMEN« beschrieben."
-
-#. type: TP
-#: cupsd.conf.man.in:221
-#, no-wrap
-msgid "B<E<lt>Limit >I<method >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
-msgstr "B<E<lt>Limit >I<Methode >…B<E<gt> >… B<E<lt>/LimitE<gt>>"
+"Führt B<cupsd> im Vordergrund aus, aber kopple den Prozess von dem "
+"steuernden Terminal und dem aktuellen Verzeichnis ab. Dies ist nützlich, um "
+"B<cupsd> von B<init>(8) aus auszuführen."
 
 #. type: TP
-#: cupsd.conf.man.in:224
+#: cupsd.8:54 ipptool.1:163 lpr.1:88
 #, no-wrap
-msgid "B<E<lt>LimitExcept >I<method >...B<E<gt> >... B<E<lt>/LimitExceptE<gt>>"
-msgstr "B<E<lt>LimitExcept >I<Methode >…B<E<gt> >… B<E<lt>/LimitExceptE<gt>>"
+msgid "B<-h>"
+msgstr "B<-h>"
 
-#. #LimitRequestBody
 #. type: Plain text
-#: cupsd.conf.man.in:228
-msgid ""
-"Specifies the HTTP methods that are being limited inside a Location section. "
-"HTTP method names are listed below in the section \"HTTP METHOD NAMES\"."
-msgstr ""
-"Legt die HTTP-Methoden, die innerhalb eines »Location«-Abschnittes begrenzt "
-"werden, fest. HTTP-Methodennamen sind weiter unten im Abschnitt »HTTP-"
-"METHODENNAMEN« aufgeführt."
+#: cupsd.8:57
+msgid "Shows the program usage."
+msgstr "Zeigt die Programm-Verwendung."
 
 #. type: TP
-#: cupsd.conf.man.in:228
+#: cupsd.8:57 ippfind.1:74 ipptool.1:172 lpinfo.8:71 lpoptions.1:81 lpq.1:53
+#: lpr.1:91 lpstat.1:103
 #, no-wrap
-msgid "B<LimitRequestBody >I<size>"
-msgstr "B<LimitRequestBody >I<Größe>"
+msgid "B<-l>"
+msgstr "B<-l>"
 
-#. #Listen
 #. type: Plain text
-#: cupsd.conf.man.in:233
+#: cupsd.8:65
 msgid ""
-"Specifies the maximum size of print files, IPP requests, and HTML form "
-"data.  The default is \"0\" which disables the limit check."
+"This option is passed to B<cupsd> when it is run from B<launchd>(8)  or "
+"B<systemd>(8)."
 msgstr ""
-"Legt die maximale Größe von Druckdateien, IPP-Anfragen und HTML-"
-"Formulardaten fest. Die Vorgabe ist »0«, womit die Überprüfung deaktiviert "
-"wird."
+"Diese Option wird an B<cupsd> übergeben, wenn es von B<launchd(8)> oder "
+"B<systemd>(8) ausgeführt wird."
 
 #. type: TP
-#: cupsd.conf.man.in:233
+#: cupsd.8:65
 #, no-wrap
-msgid "B<Listen >I<ipv4-address>B<:>I<port>"
-msgstr "B<Listen >I<IPv4-Adresse>B<:>I<Port>"
+msgid "B<-s>I<\\ cups-files.conf>"
+msgstr "B<-s>I<\\ cups-files.conf>"
 
-#. type: TP
-#: cupsd.conf.man.in:235
-#, no-wrap
-msgid "B<Listen [>I<ipv6-address>B<]:>I<port>"
-msgstr "B<Listen [>I<IPv6-Adresse>B<]:>I<Port>"
+#. type: Plain text
+#: cupsd.8:68 cupsfilter.8:72
+msgid "Uses the named cups-files.conf configuration file."
+msgstr "Verwendet die benannte cups-files.conf-Konfigurationsdatei."
 
 #. type: TP
-#: cupsd.conf.man.in:237
+#: cupsd.8:68 ipptool.1:184 lpstat.1:121 ppdc.1:73
 #, no-wrap
-msgid "B<Listen *:>I<port>"
-msgstr "B<Listen *:>I<Port>"
+msgid "B<-t>"
+msgstr "B<-t>"
 
-#. type: TP
-#: cupsd.conf.man.in:239
+#. type: Plain text
+#: cupsd.8:71
+msgid "Test the configuration file for syntax errors."
+msgstr "Testet die Konfigurationsdatei auf Syntax-Fehler."
+
+#. type: Plain text
+#: cupsd.8:80
 #, no-wrap
-msgid "B<Listen >I</path/to/domain/socket>"
-msgstr "B<Listen >I</Pfad/zu/Domain/Socket>"
+msgid ""
+"I</etc/cups/classes.conf>\n"
+"I</etc/cups/cups-files.conf>\n"
+"I</etc/cups/cupsd.conf>\n"
+"I</usr/share/cups/mime/mime.convs>\n"
+"I</usr/share/cups/mime/mime.types>\n"
+"I</etc/cups/printers.conf>\n"
+"I</etc/cups/subscriptions.conf>\n"
+msgstr ""
+"I</etc/cups/classes.conf>\n"
+"I</etc/cups/cups-files.conf>\n"
+"I</etc/cups/cupsd.conf>\n"
+"I</usr/share/cups/mime/mime.convs>\n"
+"I</usr/share/cups/mime/mime.types>\n"
+"I</etc/cups/printers.conf>\n"
+"I</etc/cups/subscriptions.conf>\n"
 
-#. #ListenBackLog
 #. type: Plain text
-#: cupsd.conf.man.in:245
+#: cupsd.8:84
 msgid ""
-"Listens to the specified address and port or domain socket path for "
-"connections.  Multiple Listen directives can be provided to listen on "
-"multiple addresses.  The Listen directive is similar to the Port directive "
-"but allows you to restrict access to specific interfaces or networks."
+"B<cupsd> implements all of the required IPP/2.1 attributes and operations. "
+"It also implements several CUPS-specific administrative operations."
 msgstr ""
-"Wartet auf den angegebenen Adressen und Ports oder Domain-Socketpfaden auf "
-"Anfragen. Mehrere »Listen«-Direktiven können angegeben werden, um auf "
-"mehreren Adressen auf Anfragen zu warten. Die Direktive »Listen« ist ähnlich "
-"zu der Direktive »Port«, erlaubt es Ihnen aber, den Zugriff auf bestimmte "
-"Schnittstellen oder Netze zu beschränken."
+"B<cupsd> implementiert alle benötigten IPP/2.1-Attribute und Vorgänge. Es "
+"implementiert auch mehrere CUPS-spezifische administrative Vorgänge."
 
-#. type: TP
-#: cupsd.conf.man.in:245
+#. type: Plain text
+#: cupsd.8:88
+msgid "Run B<cupsd> in the background with the default configuration file:"
+msgstr "Führe I<cupsd> im Hintergrund mit der Standardkonfigurationsdatei aus:"
+
+#. type: Plain text
+#: cupsd.8:91
 #, no-wrap
-msgid "B<ListenBackLog >I<number>"
-msgstr "B<ListenBackLog >I<Anzahl>"
+msgid "    cupsd\n"
+msgstr "    cupsd\n"
 
-#. #Location
 #. type: Plain text
-#: cupsd.conf.man.in:252
-msgid ""
-"Specifies the number of pending connections that will be allowed.  This "
-"normally only affects very busy servers that have reached the MaxClients "
-"limit, but can also be triggered by large numbers of simultaneous "
-"connections.  When the limit is reached, the operating system will refuse "
-"additional connections until the scheduler can accept the pending ones.  The "
-"default is the OS-defined default limit, typically either \"5\" for older "
-"operating systems or \"128\" for newer operating systems."
-msgstr ""
-"Legt die Anzahl von erlaubten unerledigten Verbindungen fest. Dies betrifft "
-"normalerweise nur sehr beschäftigte Server, die die MaxClients-Beschränkung "
-"erreicht haben, kann aber auch von einer großen Anzahl von gleichzeitigen "
-"Verbindungen ausgelöst werden. Wenn die Beschränkung erreicht ist, wird das "
-"Betriebssystem zusätzliche Verbindungen ablehnen, bis der Auftragsplaner "
-"wieder unerledigte Verbindungen erlaubt. Die Vorgabe ist die "
-"betriebssystemabhängige Beschränkung, typischerweise »5« auf älteren "
-"Betriebssystemen oder »128« auf neueren Betriebssystemen."
+#: cupsd.8:95
+msgid "Test a configuration file called I<test.conf>:"
+msgstr "Eine Konfigurationsdatei namens I<test.conf> überprüfen:"
 
-#. type: TP
-#: cupsd.conf.man.in:252
+#. type: Plain text
+#: cupsd.8:98
 #, no-wrap
-msgid "B<E<lt>Location >I</path>B<E<gt> >... B<E<lt>/LocationE<gt>>"
-msgstr "B<E<lt>Location >I</Pfad>B<E<gt> >… B<E<lt>/LocationE<gt>>"
+msgid "    cupsd -t -c test.conf\n"
+msgstr "    cupsd -t -c test.conf\n"
 
-#. #LogDebugHistory
 #. type: Plain text
-#: cupsd.conf.man.in:257
+#: cupsd.8:104
 msgid ""
-"Specifies access control for the named location.  Paths are documented below "
-"in the section \"LOCATION PATHS\"."
+"Run B<cupsd> in the foreground with a test configuration file called I<test."
+"conf>:"
 msgstr ""
-"Legt die Zugriffssteuerung für den benannten Ort fest. Pfade werden weiter "
-"unten im Abschnitt »ORTSPFADE« beschrieben."
+"Führe B<cupsd> im Vordergrund mit einer Testkonfigurationsdatei namens "
+"I<test.conf> aus:"
 
-#. type: TP
-#: cupsd.conf.man.in:257
+#. type: Plain text
+#: cupsd.8:107
 #, no-wrap
-msgid "B<LogDebugHistory >I<number>"
-msgstr "B<LogDebugHistory >I<Anzahl>"
+msgid "    cupsd -f -c test.conf\n"
+msgstr "    cupsd -f -c test.conf\n"
 
-#. #LogLevel
 #. type: Plain text
-#: cupsd.conf.man.in:261
+#: cupsd.8:125
 msgid ""
-"Specifies the number of debugging messages that are retained for logging if "
-"an error occurs in a print job. Debug messages are logged regardless of the "
-"LogLevel setting."
+"B<backend>(7), B<classes.conf>(5), B<cups>(1), B<cups-files.conf>(5), B<cups-"
+"lpd>(8), B<cupsd.conf>(5), B<cupsd-helper>(8), B<cupsd-logs>(8), "
+"B<filter>(7), B<launchd>(8), B<mime.convs>(5), B<mime.types>(5), B<printers."
+"conf>(5), B<systemd>(8), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
-"Legt die Anzahl der Fehlersuchnachrichten, die zum Protokollieren "
-"zurückgehalten werden, wenn ein Fehler in einem Druckauftrag auftritt, fest. "
-"Fehlersuchnachrichten werden unabhängig von der LogLevel-Einstellung "
-"protokolliert."
+"B<backend>(7), B<classes.conf>(5), B<cups>(1), B<cups-files.conf>(5), B<cups-"
+"lpd>(8), B<cupsd.conf>(5), B<cupsd-helper>(8), B<cupsd-logs>(8), "
+"B<filter>(7), B<launchd>(8), B<mime.convs>(5), B<mime.types>(5), B<printers."
+"conf>(5), B<systemd>(8), CUPS-Online-Hilfe (http://localhost:631/help)"
 
-#. type: TP
-#: cupsd.conf.man.in:261
+#. type: TH
+#: cupsd.conf.5:10
 #, no-wrap
-msgid "B<LogLevel >none"
-msgstr "B<LogLevel >none"
+msgid "cupsd.conf"
+msgstr "cupsd.conf"
 
-#. type: TP
-#: cupsd.conf.man.in:263
-#, no-wrap
-msgid "B<LogLevel >emerg"
-msgstr "B<LogLevel >emerg"
+#. type: TH
+#: cupsd.conf.5:10
+#, fuzzy, no-wrap
+#| msgid "16 July 2012"
+msgid "16 July 2019"
+msgstr "16. Juli 2012"
 
-#. type: TP
-#: cupsd.conf.man.in:265
-#, no-wrap
-msgid "B<LogLevel >alert"
-msgstr "B<LogLevel >alert"
+#. type: Plain text
+#: cupsd.conf.5:13
+msgid "cupsd.conf - server configuration file for cups"
+msgstr "cupsd.conf - Server-Konfigurationsdatei für CUPS"
 
-#. type: TP
-#: cupsd.conf.man.in:267
-#, no-wrap
-msgid "B<LogLevel >crit"
-msgstr "B<LogLevel >crit"
-
-#. type: TP
-#: cupsd.conf.man.in:269
-#, no-wrap
-msgid "B<LogLevel >error"
-msgstr "B<LogLevel >error"
+#. type: Plain text
+#: cupsd.conf.5:25
+#, fuzzy
+msgid ""
+"The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
+"normally located in the I</etc/cups> directory.  Each line in the file can "
+"be a configuration directive, a blank line, or a comment.  Configuration "
+"directives typically consist of a name and zero or more values separated by "
+"whitespace.  The configuration directive name and values are case-"
+"insensitive.  Comment lines start with the # character."
+msgstr ""
+"Jede Zeile in der Datei kann eine Konfigurationsdirektive, eine leere Zeile "
+"oder ein Kommentar sein. Konfigurationsdirektiven bestehen typischerweise "
+"aus einem Namen und keinem oder mehren, durch Leerzeichen getrennten Werten. "
+"Die Groß- und Kleinschreibung der Namen und Werte der "
+"Konfigurationsdirektiven ist nicht relevant. Kommentarzeilen beginnen mit "
+"dem Zeichen »#«. "
 
-#. type: TP
-#: cupsd.conf.man.in:271
+#. type: SS
+#: cupsd.conf.5:25 ipptoolfile.5:83
 #, no-wrap
-msgid "B<LogLevel >warn"
-msgstr "B<LogLevel >warn"
+msgid "TOP-LEVEL DIRECTIVES"
+msgstr "OBERSTE DIREKTIVEN"
 
-#. type: TP
-#: cupsd.conf.man.in:273
-#, no-wrap
-msgid "B<LogLevel >notice"
-msgstr "B<LogLevel >notice"
+#. #AccessLogLevel
+#. type: Plain text
+#: cupsd.conf.5:29
+msgid "The following top-level directives are understood by B<cupsd>(8):"
+msgstr ""
+"Die nachfolgenden obersten Direktiven werden von B<cupsd>(8) verstanden:"
 
 #. type: TP
-#: cupsd.conf.man.in:275
+#: cupsd.conf.5:29
 #, no-wrap
-msgid "B<LogLevel >info"
-msgstr "B<LogLevel >info"
+msgid "B<AccessLogLevel config>"
+msgstr "B<AccessLogLevel config>"
 
 #. type: TP
-#: cupsd.conf.man.in:277
+#: cupsd.conf.5:31
 #, no-wrap
-msgid "B<LogLevel >debug"
-msgstr "B<LogLevel >debug"
+msgid "B<AccessLogLevel actions>"
+msgstr "B<AccessLogLevel actions>"
 
 #. type: TP
-#: cupsd.conf.man.in:279
+#: cupsd.conf.5:33
 #, no-wrap
-msgid "B<LogLevel >debug2"
-msgstr "B<LogLevel >debug2"
+msgid "B<AccessLogLevel all>"
+msgstr "B<AccessLogLevel all>"
 
-#. #LogTimeFormat
+#. #AutoPurgeJobs
 #. type: Plain text
-#: cupsd.conf.man.in:285
+#: cupsd.conf.5:41
 msgid ""
-"Specifies the level of logging for the ErrorLog file.  The value \"none\" "
-"stops all logging while \"debug2\" logs everything.  The default is \"warn\"."
+"Specifies the logging level for the AccessLog file.  The \"config\" level "
+"logs when printers and classes are added, deleted, or modified and when "
+"configuration files are accessed or updated.  The \"actions\" level logs "
+"when print jobs are submitted, held, released, modified, or canceled, and "
+"any of the conditions for \"config\".  The \"all\" level logs all requests.  "
+"The default access log level is \"actions\"."
 msgstr ""
-"Legt die Protokollierstufe in der Datei ErrorLog fest. Der Wert »none« "
-"beendet alle Protokollierung, während »debug2« alles protokolliert. Die "
-"Vorgabe ist »warn«."
+"Legt die Protokollierstufe für die Datei AccessLog fest. Die Stufe »config« "
+"protokolliert, wenn Drucker und Klassen hinzugefügt, gelöscht oder verändert "
+"werden und wenn auf Konfigurationsdateien zugegriffen oder diese geändert "
+"werden. Die Stufe »actions« protokolliert, wenn Druckaufträge hinzugefügt, "
+"gehalten, freigegeben, verändert oder abgebrochen werden oder einer der "
+"Bedingungen für »config« zutrifft. Die Stufe »all« protokolliert alle "
+"Anfragen. Die Vorgabestufe ist »actions«."
 
 #. type: TP
-#: cupsd.conf.man.in:285
+#: cupsd.conf.5:41
 #, no-wrap
-msgid "B<LogTimeFormat >standard"
-msgstr "B<LogTimeFormat >standard"
+msgid "B<AutoPurgeJobs Yes>"
+msgstr "B<AutoPurgeJobs Yes>"
 
 #. type: TP
-#: cupsd.conf.man.in:287
+#: cupsd.conf.5:43
 #, no-wrap
-msgid "B<LogTimeFormat >usecs"
-msgstr "B<LogTimeFormat >usecs"
+msgid "B<AutoPurgeJobs No>"
+msgstr "B<AutoPurgeJobs No>"
 
-#. #MaxClients
+#. #BrowseDNSSDSubTypes
 #. type: Plain text
-#: cupsd.conf.man.in:292
+#: cupsd.conf.5:49
 msgid ""
-"Specifies the format of the date and time in the log files.  The value "
-"\"standard\" is the default and logs whole seconds while \"usecs\" logs "
-"microseconds."
+"Specifies whether to purge job history data automatically when it is no "
+"longer required for quotas.  The default is \"No\"."
 msgstr ""
-"Legt das Format von Datum und Uhrzeit in den Protokolldateien fest. Der Wert "
-"»standard« ist die Vorgabe und protokolliert in ganzen Sekunden, während "
-"»usecs« in Mikrosekunden protokolliert."
+"Legt fest, ob die Verlaufsdaten des Auftrags automatisch bereinigt "
+"(gelöscht) werden sollen, wenn sie nicht mehr für Quotas benötigt werden. "
+"Die Vorgabe ist »No«."
 
 #. type: TP
-#: cupsd.conf.man.in:292
+#: cupsd.conf.5:49
 #, no-wrap
-msgid "B<MaxClients >I<number>"
-msgstr "B<MaxClients >I<Anzahl>"
+msgid "B<BrowseDNSSDSubTypes>I<_subtype[,...]>"
+msgstr ""
 
-#. #MaxClientPerHost
+#. #BrowseLocalProtocols
 #. type: Plain text
-#: cupsd.conf.man.in:297
+#: cupsd.conf.5:55
 msgid ""
-"Specifies the maximum number of simultaneous clients that are allowed by the "
-"scheduler.  The default is \"100\"."
+"Specifies a list of Bonjour sub-types to advertise for each shared printer.  "
+"For example, \"BrowseDNSSDSubTypes _cups,_print\" will tell network clients "
+"that both CUPS sharing and IPP Everywhere are supported.  The default is "
+"\"_cups\" which is necessary for printer sharing to work between systems "
+"using CUPS."
 msgstr ""
-"Legt die maximale Anzahl an gleichzeitigen Clients, die vom Auftragsplaner "
-"erlaubt werden, fest. Die Vorgabe ist »100«."
 
 #. type: TP
-#: cupsd.conf.man.in:297
+#: cupsd.conf.5:55
 #, no-wrap
-msgid "B<MaxClientsPerHost >I<number>"
-msgstr "B<MaxClientsPerHost >I<Anzahl>"
+msgid "B<BrowseLocalProtocols all>"
+msgstr "B<BrowseLocalProtocols all>"
 
-#. #MaxCopies
-#. type: Plain text
-#: cupsd.conf.man.in:303
-msgid ""
-"Specifies the maximum number of simultaneous clients that are allowed from a "
-"single address.  The default is the MaxClients value."
-msgstr ""
-"Legt die maximale Anzahl an gleichzeitigen Clients, die von einer einzigen "
-"Adresse erlaubt sind, fest. Die Vorgabe ist der Wert MaxClients."
+#. type: TP
+#: cupsd.conf.5:57
+#, no-wrap
+msgid "B<BrowseLocalProtocols dnssd>"
+msgstr "B<BrowseLocalProtocols dnssd>"
 
 #. type: TP
-#: cupsd.conf.man.in:303
+#: cupsd.conf.5:59
 #, no-wrap
-msgid "B<MaxCopies >I<number>"
-msgstr "B<MaxCopies >I<Anzahl>"
+msgid "B<BrowseLocalProtocols none>"
+msgstr "B<BrowseLocalProtocols none>"
 
-#. #MaxHoldTime
+#. #BrowseWebIF
 #. type: Plain text
-#: cupsd.conf.man.in:308
+#: cupsd.conf.5:64
 msgid ""
-"Specifies the maximum number of copies that a user can print of each job.  "
-"The default is \"9999\"."
+"Specifies which protocols to use for local printer sharing.  The default is "
+"\"dnssd\" on systems that support Bonjour and \"none\" otherwise."
 msgstr ""
-"Legt die maximale Anzahl an Kopien, die ein Benutzer bei jedem Auftrag "
-"drucken kann, fest. Die Vorgabe ist »9999«."
+"Spezifziert, welches Protokoll für die lokale Druckerfreigabe verwandt wird. "
+"Die Vorgabe ist »dnssd« auf Systemen, die Bonjour unterstützen und "
+"andernfalls »none«."
 
 #. type: TP
-#: cupsd.conf.man.in:308
+#: cupsd.conf.5:64
 #, no-wrap
-msgid "B<MaxHoldTime >I<seconds>"
-msgstr "B<MaxHoldTime >I<Sekunden>"
-
-#. #MaxJobs
-#. type: Plain text
-#: cupsd.conf.man.in:313
-msgid ""
-"Specifies the maximum time a job may remain in the \"indefinite\" hold state "
-"before it is canceled.  The default is \"0\" which disables cancellation of "
-"held jobs."
-msgstr ""
-"Legt die maximale Zeit, die ein Auftrag für »unbestimmte« Zeit angehalten "
-"bleiben darf, bevor er abgebrochen wird, fest. Die Vorgabe ist »0«, womit "
-"gehaltene Aufträge abgebrochen werden."
+msgid "B<BrowseWebIF Yes>"
+msgstr "B<BrowseWebIF Yes>"
 
 #. type: TP
-#: cupsd.conf.man.in:313
+#: cupsd.conf.5:66
 #, no-wrap
-msgid "B<MaxJobs >I<number>"
-msgstr "B<MaxJobs >I<Anzahl>"
+msgid "B<BrowseWebIF No>"
+msgstr "B<BrowseWebIF No>"
 
-#. #MaxJobsPerPrinter
+#. #Browsing
 #. type: Plain text
-#: cupsd.conf.man.in:319
+#: cupsd.conf.5:72
 msgid ""
-"Specifies the maximum number of simultaneous jobs that are allowed.  Set to "
-"\"0\" to allow an unlimited number of jobs.  The default is \"500\"."
+"Specifies whether the CUPS web interface is advertised.  The default is \"No"
+"\"."
 msgstr ""
-"Legt die maximale Anzahl an gleichzeitigen Aufträgen, die erlaubt sind, "
-"fest. Setzen Sie dies auf »0«, um eine unbegrenzte Anzahl an Aufträgen zu "
-"erlauben. Die Vorgabe ist »500«."
+"Legt fest, ob die CUPS-Web-Schnittstelle bekanntgemacht wird. Die Vorgabe "
+"ist »No«."
 
 #. type: TP
-#: cupsd.conf.man.in:319
+#: cupsd.conf.5:72
 #, no-wrap
-msgid "B<MaxJobsPerPrinter >I<number>"
-msgstr "B<MaxJobsPerPrinter >I<Anzahl>"
+msgid "B<Browsing Yes>"
+msgstr "B<Browsing Yes>"
 
-#. #MaxJobsPerUser
+#. type: TP
+#: cupsd.conf.5:74
+#, no-wrap
+msgid "B<Browsing No>"
+msgstr "B<Browsing No>"
+
+#. #DefaultAuthType
 #. type: Plain text
-#: cupsd.conf.man.in:324
+#: cupsd.conf.5:80
 msgid ""
-"Specifies the maximum number of simultaneous jobs that are allowed per "
-"printer.  The default is \"0\" which allows up to MaxJobs jobs per printer."
+"Specifies whether shared printers are advertised.  The default is \"No\"."
 msgstr ""
-"Legt die maximale Anzahl an Aufträgen, die gleichzeitig pro Drucker erlaubt "
-"sind, fest. Die Vorgabe ist »0«, womit bis zu MaxJobs Aufträge pro Drucker "
-"erlaubt sind."
+"Legt fest, ob freigegebene Drucker bekanntgemacht werden. Die Vorgabe ist "
+"»No«."
 
 #. type: TP
-#: cupsd.conf.man.in:324
+#: cupsd.conf.5:80
 #, no-wrap
-msgid "B<MaxJobsPerUser >I<number>"
-msgstr "B<MaxJobsPerUser >I<Anzahl>"
+msgid "B<DefaultAuthType Basic>"
+msgstr "B<DefaultAuthType Basic>"
 
-#. #MaxJobTime
+#. type: TP
+#: cupsd.conf.5:82
+#, no-wrap
+msgid "B<DefaultAuthType Negotiate>"
+msgstr "B<DefaultAuthType Negotiate>"
+
+#. #DefaultEncryption
 #. type: Plain text
-#: cupsd.conf.man.in:329
+#: cupsd.conf.5:88
 msgid ""
-"Specifies the maximum number of simultaneous jobs that are allowed per "
-"user.  The default is \"0\" which allows up to MaxJobs jobs per user."
+"Specifies the default type of authentication to use.  The default is \"Basic"
+"\"."
 msgstr ""
-"Legt die maximale Anzahl an Aufträgen, die gleichzeitig pro Benutzer erlaubt "
-"sind, fest. Die Vorgabe ist »0«, womit bis zu MaxJobs Aufträge pro Benutzer "
-"erlaubt sind."
+"Legt den standardmäßig zu verwendenden Authentifizierungstyp fest. Die "
+"Vorgabe ist »Basic«."
 
 #. type: TP
-#: cupsd.conf.man.in:329
+#: cupsd.conf.5:88
 #, no-wrap
-msgid "B<MaxJobTime >I<seconds>"
-msgstr "B<MaxJobTime >I<Sekunden>"
+msgid "B<DefaultEncryption Never>"
+msgstr "B<DefaultEncryption Never>"
 
-#. #MaxLogSize
-#. type: Plain text
-#: cupsd.conf.man.in:335
-msgid ""
-"Specifies the maximum time a job may take to print before it is canceled.  "
-"Set to \"0\" to disable cancellation of \"stuck\" jobs.  The default is "
-"\"10800\" (3 hours)."
-msgstr ""
-"legt die maximale Zeit, die ein Auftrag zum Drucken verbrauchen darf, bevor "
-"er abgebrochen wird, fest. Falls auf 0 gesetzt, werden keine "
-"»hängenden« (stuck) Aufträge abgebrochen. Die Vorgabe ist 10800 Sekunden (3 "
-"Stunden)."
+#. type: TP
+#: cupsd.conf.5:90
+#, no-wrap
+msgid "B<DefaultEncryption IfRequested>"
+msgstr "B<DefaultEncryption IfRequested>"
 
 #. type: TP
-#: cupsd.conf.man.in:335
+#: cupsd.conf.5:92
 #, no-wrap
-msgid "B<MaxLogSize >I<size>"
-msgstr "B<MaxLogSize >I<Größe>"
+msgid "B<DefaultEncryption Required>"
+msgstr "B<DefaultEncryption Required>"
 
-#. #MultipleOperationTimeout
+#. #DefaultLanguage
 #. type: Plain text
-#: cupsd.conf.man.in:341
+#: cupsd.conf.5:97
 msgid ""
-"Specifies the maximum size of the log files before they are rotated.  The "
-"value \"0\" disables log rotation.  The default is \"1048576\" (1MB)."
+"Specifies whether encryption will be used for authenticated requests.  The "
+"default is \"Required\"."
 msgstr ""
-"Legt die maximale Größe der Protokolldateien, bevor sie rotiert werden, "
-"fest. Der Wert »0« deaktiviert die Rotation der Protokolldateien. Die "
-"Vorgabe ist »1048576« (1 MB)."
+"Gibt an, ob Verschlüsselung für authentifizierte Anfragen benutzt werden "
+"soll. Die Vorgabe ist »Required«."
 
 #. type: TP
-#: cupsd.conf.man.in:341
+#: cupsd.conf.5:97
 #, no-wrap
-msgid "B<MultipleOperationTimeout >I<seconds>"
-msgstr "B<MultipleOperationTimeout >I<Sekunden>"
+msgid "B<DefaultLanguage >I<locale>"
+msgstr "B<DefaultLanguage >I<Standorteinstellung>"
 
-#. #Policy
+#. #DefaultPaperSize
 #. type: Plain text
-#: cupsd.conf.man.in:346
+#: cupsd.conf.5:102
 msgid ""
-"Specifies the maximum amount of time to allow between files in a multiple "
-"file print job.  The default is \"900\" (15 minutes)."
+"Specifies the default language to use for text and web content.  The default "
+"is \"en\"."
 msgstr ""
-"Legt die maximal erlaubte Zeit zwischen Dateien in einem Druckauftrag aus "
-"mehreren Dateien fest. Die Vorgabe ist »900« (15 Minuten)."
+"Legt die Standardsprache, die für Text und Webinhalte verwandt werden soll, "
+"fest. Die Vorgabe ist »en«."
 
 #. type: TP
-#: cupsd.conf.man.in:346
+#: cupsd.conf.5:102
 #, no-wrap
-msgid "B<E<lt>Policy >I<name>B<E<gt> >... B<E<lt>/PolicyE<gt>>"
-msgstr "B<E<lt>Policy >I<Name>B<E<gt> >… B<E<lt>/PolicyE<gt>>"
-
-#. #Port
-#. type: Plain text
-#: cupsd.conf.man.in:350
-msgid "Specifies access control for the named policy."
-msgstr "Legt die Zugriffskontrolle für die genannte Richtlinie fest."
+msgid "B<DefaultPaperSize Auto>"
+msgstr "B<DefaultPaperSize Auto>"
 
 #. type: TP
-#: cupsd.conf.man.in:350
+#: cupsd.conf.5:104
 #, no-wrap
-msgid "B<Port >I<number>"
-msgstr "B<Port >I<Nummer>"
-
-#. #PreserveJobFiles
-#. type: Plain text
-#: cupsd.conf.man.in:354
-msgid "Listens to the specified port number for connections."
-msgstr "Wartet auf der angegebenen Portnummer auf Verbindungen."
+msgid "B<DefaultPaperSize None>"
+msgstr "B<DefaultPaperSize None>"
 
 #. type: TP
-#: cupsd.conf.man.in:354
+#: cupsd.conf.5:106
 #, no-wrap
-msgid "B<PreserveJobFiles Yes>"
-msgstr "B<PreserveJobFiles Yes>"
+msgid "B<DefaultPaperSize >I<sizename>"
+msgstr "B<DefaultPaperSize >I<Größenname>"
 
-#. type: TP
-#: cupsd.conf.man.in:356
-#, no-wrap
-msgid "B<PreserveJobFiles No>"
-msgstr "B<PreserveJobFiles No>"
+#. #DefaultPolicy
+#. type: Plain text
+#: cupsd.conf.5:112
+msgid ""
+"Specifies the default paper size for new print queues. \"Auto\" uses a "
+"locale-specific default, while \"None\" specifies there is no default paper "
+"size.  Specific size names are typically \"Letter\" or \"A4\".  The default "
+"is \"Auto\"."
+msgstr ""
+"Gibt die Standardpapiergröße für neue Druckerwarteschlangen an. »Auto« "
+"benutzt eine standortabhängige Vorgabe, während »None« angibt, dass keine "
+"Papiergröße vorgegeben ist. Bestimmte Größennamen sind typischerweise "
+"»Letter« oder »A4«. Die Vorgabe ist »Auto«."
 
 #. type: TP
-#: cupsd.conf.man.in:358
+#: cupsd.conf.5:112
 #, no-wrap
-msgid "B<PreserveJobFiles >I<seconds>"
-msgstr "B<PreserveJobFiles >I<Sekunden>"
+msgid "B<DefaultPolicy >I<policy-name>"
+msgstr "B<DefaultPolicy >I<Richtlinienname>"
 
-#. #PreserveJobHistory
+#. #DefaultShared
 #. type: Plain text
-#: cupsd.conf.man.in:364
+#: cupsd.conf.5:117
 msgid ""
-"Specifies whether job files (documents) are preserved after a job is "
-"printed.  If a numeric value is specified, job files are preserved for the "
-"indicated number of seconds after printing.  The default is "
-"\"86400\" (preserve 1 day)."
+"Specifies the default access policy to use.  The default access policy is "
+"\"default\"."
 msgstr ""
-"Legt fest, ob Auftragsdateien (Dokumente) erhalten bleiben, nachdem ein "
-"Auftrag gedruckt wurde. Falls ein numerischer Wert angegeben wird, werden "
-"die Auftragsdateien für die angegebene Anzahl an Sekunden nach dem Druck "
-"erhalten. Die Vorgabe ist »86400« (einen Tag erhalten)."
-
-#. type: TP
-#: cupsd.conf.man.in:364
-#, no-wrap
-msgid "B<PreserveJobHistory Yes>"
-msgstr "B<PreserveJobHistory Yes>"
+"Legt die zu verwendende Standardzugriffsrichtlinie fest. Die "
+"Standardzugriffsrichtlinie ist »default«."
 
 #. type: TP
-#: cupsd.conf.man.in:366
+#: cupsd.conf.5:117
 #, no-wrap
-msgid "B<PreserveJobHistory No>"
-msgstr "B<PreserveJobHistory No>"
+msgid "B<DefaultShared Yes>"
+msgstr "B<DefaultShared Yes>"
 
 #. type: TP
-#: cupsd.conf.man.in:368
+#: cupsd.conf.5:119
 #, no-wrap
-msgid "B<PreserveJobHistory >I<seconds>"
-msgstr "B<PreserveJobHistory >I<Sekunden>"
+msgid "B<DefaultShared No>"
+msgstr "B<DefaultShared No>"
 
-#. #ReloadTimeout
+#. #DirtyCleanInterval
 #. type: Plain text
-#: cupsd.conf.man.in:375
+#: cupsd.conf.5:124
 msgid ""
-"Specifies whether the job history is preserved after a job is printed.  If a "
-"numeric value is specified, the job history is preserved for the indicated "
-"number of seconds after printing.  If \"Yes\", the job history is preserved "
-"until the MaxJobs limit is reached.  The default is \"Yes\"."
+"Specifies whether local printers are shared by default.  The default is \"Yes"
+"\"."
 msgstr ""
-"Legt fest, ob die Auftragschronik nach dem Druck behalten wird. Falls ein "
-"numerischer Wert angegeben ist, wird die Auftragschronik für die angegebene "
-"Anzahl von Sekunden nach dem Druck behalten. Falls »Yes« wird die "
-"Auftragschronik behalten, bis die Begrenzung MaxJobs erreicht ist. Die "
-"Vorgabe ist »Yes«."
+"Legt fest, ob lokale Drucker standardmäßig freigegeben sind. Die Vorgabe ist "
+"»Yes«."
 
 #. type: TP
-#: cupsd.conf.man.in:375
+#: cupsd.conf.5:124
 #, no-wrap
-msgid "B<ReloadTimeout >I<seconds>"
-msgstr "B<ReloadTimeout >I<Sekunden>"
+msgid "B<DirtyCleanInterval >I<seconds>"
+msgstr "B<DirtyCleanInterval >I<Sekunden>"
 
-#. #ServerAdmin
+#. #DNSSDHostName
 #. type: Plain text
-#: cupsd.conf.man.in:380
+#: cupsd.conf.5:130
 msgid ""
-"Specifies the amount of time to wait for job completion before restarting "
-"the scheduler.  The default is \"30\"."
+"Specifies the delay for updating of configuration and state files.  A value "
+"of 0 causes the update to happen as soon as possible, typically within a few "
+"milliseconds.  The default value is \"30\"."
 msgstr ""
-"Legt die Zeitspanne, während der auf die Beendigung von Aufträgen gewartet "
-"werden soll, bevor der Auftragsplaner (Scheduler) neu gestartet wird, fest. "
-"Die Vorgabe ist »30«."
+"Gibt die Verzögerungszeit für die Aktualisierung von Konfigurations- und "
+"Statusdateien an. Ein Wert von 0 veranlasst, dass die Aktualisierung so "
+"schnell wie möglich erfolgt, typischerweise innerhalb von wenigen "
+"Millisekunden. Die Vorgabe ist »30«."
 
 #. type: TP
-#: cupsd.conf.man.in:380
+#: cupsd.conf.5:130
 #, no-wrap
-msgid "B<ServerAdmin >I<email-address>"
-msgstr "B<ServerAdmin >I<E-Mail-Adresse>"
+msgid "B<DNSSDHostName>I<hostname.example.com>"
+msgstr ""
 
-#. #ServerAlias
+#. #ErrorPolicy
 #. type: Plain text
-#: cupsd.conf.man.in:385
+#: cupsd.conf.5:135
+#, fuzzy
 msgid ""
-"Specifies the email address of the server administrator.  The default value "
-"is \"root@ServerName\"."
+"Specifies the fully-qualified domain name for the server that is used for "
+"Bonjour sharing.  The default is typically the server's \".local\" hostname."
 msgstr ""
-"Legt die E-Mail-Adresse des Server-Administrators fest. Die Vorgabe ist "
-"»root@ServerName«."
-
-#. type: TP
-#: cupsd.conf.man.in:385
-#, no-wrap
-msgid "B<ServerAlias >I<hostname >[ ... I<hostname >]"
-msgstr "B<ServerAlias >I<Rechnername >[ … I<Rechnername >]"
+"Legt den vollqualifizierten Rechnernamen des Servers fest. Die Vorgabe ist "
+"der Wert, der von dem Befehl B<hostname>(1) berichtet wird."
 
 #. type: TP
-#: cupsd.conf.man.in:387
+#: cupsd.conf.5:135
 #, no-wrap
-msgid "B<ServerAlias *>"
-msgstr "B<ServerAlias *>"
+msgid "B<ErrorPolicy abort-job>"
+msgstr "B<ErrorPolicy abort-job>"
 
-#. #ServerName
 #. type: Plain text
-#: cupsd.conf.man.in:393
+#: cupsd.conf.5:138
 msgid ""
-"The ServerAlias directive is used for HTTP Host header validation when "
-"clients connect to the scheduler from external interfaces.  Using the "
-"special name \"*\" can expose your system to known browser-based DNS "
-"rebinding attacks, even when accessing sites through a firewall.  If the "
-"auto-discovery of alternate names does not work, we recommend listing each "
-"alternate name with a ServerAlias directive instead of using \"*\"."
+"Specifies that a failed print job should be aborted (discarded) unless "
+"otherwise specified for the printer."
 msgstr ""
-"Die Direktive ServerAlias wird für die Überprüfung von HTTP-Host-Kopfzeilen "
-"bei der Verbindungsaufnahme von Clients zum Auftragsplaner über externe "
-"Schnittstellen verwandt. Wenn Sie den besonderen Name »*« verwenden, kann "
-"Ihr System für Browser-basierte DNS-Rebinding-Angriffe verwundbar werden, "
-"selbst wenn die Zugriffe über eine Firewall erfolgen. Falls die automatische "
-"Erkennung von alternativen Namen nicht funktioniert, empfehlen wir, jeden "
-"alternativen Namen mit der Direktive ServerAlias aufzuführen, statt »*« zu "
-"verwenden."
+"Legt fest, dass ein fehlgeschlagener Druckauftrag abgebrochen (verworfen) "
+"werden soll, es sei denn, es wurde anders für den Drucker festgelegt."
 
 #. type: TP
-#: cupsd.conf.man.in:393
+#: cupsd.conf.5:138
 #, no-wrap
-msgid "B<ServerName >I<hostname>"
-msgstr "B<ServerName >I<Rechnername>"
+msgid "B<ErrorPolicy retry-current-job>"
+msgstr "B<ErrorPolicy retry-current-job>"
 
-#. #ServerTokens
 #. type: Plain text
-#: cupsd.conf.man.in:400
+#: cupsd.conf.5:141
 msgid ""
-"Specifies the fully-qualified hostname of the server.  The default is the "
-"value reported by the B<hostname>(1)  command."
+"Specifies that a failed print job should be retried immediately unless "
+"otherwise specified for the printer."
 msgstr ""
-"Legt den vollqualifizierten Rechnernamen des Servers fest. Die Vorgabe ist "
-"der Wert, der von dem Befehl B<hostname>(1) berichtet wird."
+"Legt fest, dass ein fehlgeschlagener Druckauftrag sofort neu versucht werden "
+"soll, es sei denn, es wurde anders für den Drucker festgelegt."
 
 #. type: TP
-#: cupsd.conf.man.in:400
+#: cupsd.conf.5:141
 #, no-wrap
-msgid "B<ServerTokens None>"
-msgstr "B<ServerTokens None>"
+msgid "B<ErrorPolicy retry-job>"
+msgstr "B<ErrorPolicy retry-job>"
 
-#. type: TP
-#: cupsd.conf.man.in:402
-#, no-wrap
-msgid "B<ServerTokens ProductOnly>"
-msgstr "B<ServerTokens ProductOnly>"
+#. type: Plain text
+#: cupsd.conf.5:144
+msgid ""
+"Specifies that a failed print job should be retried at a later time unless "
+"otherwise specified for the printer. The 'retry-job' error policy is the "
+"default."
+msgstr ""
+"Legt fest, dass ein fehlgeschlagener Druckauftrag zu einem späteren "
+"Zeitpunkt neu versucht werden soll, es sei denn, es wurde anders für den "
+"Drucker festgelegt. Die Fehler-Richtlinie »retry-job« ist die Vorgabe."
 
 #. type: TP
-#: cupsd.conf.man.in:404
+#: cupsd.conf.5:144
 #, no-wrap
-msgid "B<ServerTokens Major>"
-msgstr "B<ServerTokens Major>"
+msgid "B<ErrorPolicy stop-printer>"
+msgstr "B<ErrorPolicy stop-printer>"
 
-#. type: TP
-#: cupsd.conf.man.in:406
-#, no-wrap
-msgid "B<ServerTokens Minor>"
-msgstr "B<ServerTokens Minor>"
+#. #FilterLimit
+#. type: Plain text
+#: cupsd.conf.5:148
+msgid ""
+"Specifies that a failed print job should stop the printer unless otherwise "
+"specified for the printer."
+msgstr ""
+"Legt fest, dass ein fehlgeschlagener Druckauftrag den Drucker anhalten soll, "
+"es sei denn, es wurde anders für den Drucker festgelegt."
 
 #. type: TP
-#: cupsd.conf.man.in:408
+#: cupsd.conf.5:148
 #, no-wrap
-msgid "B<ServerTokens Minimal>"
-msgstr "B<ServerTokens Minimal>"
+msgid "B<FilterLimit >I<limit>"
+msgstr "B<FilterLimit >I<Beschränkung>"
 
-#. type: TP
-#: cupsd.conf.man.in:410
-#, no-wrap
-msgid "B<ServerTokens OS>"
-msgstr "B<ServerTokens OS>"
+#. #FilterNice
+#. type: Plain text
+#: cupsd.conf.5:157
+msgid ""
+"Specifies the maximum cost of filters that are run concurrently, which can "
+"be used to minimize disk, memory, and CPU resource problems.  A limit of 0 "
+"disables filter limiting.  An average print to a non-PostScript printer "
+"needs a filter limit of about 200.  A PostScript printer needs about half "
+"that (100).  Setting the limit below these thresholds will effectively limit "
+"the scheduler to printing a single job at any time.  The default limit is "
+"\"0\"."
+msgstr ""
+"Legt die maximale Belastung gleichzeitig ausgeführter Filter fest. Damit "
+"können Platten-, Arbeitsspeicher- und CPU-Ressourcenprobleme minimiert "
+"werden. Eine Beschränkung von 0 deaktiviert die Beschränkung von Filtern. "
+"Ein durchschnittlicher Ausdruck auf einem Nicht-PostScript-Drucker benötigt "
+"eine Filter-Beschränkung von ungefähr 200. Ein PostScript-Drucker benötigt "
+"ungefähr die Hälfte (100) davon. Wird die Beschränkung unterhalb dieser "
+"Schwellen gesetzt, wird der Auftragsplaner effektiv darauf eingeschränkt, "
+"immer nur einen einzelnen Auftrag gleichzeitig zu drucken. Die Vorgabe ist "
+"»0«."
 
 #. type: TP
-#: cupsd.conf.man.in:412
+#: cupsd.conf.5:157
 #, no-wrap
-msgid "B<ServerTokens Full>"
-msgstr "B<ServerTokens Full>"
+msgid "B<FilterNice >I<nice-value>"
+msgstr "B<FilterNice >I<Nice-Wert>"
 
-#. #SSLListen
+#. #GSSServiceName
 #. type: Plain text
-#: cupsd.conf.man.in:426
-#, fuzzy
+#: cupsd.conf.5:165
 msgid ""
-"Specifies what information is included in the Server header of HTTP "
-"responses.  \"None\" disables the Server header.  \"ProductOnly\" reports "
-"\"CUPS\".  \"Major\" reports \"CUPS 2\".  \"Minor\" reports \"CUPS 2.0\".  "
-"\"Minimal\" reports \"CUPS 2.0.0\".  \"OS\" reports \"CUPS 2.0.0 (UNAME)\" "
-"where UNAME is the output of the B<uname>(1)  command.  \"Full\" reports "
-"\"CUPS 2.0.0 (UNAME) IPP/2.0\".  The default is \"Minimal\"."
+"Specifies the scheduling priority ( B<nice>(8)  value) of filters that are "
+"run to print a job.  The nice value ranges from 0, the highest priority, to "
+"19, the lowest priority.  The default is 0."
 msgstr ""
-"Legt fest, welche Informationen in die Server-Kopfzeilen von HTTP-Antworten "
-"aufgenommen werden. »None« deaktiviert die Server-Kopfzeilen. »ProductOnly« "
-"meldet »CUPS«. »Major« berichtet »CUPS 2.0«. »Minimal« berichtet »CUPS "
-"2.0.0«. »OS« berichtet »CUPS 2.0.0 (UNAME)«, wobei UNAME die Ausgabe des "
-"Befehls B<uname>(1) ist. »Full« berichtet »CUPS 2.0.0 (UNAME) IPP/2.0«. Die "
-"Vorgabe ist »Minimal«."
+"Legt die Planungspriorität (B<nice>(8)-Wert) von Filtern, die laufen, um "
+"einen Druckauftrag auszudrucken, fest. Die »nice«-Werte liegen im Bereich "
+"von 0 (der höchsten Priorität) bis zu 19, der niedrigsten Priorität. Die "
+"Vorgabe ist 0."
+
+#. type: Plain text
+#: cupsd.conf.5:169
+msgid ""
+"Specifies the service name when using Kerberos authentication.  The default "
+"service name is \"http.\""
+msgstr ""
+"Legt den Dienstenamen, wenn Kerberos-Authentifizierung eingesetzt wird, "
+"fest. Der Vorgabedienstname ist »http«."
 
+#. #HostNameLookups
 #. type: TP
-#: cupsd.conf.man.in:426
+#: cupsd.conf.5:169
 #, no-wrap
-msgid "B<SSLListen >I<ipv4-address>B<:>I<port>"
-msgstr "B<SSLListen >I<IPv4-Adresse>B<:>I<Port>"
+msgid "B<HostNameLookups On>"
+msgstr "B<HostNameLookups On>"
 
 #. type: TP
-#: cupsd.conf.man.in:428
+#: cupsd.conf.5:172
 #, no-wrap
-msgid "B<SSLListen [>I<ipv6-address>B<]:>I<port>"
-msgstr "B<SSLListen [>I<IPv6-Adresse>B<]:>I<Port>"
+msgid "B<HostNameLookups Off>"
+msgstr "B<HostNameLookups Off>"
 
 #. type: TP
-#: cupsd.conf.man.in:430
+#: cupsd.conf.5:174
 #, no-wrap
-msgid "B<SSLListen *:>I<port>"
-msgstr "B<SSLListen *:>I<Port>"
-
-#. #SSLOptions
-#. type: Plain text
-#: cupsd.conf.man.in:434
-msgid "Listens on the specified address and port for encrypted connections."
-msgstr ""
-"Wartet auf der angegebenen Adresse und dem Port auf verschlüsselte "
-"Verbindungen."
+msgid "B<HostNameLookups Double>"
+msgstr "B<HostNameLookups Double>"
 
-#. #SSLPort
+#. #IdleExitTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:448
+#: cupsd.conf.5:184
 msgid ""
-"Sets encryption options.  By default, CUPS only supports encryption using "
-"TLS v1.0 or higher using known secure cipher suites.  Security is reduced "
-"when I<Allow> options are used.  Security is enhanced when I<Deny> options "
-"are used.  The I<AllowDH> option enables cipher suites using plain Diffie-"
-"Hellman key negotiation (not supported on systems using GNU TLS).  The "
-"I<AllowRC4> option enables the 128-bit RC4 cipher suites, which are required "
-"for some older clients.  The I<AllowSSL3> option enables SSL v3.0, which is "
-"required for some older clients that do not support TLS v1.0.  The "
-"I<DenyCBC> option disables all CBC cipher suites.  The I<DenyTLS1.0> option "
-"disables TLS v1.0 support - this sets the minimum protocol version to TLS "
-"v1.1."
-msgstr ""
-"Setzt die Verschlüsselungsoptionen (nur in /etc/cups/client.conf). "
-"Standardmäßig unterstützt CUPS nur Verschlüsselung mit TLS v1.0 oder höher "
-"mit bekannt sicheren Algorithmen. Wenn I<Allow>-Optionen verwandt werden, "
-"wird die Sicherheit reduziert. Wenn I<Deny>-Optionen verwandt werden, wird "
-"die Sicherheit verbessert. Die Option I<AllowDH> aktiviert Algorithmen, die "
-"den einfachen Diffie-Hellman-Schlüsselaustausch verwenden (für Systeme, die "
-"GNU TLS verwenden, wird dies nicht unterstützt). Die Option I<AllowRC4> "
-"aktiviert die 128-bit-RC4-Algorithmen, die für einige älteren Clients "
-"benötigt werden. Die Option I<AllowSSL3> aktiviert SSL v3.0, das für einige "
-"ältere Clients benötigt wird, die TLS v1.0 nicht unterstützen. Die Option "
-"I<DenyCBC> deaktiviert alle CBC-Algorithmen. Die Option I<DenyTLS1.0> "
-"deaktiviert die TLS-v1.0-Unterstützung - damit wird die minimale "
-"Protokollversion auf TLS v1.1 gesetzt."
+"Specifies whether to do reverse lookups on connecting clients.  The \"Double"
+"\" setting causes B<cupsd>(8)  to verify that the hostname resolved from the "
+"address matches one of the addresses returned for that hostname.  Double "
+"lookups also prevent clients with unregistered addresses from connecting to "
+"your server.  The default is \"Off\" to avoid the potential server "
+"performance problems with hostname lookups.  Only set this option to \"On\" "
+"or \"Double\" if absolutely required."
+msgstr ""
+"Legt fest, ob Rückwärtsauflösung bei sich verbindenden Clients durchgeführt "
+"werden soll. Die Einstellung »Double« veranlasst B<cupsd>(8) zu prüfen, ob "
+"der über die Adresse aufgelöste Rechnername zu einer der dafür "
+"zurückgegebenen Adressen passt. Das Nachschlagen mit »Double« verhindert "
+"außerdem, dass sich Clients mit nicht registrierten Adressen mit Ihrem "
+"Server verbinden. Die Voreinstellung ist »Off«, um potenzielle Probleme mit "
+"der Systemleistung durch das Nachschlagen von Rechnernamen zu vermeiden. "
+"Setzen Sie diese Option nur auf »On« oder »Double«, wenn dies unbedingt "
+"erforderlich ist. "
 
 #. type: TP
-#: cupsd.conf.man.in:448
+#: cupsd.conf.5:184
 #, no-wrap
-msgid "B<SSLPort >I<port>"
-msgstr "B<SSLPort >I<Port>"
+msgid "B<IdleExitTimeout >I<seconds>"
+msgstr "B<IdleExitTimeout >I<Sekunden>"
 
-#. #StrictConformance
+#. #JobKillDelay
 #. type: Plain text
-#: cupsd.conf.man.in:452
-msgid "Listens on the specified port for encrypted connections."
-msgstr "Wartet auf dem angegebenen Port auf verschlüsselte Verbindungen."
+#: cupsd.conf.5:192
+msgid ""
+"Specifies the length of time to wait before shutting down due to "
+"inactivity.  The default is \"60\" seconds.  Note: Only applicable when "
+"B<cupsd>(8)  is run on-demand (e.g., with B<-l>)."
+msgstr ""
+"Legt die Wartedauer fest, bevor aufgrund von Inaktivität abgeschaltet wird. "
+"Die Vorgabe ist »60« Sekunden. Beachten Sie: Dies trifft nur zu, wenn "
+"B<cupsd>(8) auf Anforderung (z.B. mit B<-l>) läuft."
 
 #. type: TP
-#: cupsd.conf.man.in:452
+#: cupsd.conf.5:192
 #, no-wrap
-msgid "B<StrictConformance Yes>"
-msgstr "B<StrictConformance Yes>"
+msgid "B<JobKillDelay >I<seconds>"
+msgstr "B<JobKillDelay >I<Sekunden>"
+
+#. #JobRetryInterval
+#. type: Plain text
+#: cupsd.conf.5:197
+msgid ""
+"Specifies the number of seconds to wait before killing the filters and "
+"backend associated with a canceled or held job.  The default is \"30\"."
+msgstr ""
+"Legt die Anzahl von Sekunden zum Warten, bevor die Filter und Backends "
+"beendet werden, die mit einem abgebrochenen oder angehaltenen Druckauftrag "
+"verbunden sind, fest. Die Vorgabe ist »30«."
 
 #. type: TP
-#: cupsd.conf.man.in:454
+#: cupsd.conf.5:197
 #, no-wrap
-msgid "B<StrictConformance No>"
-msgstr "B<StrictConformance No>"
+msgid "B<JobRetryInterval >I<seconds>"
+msgstr "B<JobRetryInterval >I<Sekunden>"
 
-#. #Timeout
+#. #JobRetryLimit
 #. type: Plain text
-#: cupsd.conf.man.in:459
+#: cupsd.conf.5:203
 msgid ""
-"Specifies whether the scheduler requires clients to strictly adhere to the "
-"IPP specifications.  The default is \"No\"."
+"Specifies the interval between retries of jobs in seconds.  This is "
+"typically used for fax queues but can also be used with normal print queues "
+"whose error policy is \"retry-job\" or \"retry-current-job\".  The default "
+"is \"30\"."
 msgstr ""
-"Legt fest, ob der Auftragsplaner von den Clients verlangt, dass sie streng "
-"den IPP-Spezifikationen folgen. Die Vorgabe ist »No«."
+"Legt das Intervall in Sekunden, in dem der Auftrag erneut versucht wird, "
+"fest. Dies wird typischerweise für Fax-Warteschlangen verwandt, kann aber "
+"auch mit normalen Druckwarteschlangen verwendet werden, deren "
+"Fehlerrichtlinie »retry-job« oder »retry-current-job« ist. Die Vorgabe ist "
+"»30«."
 
 #. type: TP
-#: cupsd.conf.man.in:459
+#: cupsd.conf.5:203
 #, no-wrap
-msgid "B<Timeout >I<seconds>"
-msgstr "B<Timeout >I<Sekunden>"
+msgid "B<JobRetryLimit >I<count>"
+msgstr "B<JobRetryLimit >I<Anzahl>"
 
-#. #WebInterface
+#. #KeepAlive
 #. type: Plain text
-#: cupsd.conf.man.in:464
+#: cupsd.conf.5:209
 msgid ""
-"Specifies the HTTP request timeout.  The default is \"900\" (15 minutes)."
+"Specifies the number of retries that are done for jobs.  This is typically "
+"used for fax queues but can also be used with normal print queues whose "
+"error policy is \"retry-job\" or \"retry-current-job\".  The default is "
+"\"5\"."
 msgstr ""
-"Legt die HTTP-Zeitüberschreitung fest. Die Vorgabe ist »900« (15 Minuten)."
+"Legt die Anzahl der Wiederholungen für Aufträge fest. Dies wird "
+"typischerweise für Fax-Warteschlangen verwandt, kann aber auch mit normalen "
+"Druckwarteschlangen verwendet werden, deren Fehlerrichtlinie »retry-job« "
+"oder »retry-current-job« ist. Die Vorgabe ist »5«."
 
 #. type: TP
-#: cupsd.conf.man.in:464
+#: cupsd.conf.5:209
 #, no-wrap
-msgid "B<WebInterface yes>"
-msgstr "B<WebInterface yes>"
+msgid "B<KeepAlive Yes>"
+msgstr "B<KeepAlive Yes>"
 
 #. type: TP
-#: cupsd.conf.man.in:466
+#: cupsd.conf.5:211
 #, no-wrap
-msgid "B<WebInterface no>"
-msgstr "B<WebInterface no>"
+msgid "B<KeepAlive No>"
+msgstr "B<KeepAlive No>"
 
+#. #KeepAliveTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:470
-msgid "Specifies whether the web interface is enabled.  The default is \"No\"."
+#: cupsd.conf.5:216
+msgid ""
+"Specifies whether to support HTTP keep-alive connections.  The default is "
+"\"Yes\"."
 msgstr ""
-"Legt fest, ob die Webschnittstelle freigegeben ist. Die Vorgabe ist »No«."
-
-#. type: SS
-#: cupsd.conf.man.in:470
-#, no-wrap
-msgid "HTTP METHOD NAMES"
-msgstr "HTTP-METHODENNAMEN"
-
-#. type: Plain text
-#: cupsd.conf.man.in:473
-msgid "The following HTTP methods are supported by B<cupsd>(8):"
-msgstr "Die folgenden HTTP-Methoden werden von B<cupsd>(8) unterstützt:"
+"Legt fest, ob HTTP-keep-alive-Verbindungen unterstützt werden. Die Vorgabe "
+"ist »Yes«."
 
 #. type: TP
-#: cupsd.conf.man.in:473
+#: cupsd.conf.5:216
 #, no-wrap
-msgid "GET"
-msgstr "GET"
+msgid "B<KeepAliveTimeout >I<seconds>"
+msgstr "B<KeepAliveTimeout >I<Sekunden>"
 
+#. #LimitIPP
 #. type: Plain text
-#: cupsd.conf.man.in:476
+#: cupsd.conf.5:221
 msgid ""
-"Used by a client to download icons and other printer resources and to access "
-"the CUPS web interface."
+"Specifies how long an idle client connection remains open.  The default is "
+"\"30\"."
 msgstr ""
-"Wird von einem Client zum Herunterladen von Icons und anderen "
-"Druckressourcen und zum Zugriff auf die CUPS-Webschnittstelle verwandt."
+"Legt fest, wie lange leer laufende Client-Verbindungen offen bleiben sollen. "
+"Die Vorgabe ist »30«."
 
 #. type: TP
-#: cupsd.conf.man.in:476
+#: cupsd.conf.5:221
 #, no-wrap
-msgid "HEAD"
-msgstr "HEAD"
+msgid "B<E<lt>Limit >I<operation >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
+msgstr "B<E<lt>Limit >I<Vorgang >…B<E<gt> >… B<E<lt>/LimitE<gt>>"
 
+#. #Limit
 #. type: Plain text
-#: cupsd.conf.man.in:479
+#: cupsd.conf.5:225
 msgid ""
-"Used by a client to get the type, size, and modification date of resources."
+"Specifies the IPP operations that are being limited inside a Policy section. "
+"IPP operation names are listed below in the section \"IPP OPERATION NAMES\"."
 msgstr ""
-"Wird von einem Client verwandt, um den Typ, die Größe und das Änderungsdatum "
-"von Ressourcen zu erhalten."
+"Legt die IPP-Vorgänge, die innerhalb eines Richtlinienabschnitts begrenzt "
+"werden, fest. IPP-Vorgangsnamen sind weiter unten im Abschnitt »IPP-"
+"VORGANGSNAMEN« beschrieben."
 
-#. type: Plain text
-#: cupsd.conf.man.in:482
-msgid "Used by a client to establish a secure (SSL/TLS) connection."
-msgstr ""
-"Wird vom Client verwandt, um eine sichere (SSL/TLS)-Verbindung zu etablieren."
+#. type: TP
+#: cupsd.conf.5:225
+#, no-wrap
+msgid "B<E<lt>Limit >I<method >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
+msgstr "B<E<lt>Limit >I<Methode >…B<E<gt> >… B<E<lt>/LimitE<gt>>"
 
 #. type: TP
-#: cupsd.conf.man.in:482
+#: cupsd.conf.5:228
 #, no-wrap
-msgid "POST"
-msgstr "POST"
+msgid "B<E<lt>LimitExcept >I<method >...B<E<gt> >... B<E<lt>/LimitExceptE<gt>>"
+msgstr "B<E<lt>LimitExcept >I<Methode >…B<E<gt> >… B<E<lt>/LimitExceptE<gt>>"
 
+#. #LimitRequestBody
 #. type: Plain text
-#: cupsd.conf.man.in:485
+#: cupsd.conf.5:232
 msgid ""
-"Used by a client to submit IPP requests and HTML forms from the CUPS web "
-"interface."
+"Specifies the HTTP methods that are being limited inside a Location section. "
+"HTTP method names are listed below in the section \"HTTP METHOD NAMES\"."
 msgstr ""
-"Wird von einem Client zum Einreichen von IPP-Anfragen und HTML-Formularen "
-"aus der CUPS-Webschnittstelle verwandt."
+"Legt die HTTP-Methoden, die innerhalb eines »Location«-Abschnittes begrenzt "
+"werden, fest. HTTP-Methodennamen sind weiter unten im Abschnitt »HTTP-"
+"METHODENNAMEN« aufgeführt."
 
 #. type: TP
-#: cupsd.conf.man.in:485
+#: cupsd.conf.5:232
 #, no-wrap
-msgid "PUT"
-msgstr "PUT"
+msgid "B<LimitRequestBody >I<size>"
+msgstr "B<LimitRequestBody >I<Größe>"
 
+#. #Listen
 #. type: Plain text
-#: cupsd.conf.man.in:488
-msgid "Used by a client to upload configuration files."
+#: cupsd.conf.5:237
+msgid ""
+"Specifies the maximum size of print files, IPP requests, and HTML form "
+"data.  The default is \"0\" which disables the limit check."
 msgstr ""
-"Wird von einem Client zum Hochladen von Konfigurationsdateien verwandt."
+"Legt die maximale Größe von Druckdateien, IPP-Anfragen und HTML-"
+"Formulardaten fest. Die Vorgabe ist »0«, womit die Überprüfung deaktiviert "
+"wird."
 
-#. type: SS
-#: cupsd.conf.man.in:488
+#. type: TP
+#: cupsd.conf.5:237
 #, no-wrap
-msgid "IPP OPERATION NAMES"
-msgstr "IPP-VORGANGSNAMEN"
-
-#. type: Plain text
-#: cupsd.conf.man.in:491
-msgid "The following IPP operations are supported by B<cupsd>(8):"
-msgstr "Die folgenden IPP-Vorgänge werden von B<cupsd>(8) unterstützt:"
+msgid "B<Listen >I<ipv4-address>B<:>I<port>"
+msgstr "B<Listen >I<IPv4-Adresse>B<:>I<Port>"
 
 #. type: TP
-#: cupsd.conf.man.in:491
+#: cupsd.conf.5:239
 #, no-wrap
-msgid "CUPS-Accept-Jobs"
-msgstr "CUPS-Accept-Jobs"
+msgid "B<Listen [>I<ipv6-address>B<]:>I<port>"
+msgstr "B<Listen [>I<IPv6-Adresse>B<]:>I<Port>"
 
-#. type: Plain text
-#: cupsd.conf.man.in:494
-msgid "Allows a printer to accept new jobs."
-msgstr "Erlaubt es einem Drucker, neue Aufträge zu akzeptieren."
+#. type: TP
+#: cupsd.conf.5:241
+#, no-wrap
+msgid "B<Listen *:>I<port>"
+msgstr "B<Listen *:>I<Port>"
 
 #. type: TP
-#: cupsd.conf.man.in:494
+#: cupsd.conf.5:243
 #, no-wrap
-msgid "CUPS-Add-Modify-Class"
-msgstr "CUPS-Add-Modify-Class"
+msgid "B<Listen >I</path/to/domain/socket>"
+msgstr "B<Listen >I</Pfad/zu/Domain/Socket>"
 
+#. #ListenBackLog
 #. type: Plain text
-#: cupsd.conf.man.in:497
-msgid "Adds or modifies a printer class."
-msgstr "Fügt eine Druckerklasse hinzu oder ändert sie."
+#: cupsd.conf.5:249
+msgid ""
+"Listens to the specified address and port or domain socket path for "
+"connections.  Multiple Listen directives can be provided to listen on "
+"multiple addresses.  The Listen directive is similar to the Port directive "
+"but allows you to restrict access to specific interfaces or networks."
+msgstr ""
+"Wartet auf den angegebenen Adressen und Ports oder Domain-Socketpfaden auf "
+"Anfragen. Mehrere »Listen«-Direktiven können angegeben werden, um auf "
+"mehreren Adressen auf Anfragen zu warten. Die Direktive »Listen« ist ähnlich "
+"zu der Direktive »Port«, erlaubt es Ihnen aber, den Zugriff auf bestimmte "
+"Schnittstellen oder Netze zu beschränken."
 
 #. type: TP
-#: cupsd.conf.man.in:497
+#: cupsd.conf.5:249
 #, no-wrap
-msgid "CUPS-Add-Modify-Printer"
-msgstr "CUPS-Add-Modify-Printer"
+msgid "B<ListenBackLog >I<number>"
+msgstr "B<ListenBackLog >I<Anzahl>"
 
+#. #Location
 #. type: Plain text
-#: cupsd.conf.man.in:500
-msgid "Adds or modifies a printer."
-msgstr "Fügt einen Drucker hinzu oder ändert ihn."
+#: cupsd.conf.5:256
+msgid ""
+"Specifies the number of pending connections that will be allowed.  This "
+"normally only affects very busy servers that have reached the MaxClients "
+"limit, but can also be triggered by large numbers of simultaneous "
+"connections.  When the limit is reached, the operating system will refuse "
+"additional connections until the scheduler can accept the pending ones.  The "
+"default is the OS-defined default limit, typically either \"5\" for older "
+"operating systems or \"128\" for newer operating systems."
+msgstr ""
+"Legt die Anzahl von erlaubten unerledigten Verbindungen fest. Dies betrifft "
+"normalerweise nur sehr beschäftigte Server, die die MaxClients-Beschränkung "
+"erreicht haben, kann aber auch von einer großen Anzahl von gleichzeitigen "
+"Verbindungen ausgelöst werden. Wenn die Beschränkung erreicht ist, wird das "
+"Betriebssystem zusätzliche Verbindungen ablehnen, bis der Auftragsplaner "
+"wieder unerledigte Verbindungen erlaubt. Die Vorgabe ist die "
+"betriebssystemabhängige Beschränkung, typischerweise »5« auf älteren "
+"Betriebssystemen oder »128« auf neueren Betriebssystemen."
 
 #. type: TP
-#: cupsd.conf.man.in:500
+#: cupsd.conf.5:256
 #, no-wrap
-msgid "CUPS-Authenticate-Job"
-msgstr "CUPS-Authenticate-Job"
+msgid "B<E<lt>Location >I</path>B<E<gt> >... B<E<lt>/LocationE<gt>>"
+msgstr "B<E<lt>Location >I</Pfad>B<E<gt> >… B<E<lt>/LocationE<gt>>"
 
+#. #LogDebugHistory
 #. type: Plain text
-#: cupsd.conf.man.in:503
-msgid "Releases a job that is held for authentication."
-msgstr "Gibt einen Auftrag frei, der für Authentifizierung gehalten ist."
+#: cupsd.conf.5:261
+msgid ""
+"Specifies access control for the named location.  Paths are documented below "
+"in the section \"LOCATION PATHS\"."
+msgstr ""
+"Legt die Zugriffssteuerung für den benannten Ort fest. Pfade werden weiter "
+"unten im Abschnitt »ORTSPFADE« beschrieben."
 
 #. type: TP
-#: cupsd.conf.man.in:503
+#: cupsd.conf.5:261
 #, no-wrap
-msgid "CUPS-Delete-Class"
-msgstr "CUPS-Delete-Class"
+msgid "B<LogDebugHistory >I<number>"
+msgstr "B<LogDebugHistory >I<Anzahl>"
 
+#. #LogLevel
 #. type: Plain text
-#: cupsd.conf.man.in:506
-msgid "Deletes a printer class."
-msgstr "Löscht eine Druckerklasse."
+#: cupsd.conf.5:265
+msgid ""
+"Specifies the number of debugging messages that are retained for logging if "
+"an error occurs in a print job. Debug messages are logged regardless of the "
+"LogLevel setting."
+msgstr ""
+"Legt die Anzahl der Fehlersuchnachrichten, die zum Protokollieren "
+"zurückgehalten werden, wenn ein Fehler in einem Druckauftrag auftritt, fest. "
+"Fehlersuchnachrichten werden unabhängig von der LogLevel-Einstellung "
+"protokolliert."
 
 #. type: TP
-#: cupsd.conf.man.in:506
+#: cupsd.conf.5:265
 #, no-wrap
-msgid "CUPS-Delete-Printer"
-msgstr "CUPS-Delete-Printer"
-
-#. type: Plain text
-#: cupsd.conf.man.in:509
-msgid "Deletes a printer."
-msgstr "Löscht einen Drucker."
+msgid "B<LogLevel >none"
+msgstr "B<LogLevel >none"
 
 #. type: TP
-#: cupsd.conf.man.in:509
+#: cupsd.conf.5:267
 #, no-wrap
-msgid "CUPS-Get-Classes"
-msgstr "CUPS-Get-Classes"
+msgid "B<LogLevel >emerg"
+msgstr "B<LogLevel >emerg"
 
-#. type: Plain text
-#: cupsd.conf.man.in:512
-msgid "Gets a list of printer classes."
-msgstr "Ermittelt eine Liste von Druckerklassen."
+#. type: TP
+#: cupsd.conf.5:269
+#, no-wrap
+msgid "B<LogLevel >alert"
+msgstr "B<LogLevel >alert"
 
 #. type: TP
-#: cupsd.conf.man.in:512
+#: cupsd.conf.5:271
 #, no-wrap
-msgid "CUPS-Get-Default"
-msgstr "CUPS-Get-Default"
+msgid "B<LogLevel >crit"
+msgstr "B<LogLevel >crit"
 
-#. type: Plain text
-#: cupsd.conf.man.in:515
-msgid "Gets the server default printer or printer class."
-msgstr "Ermittelt die Servervorgabe für den Drucker oder die Druckerklasse."
+#. type: TP
+#: cupsd.conf.5:273
+#, no-wrap
+msgid "B<LogLevel >error"
+msgstr "B<LogLevel >error"
 
 #. type: TP
-#: cupsd.conf.man.in:515
+#: cupsd.conf.5:275
 #, no-wrap
-msgid "CUPS-Get-Devices"
-msgstr "CUPS-Get-Devices"
+msgid "B<LogLevel >warn"
+msgstr "B<LogLevel >warn"
 
-#. type: Plain text
-#: cupsd.conf.man.in:518
-msgid "Gets a list of devices that are currently available."
-msgstr "Ermittelt eine Liste von derzeit verfügbaren Geräten."
+#. type: TP
+#: cupsd.conf.5:277
+#, no-wrap
+msgid "B<LogLevel >notice"
+msgstr "B<LogLevel >notice"
 
 #. type: TP
-#: cupsd.conf.man.in:518
+#: cupsd.conf.5:279
 #, no-wrap
-msgid "CUPS-Get-Document"
-msgstr "CUPS-Get-Document"
+msgid "B<LogLevel >info"
+msgstr "B<LogLevel >info"
 
-#. type: Plain text
-#: cupsd.conf.man.in:521
-msgid "Gets a document file for a job."
-msgstr "Ermittelt eine Dokumentendatei für einen Auftrag."
+#. type: TP
+#: cupsd.conf.5:281
+#, no-wrap
+msgid "B<LogLevel >debug"
+msgstr "B<LogLevel >debug"
 
 #. type: TP
-#: cupsd.conf.man.in:521
+#: cupsd.conf.5:283
 #, no-wrap
-msgid "CUPS-Get-PPD"
-msgstr "CUPS-Get-PPD"
+msgid "B<LogLevel >debug2"
+msgstr "B<LogLevel >debug2"
 
+#. #LogTimeFormat
 #. type: Plain text
-#: cupsd.conf.man.in:524
-msgid "Gets a PPD file."
-msgstr "Ermittelt eine PPD-Datei."
+#: cupsd.conf.5:289
+msgid ""
+"Specifies the level of logging for the ErrorLog file.  The value \"none\" "
+"stops all logging while \"debug2\" logs everything.  The default is \"warn\"."
+msgstr ""
+"Legt die Protokollierstufe in der Datei ErrorLog fest. Der Wert »none« "
+"beendet alle Protokollierung, während »debug2« alles protokolliert. Die "
+"Vorgabe ist »warn«."
 
 #. type: TP
-#: cupsd.conf.man.in:524
+#: cupsd.conf.5:289
 #, no-wrap
-msgid "CUPS-Get-PPDs"
-msgstr "CUPS-Get-PPDs"
-
-#. type: Plain text
-#: cupsd.conf.man.in:527
-msgid "Gets a list of installed PPD files."
-msgstr "Ermittelt eine Liste von installierten PPD-Dateien."
+msgid "B<LogTimeFormat >standard"
+msgstr "B<LogTimeFormat >standard"
 
 #. type: TP
-#: cupsd.conf.man.in:527
+#: cupsd.conf.5:291
 #, no-wrap
-msgid "CUPS-Get-Printers"
-msgstr "CUPS-Get-Printers"
+msgid "B<LogTimeFormat >usecs"
+msgstr "B<LogTimeFormat >usecs"
 
+#. #MaxClients
 #. type: Plain text
-#: cupsd.conf.man.in:530
-msgid "Gets a list of printers."
-msgstr "Ermittelt eine Liste von Druckern."
+#: cupsd.conf.5:296
+msgid ""
+"Specifies the format of the date and time in the log files.  The value "
+"\"standard\" is the default and logs whole seconds while \"usecs\" logs "
+"microseconds."
+msgstr ""
+"Legt das Format von Datum und Uhrzeit in den Protokolldateien fest. Der Wert "
+"»standard« ist die Vorgabe und protokolliert in ganzen Sekunden, während "
+"»usecs« in Mikrosekunden protokolliert."
 
 #. type: TP
-#: cupsd.conf.man.in:530
+#: cupsd.conf.5:296
 #, no-wrap
-msgid "CUPS-Move-Job"
-msgstr "CUPS-Move-Job"
+msgid "B<MaxClients >I<number>"
+msgstr "B<MaxClients >I<Anzahl>"
 
+#. #MaxClientPerHost
 #. type: Plain text
-#: cupsd.conf.man.in:533
-msgid "Moves a job."
-msgstr "Verschiebt einen Auftrag."
+#: cupsd.conf.5:301
+msgid ""
+"Specifies the maximum number of simultaneous clients that are allowed by the "
+"scheduler.  The default is \"100\"."
+msgstr ""
+"Legt die maximale Anzahl an gleichzeitigen Clients, die vom Auftragsplaner "
+"erlaubt werden, fest. Die Vorgabe ist »100«."
 
 #. type: TP
-#: cupsd.conf.man.in:533
+#: cupsd.conf.5:301
 #, no-wrap
-msgid "CUPS-Reject-Jobs"
-msgstr "CUPS-Reject-Jobs"
+msgid "B<MaxClientsPerHost >I<number>"
+msgstr "B<MaxClientsPerHost >I<Anzahl>"
 
+#. #MaxCopies
 #. type: Plain text
-#: cupsd.conf.man.in:536
-msgid "Prevents a printer from accepting new jobs."
-msgstr "Verhindert, dass ein Drucker neue Aufträge akzeptiert."
+#: cupsd.conf.5:307
+msgid ""
+"Specifies the maximum number of simultaneous clients that are allowed from a "
+"single address.  The default is the MaxClients value."
+msgstr ""
+"Legt die maximale Anzahl an gleichzeitigen Clients, die von einer einzigen "
+"Adresse erlaubt sind, fest. Die Vorgabe ist der Wert MaxClients."
 
 #. type: TP
-#: cupsd.conf.man.in:536
+#: cupsd.conf.5:307
 #, no-wrap
-msgid "CUPS-Set-Default"
-msgstr "CUPS-Set-Default"
+msgid "B<MaxCopies >I<number>"
+msgstr "B<MaxCopies >I<Anzahl>"
 
+#. #MaxHoldTime
 #. type: Plain text
-#: cupsd.conf.man.in:539
-msgid "Sets the server default printer or printer class."
-msgstr "Setzt die Server-Vorgabe für einen Drucker oder eine Druckerklasse."
+#: cupsd.conf.5:312
+msgid ""
+"Specifies the maximum number of copies that a user can print of each job.  "
+"The default is \"9999\"."
+msgstr ""
+"Legt die maximale Anzahl an Kopien, die ein Benutzer bei jedem Auftrag "
+"drucken kann, fest. Die Vorgabe ist »9999«."
 
 #. type: TP
-#: cupsd.conf.man.in:539
+#: cupsd.conf.5:312
 #, no-wrap
-msgid "Cancel-Job"
-msgstr "Cancel-Job"
+msgid "B<MaxHoldTime >I<seconds>"
+msgstr "B<MaxHoldTime >I<Sekunden>"
 
+#. #MaxJobs
 #. type: Plain text
-#: cupsd.conf.man.in:542
-msgid "Cancels a job."
-msgstr "Bricht einen Auftrag ab."
+#: cupsd.conf.5:317
+msgid ""
+"Specifies the maximum time a job may remain in the \"indefinite\" hold state "
+"before it is canceled.  The default is \"0\" which disables cancellation of "
+"held jobs."
+msgstr ""
+"Legt die maximale Zeit, die ein Auftrag für »unbestimmte« Zeit angehalten "
+"bleiben darf, bevor er abgebrochen wird, fest. Die Vorgabe ist »0«, womit "
+"gehaltene Aufträge abgebrochen werden."
 
 #. type: TP
-#: cupsd.conf.man.in:542
+#: cupsd.conf.5:317
 #, no-wrap
-msgid "Cancel-Jobs"
-msgstr "Cancel-Jobs"
+msgid "B<MaxJobs >I<number>"
+msgstr "B<MaxJobs >I<Anzahl>"
 
+#. #MaxJobsPerPrinter
 #. type: Plain text
-#: cupsd.conf.man.in:545
-msgid "Cancels one or more jobs."
-msgstr "Bricht einen oder mehrere Aufträge ab."
+#: cupsd.conf.5:323
+msgid ""
+"Specifies the maximum number of simultaneous jobs that are allowed.  Set to "
+"\"0\" to allow an unlimited number of jobs.  The default is \"500\"."
+msgstr ""
+"Legt die maximale Anzahl an gleichzeitigen Aufträgen, die erlaubt sind, "
+"fest. Setzen Sie dies auf »0«, um eine unbegrenzte Anzahl an Aufträgen zu "
+"erlauben. Die Vorgabe ist »500«."
 
 #. type: TP
-#: cupsd.conf.man.in:545
+#: cupsd.conf.5:323
 #, no-wrap
-msgid "Cancel-My-Jobs"
-msgstr "Cancel-My-Jobs"
+msgid "B<MaxJobsPerPrinter >I<number>"
+msgstr "B<MaxJobsPerPrinter >I<Anzahl>"
 
+#. #MaxJobsPerUser
 #. type: Plain text
-#: cupsd.conf.man.in:548
-msgid "Cancels one or more jobs creates by a user."
-msgstr "Bricht einen oder mehrere von einem Benutzer erstellte Aufträge ab."
+#: cupsd.conf.5:328
+msgid ""
+"Specifies the maximum number of simultaneous jobs that are allowed per "
+"printer.  The default is \"0\" which allows up to MaxJobs jobs per printer."
+msgstr ""
+"Legt die maximale Anzahl an Aufträgen, die gleichzeitig pro Drucker erlaubt "
+"sind, fest. Die Vorgabe ist »0«, womit bis zu MaxJobs Aufträge pro Drucker "
+"erlaubt sind."
 
 #. type: TP
-#: cupsd.conf.man.in:548
+#: cupsd.conf.5:328
 #, no-wrap
-msgid "Cancel-Subscription"
-msgstr "Cancel-Subscription"
+msgid "B<MaxJobsPerUser >I<number>"
+msgstr "B<MaxJobsPerUser >I<Anzahl>"
 
+#. #MaxJobTime
 #. type: Plain text
-#: cupsd.conf.man.in:551
-msgid "Cancels a subscription."
-msgstr "Beendet ein Abonnement."
+#: cupsd.conf.5:333
+msgid ""
+"Specifies the maximum number of simultaneous jobs that are allowed per "
+"user.  The default is \"0\" which allows up to MaxJobs jobs per user."
+msgstr ""
+"Legt die maximale Anzahl an Aufträgen, die gleichzeitig pro Benutzer erlaubt "
+"sind, fest. Die Vorgabe ist »0«, womit bis zu MaxJobs Aufträge pro Benutzer "
+"erlaubt sind."
 
 #. type: TP
-#: cupsd.conf.man.in:551
+#: cupsd.conf.5:333
 #, no-wrap
-msgid "Close-Job"
-msgstr "Close-Job"
+msgid "B<MaxJobTime >I<seconds>"
+msgstr "B<MaxJobTime >I<Sekunden>"
 
+#. #MaxLogSize
 #. type: Plain text
-#: cupsd.conf.man.in:554
-msgid "Closes a job that is waiting for more documents."
-msgstr "Schließt einen Auftrag, der auf weitere Dokumente wartet."
+#: cupsd.conf.5:339
+msgid ""
+"Specifies the maximum time a job may take to print before it is canceled.  "
+"Set to \"0\" to disable cancellation of \"stuck\" jobs.  The default is "
+"\"10800\" (3 hours)."
+msgstr ""
+"legt die maximale Zeit, die ein Auftrag zum Drucken verbrauchen darf, bevor "
+"er abgebrochen wird, fest. Falls auf 0 gesetzt, werden keine "
+"»hängenden« (stuck) Aufträge abgebrochen. Die Vorgabe ist 10800 Sekunden (3 "
+"Stunden)."
 
 #. type: TP
-#: cupsd.conf.man.in:554
+#: cupsd.conf.5:339
 #, no-wrap
-msgid "Create-Job"
-msgstr "Create-Job"
+msgid "B<MaxLogSize >I<size>"
+msgstr "B<MaxLogSize >I<Größe>"
 
+#. #MultipleOperationTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:557
-msgid "Creates a new job with no documents."
-msgstr "Erstellt einen neuen Auftrag ohne Dokumente."
+#: cupsd.conf.5:345
+msgid ""
+"Specifies the maximum size of the log files before they are rotated.  The "
+"value \"0\" disables log rotation.  The default is \"1048576\" (1MB)."
+msgstr ""
+"Legt die maximale Größe der Protokolldateien, bevor sie rotiert werden, "
+"fest. Der Wert »0« deaktiviert die Rotation der Protokolldateien. Die "
+"Vorgabe ist »1048576« (1 MB)."
 
 #. type: TP
-#: cupsd.conf.man.in:557
+#: cupsd.conf.5:345
 #, no-wrap
-msgid "Create-Job-Subscriptions"
-msgstr "Create-Job-Subscriptions"
+msgid "B<MultipleOperationTimeout >I<seconds>"
+msgstr "B<MultipleOperationTimeout >I<Sekunden>"
 
+#. #Policy
 #. type: Plain text
-#: cupsd.conf.man.in:560
-msgid "Creates a subscription for job events."
-msgstr "Erstellt ein Abonnement für Auftragsereignisse."
+#: cupsd.conf.5:350
+msgid ""
+"Specifies the maximum amount of time to allow between files in a multiple "
+"file print job.  The default is \"900\" (15 minutes)."
+msgstr ""
+"Legt die maximal erlaubte Zeit zwischen Dateien in einem Druckauftrag aus "
+"mehreren Dateien fest. Die Vorgabe ist »900« (15 Minuten)."
 
 #. type: TP
-#: cupsd.conf.man.in:560
+#: cupsd.conf.5:350
 #, no-wrap
-msgid "Create-Printer-Subscriptions"
-msgstr "Create-Printer-Subscriptions"
+msgid "B<E<lt>Policy >I<name>B<E<gt> >... B<E<lt>/PolicyE<gt>>"
+msgstr "B<E<lt>Policy >I<Name>B<E<gt> >… B<E<lt>/PolicyE<gt>>"
 
+#. #Port
 #. type: Plain text
-#: cupsd.conf.man.in:563
-msgid "Creates a subscription for printer events."
-msgstr "Erstellt ein Abonnement für Druckerereignisse."
+#: cupsd.conf.5:354
+msgid "Specifies access control for the named policy."
+msgstr "Legt die Zugriffskontrolle für die genannte Richtlinie fest."
 
 #. type: TP
-#: cupsd.conf.man.in:563
+#: cupsd.conf.5:354
 #, no-wrap
-msgid "Get-Job-Attributes"
-msgstr "Get-Job-Attributes"
+msgid "B<Port >I<number>"
+msgstr "B<Port >I<Nummer>"
 
+#. #PreserveJobFiles
 #. type: Plain text
-#: cupsd.conf.man.in:566
-msgid "Gets information about a job."
-msgstr "Ermittelt Informationen über einen Auftrag."
+#: cupsd.conf.5:358
+msgid "Listens to the specified port number for connections."
+msgstr "Wartet auf der angegebenen Portnummer auf Verbindungen."
 
 #. type: TP
-#: cupsd.conf.man.in:566
+#: cupsd.conf.5:358
 #, no-wrap
-msgid "Get-Jobs"
-msgstr "Get-Jobs"
+msgid "B<PreserveJobFiles Yes>"
+msgstr "B<PreserveJobFiles Yes>"
 
-#. type: Plain text
-#: cupsd.conf.man.in:569
-msgid "Gets a list of jobs."
-msgstr "Ermittelt eine Liste von Aufträgen."
+#. type: TP
+#: cupsd.conf.5:360
+#, no-wrap
+msgid "B<PreserveJobFiles No>"
+msgstr "B<PreserveJobFiles No>"
 
 #. type: TP
-#: cupsd.conf.man.in:569
+#: cupsd.conf.5:362
 #, no-wrap
-msgid "Get-Notifications"
-msgstr "Get-Notifications"
+msgid "B<PreserveJobFiles >I<seconds>"
+msgstr "B<PreserveJobFiles >I<Sekunden>"
 
+#. #PreserveJobHistory
 #. type: Plain text
-#: cupsd.conf.man.in:572
-msgid "Gets a list of event notifications for a subscription."
+#: cupsd.conf.5:368
+msgid ""
+"Specifies whether job files (documents) are preserved after a job is "
+"printed.  If a numeric value is specified, job files are preserved for the "
+"indicated number of seconds after printing.  The default is "
+"\"86400\" (preserve 1 day)."
 msgstr ""
-"Ermittelt eine Liste von Ereignisbenachrichtigungen für ein Abonnement."
+"Legt fest, ob Auftragsdateien (Dokumente) erhalten bleiben, nachdem ein "
+"Auftrag gedruckt wurde. Falls ein numerischer Wert angegeben wird, werden "
+"die Auftragsdateien für die angegebene Anzahl an Sekunden nach dem Druck "
+"erhalten. Die Vorgabe ist »86400« (einen Tag erhalten)."
 
 #. type: TP
-#: cupsd.conf.man.in:572
+#: cupsd.conf.5:368
 #, no-wrap
-msgid "Get-Printer-Attributes"
-msgstr "Get-Printer-Attributes"
+msgid "B<PreserveJobHistory Yes>"
+msgstr "B<PreserveJobHistory Yes>"
 
-#. type: Plain text
-#: cupsd.conf.man.in:575
-msgid "Gets information about a printer or printer class."
-msgstr "Ermittelt Informationen über einen Drucker oder eine Druckerklasse."
+#. type: TP
+#: cupsd.conf.5:370
+#, no-wrap
+msgid "B<PreserveJobHistory No>"
+msgstr "B<PreserveJobHistory No>"
 
 #. type: TP
-#: cupsd.conf.man.in:575
+#: cupsd.conf.5:372
 #, no-wrap
-msgid "Get-Subscription-Attributes"
-msgstr "Get-Subscription-Attributes"
+msgid "B<PreserveJobHistory >I<seconds>"
+msgstr "B<PreserveJobHistory >I<Sekunden>"
 
+#. #ReloadTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:578
-msgid "Gets information about a subscription."
-msgstr "Ermittelt Informationen über ein Abonnement."
+#: cupsd.conf.5:379
+msgid ""
+"Specifies whether the job history is preserved after a job is printed.  If a "
+"numeric value is specified, the job history is preserved for the indicated "
+"number of seconds after printing.  If \"Yes\", the job history is preserved "
+"until the MaxJobs limit is reached.  The default is \"Yes\"."
+msgstr ""
+"Legt fest, ob die Auftragschronik nach dem Druck behalten wird. Falls ein "
+"numerischer Wert angegeben ist, wird die Auftragschronik für die angegebene "
+"Anzahl von Sekunden nach dem Druck behalten. Falls »Yes« wird die "
+"Auftragschronik behalten, bis die Begrenzung MaxJobs erreicht ist. Die "
+"Vorgabe ist »Yes«."
 
 #. type: TP
-#: cupsd.conf.man.in:578
+#: cupsd.conf.5:379
 #, no-wrap
-msgid "Get-Subscriptions"
-msgstr "Get-Subscriptions"
+msgid "B<ReloadTimeout >I<seconds>"
+msgstr "B<ReloadTimeout >I<Sekunden>"
 
+#. #ServerAdmin
 #. type: Plain text
-#: cupsd.conf.man.in:581
-msgid "Gets a list of subscriptions."
-msgstr "Ermittelt eine Liste von Abonnements."
+#: cupsd.conf.5:384
+msgid ""
+"Specifies the amount of time to wait for job completion before restarting "
+"the scheduler.  The default is \"30\"."
+msgstr ""
+"Legt die Zeitspanne, während der auf die Beendigung von Aufträgen gewartet "
+"werden soll, bevor der Auftragsplaner (Scheduler) neu gestartet wird, fest. "
+"Die Vorgabe ist »30«."
 
 #. type: TP
-#: cupsd.conf.man.in:581
+#: cupsd.conf.5:384
 #, no-wrap
-msgid "Hold-Job"
-msgstr "Hold-Job"
+msgid "B<ServerAdmin >I<email-address>"
+msgstr "B<ServerAdmin >I<E-Mail-Adresse>"
 
+#. #ServerAlias
 #. type: Plain text
-#: cupsd.conf.man.in:584
-msgid "Holds a job from printing."
-msgstr "Hält einen Auftrag vom Druck zurück."
+#: cupsd.conf.5:389
+msgid ""
+"Specifies the email address of the server administrator.  The default value "
+"is \"root@ServerName\"."
+msgstr ""
+"Legt die E-Mail-Adresse des Server-Administrators fest. Die Vorgabe ist "
+"»root@ServerName«."
 
 #. type: TP
-#: cupsd.conf.man.in:584
+#: cupsd.conf.5:389
 #, no-wrap
-msgid "Hold-New-Jobs"
-msgstr "Hold-New-Jobs"
-
-#. type: Plain text
-#: cupsd.conf.man.in:587
-msgid "Holds all new jobs from printing."
-msgstr "Hält alle neuen Aufträge vom Druck zurück."
+msgid "B<ServerAlias >I<hostname >[ ... I<hostname >]"
+msgstr "B<ServerAlias >I<Rechnername >[ … I<Rechnername >]"
 
 #. type: TP
-#: cupsd.conf.man.in:587
+#: cupsd.conf.5:391
 #, no-wrap
-msgid "Pause-Printer"
-msgstr "Pause-Printer"
+msgid "B<ServerAlias *>"
+msgstr "B<ServerAlias *>"
 
+#. #ServerName
 #. type: Plain text
-#: cupsd.conf.man.in:590
-msgid "Stops processing of jobs by a printer or printer class."
+#: cupsd.conf.5:397
+msgid ""
+"The ServerAlias directive is used for HTTP Host header validation when "
+"clients connect to the scheduler from external interfaces.  Using the "
+"special name \"*\" can expose your system to known browser-based DNS "
+"rebinding attacks, even when accessing sites through a firewall.  If the "
+"auto-discovery of alternate names does not work, we recommend listing each "
+"alternate name with a ServerAlias directive instead of using \"*\"."
 msgstr ""
-"Beendet die Verarbeitung von Aufträgen von einem Drucker oder einer "
-"Druckerklasse."
+"Die Direktive ServerAlias wird für die Überprüfung von HTTP-Host-Kopfzeilen "
+"bei der Verbindungsaufnahme von Clients zum Auftragsplaner über externe "
+"Schnittstellen verwandt. Wenn Sie den besonderen Name »*« verwenden, kann "
+"Ihr System für Browser-basierte DNS-Rebinding-Angriffe verwundbar werden, "
+"selbst wenn die Zugriffe über eine Firewall erfolgen. Falls die automatische "
+"Erkennung von alternativen Namen nicht funktioniert, empfehlen wir, jeden "
+"alternativen Namen mit der Direktive ServerAlias aufzuführen, statt »*« zu "
+"verwenden."
 
 #. type: TP
-#: cupsd.conf.man.in:590
+#: cupsd.conf.5:397
 #, no-wrap
-msgid "Pause-Printer-After-Current-Job"
-msgstr "Pause-Printer-After-Current-Job"
+msgid "B<ServerName >I<hostname>"
+msgstr "B<ServerName >I<Rechnername>"
 
+#. #ServerTokens
 #. type: Plain text
-#: cupsd.conf.man.in:593
+#: cupsd.conf.5:404
 msgid ""
-"Stops processing of jobs by a printer or printer class after the current job "
-"is finished."
+"Specifies the fully-qualified hostname of the server.  The default is the "
+"value reported by the B<hostname>(1)  command."
 msgstr ""
-"Beendet die Verarbeitung von Aufträgen durch einen Drucker oder eine "
-"Druckerklasse, nachdem der aktuelle Auftrag beendet wurde."
+"Legt den vollqualifizierten Rechnernamen des Servers fest. Die Vorgabe ist "
+"der Wert, der von dem Befehl B<hostname>(1) berichtet wird."
 
 #. type: TP
-#: cupsd.conf.man.in:593
+#: cupsd.conf.5:404
 #, no-wrap
-msgid "Print-Job"
-msgstr "Print-Job"
-
-#. type: Plain text
-#: cupsd.conf.man.in:596
-msgid "Creates a new job with a single document."
-msgstr "Erstellt einen neuen Auftrag mit einem einzelnen Dokument."
+msgid "B<ServerTokens None>"
+msgstr "B<ServerTokens None>"
 
 #. type: TP
-#: cupsd.conf.man.in:596
+#: cupsd.conf.5:406
 #, no-wrap
-msgid "Purge-Jobs"
-msgstr "Purge-Jobs"
-
-#. type: Plain text
-#: cupsd.conf.man.in:599
-msgid "Cancels one or more jobs and deletes the job history."
-msgstr "Bricht einen oder mehrere Aufträge ab und löscht die Auftragschronik."
+msgid "B<ServerTokens ProductOnly>"
+msgstr "B<ServerTokens ProductOnly>"
 
 #. type: TP
-#: cupsd.conf.man.in:599
+#: cupsd.conf.5:408
 #, no-wrap
-msgid "Release-Held-New-Jobs"
-msgstr "Release-Held-New-Jobs"
+msgid "B<ServerTokens Major>"
+msgstr "B<ServerTokens Major>"
 
-#. type: Plain text
-#: cupsd.conf.man.in:602
-msgid "Allows previously held jobs to print."
-msgstr "Erlaubt, vorher angehaltenen Aufträgen zu drucken."
+#. type: TP
+#: cupsd.conf.5:410
+#, no-wrap
+msgid "B<ServerTokens Minor>"
+msgstr "B<ServerTokens Minor>"
 
 #. type: TP
-#: cupsd.conf.man.in:602
+#: cupsd.conf.5:412
 #, no-wrap
-msgid "Release-Job"
-msgstr "Release-Job"
+msgid "B<ServerTokens Minimal>"
+msgstr "B<ServerTokens Minimal>"
 
-#. type: Plain text
-#: cupsd.conf.man.in:605
-msgid "Allows a job to print."
-msgstr "Erlaubt einem Auftrag, zu drucken."
+#. type: TP
+#: cupsd.conf.5:414
+#, no-wrap
+msgid "B<ServerTokens OS>"
+msgstr "B<ServerTokens OS>"
 
 #. type: TP
-#: cupsd.conf.man.in:605
+#: cupsd.conf.5:416
 #, no-wrap
-msgid "Renew-Subscription"
-msgstr "Renew-Subscription"
+msgid "B<ServerTokens Full>"
+msgstr "B<ServerTokens Full>"
 
+#. #SSLListen
 #. type: Plain text
-#: cupsd.conf.man.in:608
-msgid "Renews a subscription."
-msgstr "Erneuert ein Abonnement."
+#: cupsd.conf.5:428
+#, fuzzy
+msgid ""
+"Specifies what information is included in the Server header of HTTP "
+"responses.  \"None\" disables the Server header.  \"ProductOnly\" reports "
+"\"CUPS\".  \"Major\" reports \"CUPS/major IPP/2\".  \"Minor\" reports \"CUPS/"
+"major.minor IPP/2.1\".  \"Minimal\" reports \"CUPS/major.minor.patch "
+"IPP/2.1\".  \"OS\" reports \"CUPS/major.minor.path (osname osversion) "
+"IPP/2.1\".  \"Full\" reports \"CUPS/major.minor.path (osname osversion; "
+"architecture) IPP/2.1\".  The default is \"Minimal\"."
+msgstr ""
+"Legt fest, welche Informationen in die Server-Kopfzeilen von HTTP-Antworten "
+"aufgenommen werden. »None« deaktiviert die Server-Kopfzeilen. »ProductOnly« "
+"meldet »CUPS«. »Major« berichtet »CUPS 2.0«. »Minimal« berichtet »CUPS "
+"2.0.0«. »OS« berichtet »CUPS 2.0.0 (UNAME)«, wobei UNAME die Ausgabe des "
+"Befehls B<uname>(1) ist. »Full« berichtet »CUPS 2.0.0 (UNAME) IPP/2.0«. Die "
+"Vorgabe ist »Minimal«."
 
 #. type: TP
-#: cupsd.conf.man.in:608
+#: cupsd.conf.5:428
 #, no-wrap
-msgid "Restart-Job"
-msgstr "Restart-Job"
+msgid "B<SSLListen >I<ipv4-address>B<:>I<port>"
+msgstr "B<SSLListen >I<IPv4-Adresse>B<:>I<Port>"
 
-#. type: Plain text
-#: cupsd.conf.man.in:611
-msgid "Reprints a job, if possible."
-msgstr "Druckt falls möglich einen Auftrag erneut."
+#. type: TP
+#: cupsd.conf.5:430
+#, no-wrap
+msgid "B<SSLListen [>I<ipv6-address>B<]:>I<port>"
+msgstr "B<SSLListen [>I<IPv6-Adresse>B<]:>I<Port>"
 
 #. type: TP
-#: cupsd.conf.man.in:611
+#: cupsd.conf.5:432
 #, no-wrap
-msgid "Send-Document"
-msgstr "Send-Document"
+msgid "B<SSLListen *:>I<port>"
+msgstr "B<SSLListen *:>I<Port>"
 
+#. #SSLOptions
 #. type: Plain text
-#: cupsd.conf.man.in:614
-msgid "Adds a document to a job."
-msgstr "Fügt ein Dokument zu einem Auftrag hinzu."
+#: cupsd.conf.5:436
+msgid "Listens on the specified address and port for encrypted connections."
+msgstr ""
+"Wartet auf der angegebenen Adresse und dem Port auf verschlüsselte "
+"Verbindungen."
 
 #. type: TP
-#: cupsd.conf.man.in:614
+#: cupsd.conf.5:454
 #, no-wrap
-msgid "Set-Job-Attributes"
-msgstr "Set-Job-Attributes"
+msgid "B<SSLPort >I<port>"
+msgstr "B<SSLPort >I<Port>"
 
+#. #StrictConformance
 #. type: Plain text
-#: cupsd.conf.man.in:617
-msgid "Changes job information."
-msgstr "Ändert Auftragsinformationen."
+#: cupsd.conf.5:458
+msgid "Listens on the specified port for encrypted connections."
+msgstr "Wartet auf dem angegebenen Port auf verschlüsselte Verbindungen."
 
 #. type: TP
-#: cupsd.conf.man.in:617
+#: cupsd.conf.5:458
 #, no-wrap
-msgid "Set-Printer-Attributes"
-msgstr "Set-Printer-Attributes"
-
-#. type: Plain text
-#: cupsd.conf.man.in:620
-msgid "Changes printer or printer class information."
-msgstr "Ändert Drucker- oder Druckerklasseninformationen."
+msgid "B<StrictConformance Yes>"
+msgstr "B<StrictConformance Yes>"
 
 #. type: TP
-#: cupsd.conf.man.in:620
+#: cupsd.conf.5:460
 #, no-wrap
-msgid "Validate-Job"
-msgstr "Validate-Job"
+msgid "B<StrictConformance No>"
+msgstr "B<StrictConformance No>"
 
+#. #Timeout
 #. type: Plain text
-#: cupsd.conf.man.in:623
-msgid "Validates options for a new job."
-msgstr "Validiert Optionen für einen neuen Auftrag."
+#: cupsd.conf.5:465
+msgid ""
+"Specifies whether the scheduler requires clients to strictly adhere to the "
+"IPP specifications.  The default is \"No\"."
+msgstr ""
+"Legt fest, ob der Auftragsplaner von den Clients verlangt, dass sie streng "
+"den IPP-Spezifikationen folgen. Die Vorgabe ist »No«."
 
-#. type: SS
-#: cupsd.conf.man.in:623
+#. type: TP
+#: cupsd.conf.5:465
 #, no-wrap
-msgid "LOCATION PATHS"
-msgstr "ORTSPFADE"
+msgid "B<Timeout >I<seconds>"
+msgstr "B<Timeout >I<Sekunden>"
 
+#. #WebInterface
 #. type: Plain text
-#: cupsd.conf.man.in:626
-msgid "The following paths are commonly used when configuring B<cupsd>(8):"
+#: cupsd.conf.5:470
+msgid ""
+"Specifies the HTTP request timeout.  The default is \"900\" (15 minutes)."
 msgstr ""
-"Die folgenden Pfade werden bei der Konfiguration von B<cupsd>(8) häufig "
-"verwandt:"
+"Legt die HTTP-Zeitüberschreitung fest. Die Vorgabe ist »900« (15 Minuten)."
 
 #. type: TP
-#: cupsd.conf.man.in:626
+#: cupsd.conf.5:470
 #, no-wrap
-msgid "/"
-msgstr "/"
-
-#. type: Plain text
-#: cupsd.conf.man.in:629
-msgid "The path for all get operations (get-printers, get-jobs, etc.)"
-msgstr "Der Pfad für alle »get«-Vorgänge (get-printers, get-jobs, usw.)"
+msgid "B<WebInterface yes>"
+msgstr "B<WebInterface yes>"
 
 #. type: TP
-#: cupsd.conf.man.in:629
+#: cupsd.conf.5:472
 #, no-wrap
-msgid "/admin"
-msgstr "/admin"
+msgid "B<WebInterface no>"
+msgstr "B<WebInterface no>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:632
-msgid ""
-"The path for all administration operations (add-printer, delete-printer, "
-"start-printer, etc.)"
+#: cupsd.conf.5:476
+msgid "Specifies whether the web interface is enabled.  The default is \"No\"."
 msgstr ""
-"Der Pfad für alle Administrationsvorgänge (add-printer, delete-printer, "
-"start-printer, usw.)"
+"Legt fest, ob die Webschnittstelle freigegeben ist. Die Vorgabe ist »No«."
+
+#. type: SS
+#: cupsd.conf.5:476
+#, no-wrap
+msgid "HTTP METHOD NAMES"
+msgstr "HTTP-METHODENNAMEN"
+
+#. type: Plain text
+#: cupsd.conf.5:479
+msgid "The following HTTP methods are supported by B<cupsd>(8):"
+msgstr "Die folgenden HTTP-Methoden werden von B<cupsd>(8) unterstützt:"
 
 #. type: TP
-#: cupsd.conf.man.in:632
+#: cupsd.conf.5:479
 #, no-wrap
-msgid "/admin/conf"
-msgstr "/admin/conf"
+msgid "GET"
+msgstr "GET"
 
 #. type: Plain text
-#: cupsd.conf.man.in:635
+#: cupsd.conf.5:482
 msgid ""
-"The path for access to the CUPS configuration files (cupsd.conf, client."
-"conf, etc.)"
+"Used by a client to download icons and other printer resources and to access "
+"the CUPS web interface."
 msgstr ""
-"Der Pfad, um auf die CUPS-Konfigurationsdateien (cupsd.conf, client.conf, "
-"usw.) zuzugreifen"
+"Wird von einem Client zum Herunterladen von Icons und anderen "
+"Druckressourcen und zum Zugriff auf die CUPS-Webschnittstelle verwandt."
 
 #. type: TP
-#: cupsd.conf.man.in:635
+#: cupsd.conf.5:482
 #, no-wrap
-msgid "/admin/log"
-msgstr "/admin/log"
+msgid "HEAD"
+msgstr "HEAD"
 
 #. type: Plain text
-#: cupsd.conf.man.in:638
+#: cupsd.conf.5:485
 msgid ""
-"The path for access to the CUPS log files (access_log, error_log, page_log)"
+"Used by a client to get the type, size, and modification date of resources."
 msgstr ""
-"Der Pfad, um auf die CUPS-Protokolldateien (access_log, error_log, page_log) "
-"zuzugreifen"
+"Wird von einem Client verwandt, um den Typ, die Größe und das Änderungsdatum "
+"von Ressourcen zu erhalten."
+
+#. type: Plain text
+#: cupsd.conf.5:488
+msgid "Used by a client to establish a secure (SSL/TLS) connection."
+msgstr ""
+"Wird vom Client verwandt, um eine sichere (SSL/TLS)-Verbindung zu etablieren."
 
 #. type: TP
-#: cupsd.conf.man.in:638
+#: cupsd.conf.5:488
 #, no-wrap
-msgid "/classes"
-msgstr "/classes"
+msgid "POST"
+msgstr "POST"
 
 #. type: Plain text
-#: cupsd.conf.man.in:641
-msgid "The path for all printer classes"
-msgstr "Der Pfad für alle Druckerklassen"
+#: cupsd.conf.5:491
+msgid ""
+"Used by a client to submit IPP requests and HTML forms from the CUPS web "
+"interface."
+msgstr ""
+"Wird von einem Client zum Einreichen von IPP-Anfragen und HTML-Formularen "
+"aus der CUPS-Webschnittstelle verwandt."
 
 #. type: TP
-#: cupsd.conf.man.in:641
+#: cupsd.conf.5:491
 #, no-wrap
-msgid "/classes/name"
-msgstr "/classes/name"
+msgid "PUT"
+msgstr "PUT"
 
 #. type: Plain text
-#: cupsd.conf.man.in:644
-msgid "The resource for the named printer class"
-msgstr "Die Ressourcen für die benannte Druckerklasse"
+#: cupsd.conf.5:494
+msgid "Used by a client to upload configuration files."
+msgstr ""
+"Wird von einem Client zum Hochladen von Konfigurationsdateien verwandt."
 
-#. type: TP
-#: cupsd.conf.man.in:644
+#. type: SS
+#: cupsd.conf.5:494
 #, no-wrap
-msgid "/jobs"
-msgstr "/jobs"
+msgid "IPP OPERATION NAMES"
+msgstr "IPP-VORGANGSNAMEN"
 
 #. type: Plain text
-#: cupsd.conf.man.in:647
-msgid "The path for all jobs (hold-job, release-job, etc.)"
-msgstr "Der Pfad für alle Aufträge (hold-job, release-job, usw.)"
+#: cupsd.conf.5:497
+msgid "The following IPP operations are supported by B<cupsd>(8):"
+msgstr "Die folgenden IPP-Vorgänge werden von B<cupsd>(8) unterstützt:"
 
 #. type: TP
-#: cupsd.conf.man.in:647
+#: cupsd.conf.5:497
 #, no-wrap
-msgid "/jobs/id"
-msgstr "/jobs/id"
+msgid "CUPS-Accept-Jobs"
+msgstr "CUPS-Accept-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:650
-msgid "The path for the specified job"
-msgstr "Der Pfad für den angegebenen Auftrag"
+#: cupsd.conf.5:500
+msgid "Allows a printer to accept new jobs."
+msgstr "Erlaubt es einem Drucker, neue Aufträge zu akzeptieren."
 
 #. type: TP
-#: cupsd.conf.man.in:650
+#: cupsd.conf.5:500
 #, no-wrap
-msgid "/printers"
-msgstr "/printers"
+msgid "CUPS-Add-Modify-Class"
+msgstr "CUPS-Add-Modify-Class"
 
 #. type: Plain text
-#: cupsd.conf.man.in:653
-msgid "The path for all printers"
-msgstr "Der Pfad für alle Drucker"
+#: cupsd.conf.5:503
+msgid "Adds or modifies a printer class."
+msgstr "Fügt eine Druckerklasse hinzu oder ändert sie."
 
 #. type: TP
-#: cupsd.conf.man.in:653
+#: cupsd.conf.5:503
 #, no-wrap
-msgid "/printers/name"
-msgstr "/printers/name"
+msgid "CUPS-Add-Modify-Printer"
+msgstr "CUPS-Add-Modify-Printer"
 
 #. type: Plain text
-#: cupsd.conf.man.in:656
-msgid "The path for the named printer"
-msgstr "Der Pfad für den benannten Drucker"
+#: cupsd.conf.5:506
+msgid "Adds or modifies a printer."
+msgstr "Fügt einen Drucker hinzu oder ändert ihn."
 
 #. type: TP
-#: cupsd.conf.man.in:656
+#: cupsd.conf.5:506
 #, no-wrap
-msgid "/printers/name.png"
-msgstr "/printers/name.png"
+msgid "CUPS-Authenticate-Job"
+msgstr "CUPS-Authenticate-Job"
 
 #. type: Plain text
-#: cupsd.conf.man.in:659
-msgid "The icon file path for the named printer"
-msgstr "Der Icon-Dateipfad für den benannten Drucker"
+#: cupsd.conf.5:509
+msgid "Releases a job that is held for authentication."
+msgstr "Gibt einen Auftrag frei, der für Authentifizierung gehalten ist."
 
 #. type: TP
-#: cupsd.conf.man.in:659
+#: cupsd.conf.5:509
 #, no-wrap
-msgid "/printers/name.ppd"
-msgstr "/printers/name.ppd"
+msgid "CUPS-Delete-Class"
+msgstr "CUPS-Delete-Class"
 
 #. type: Plain text
-#: cupsd.conf.man.in:662
-msgid "The PPD file path for the named printer"
-msgstr "Der PPD-Dateipfad für den benannten Drucker"
+#: cupsd.conf.5:512
+msgid "Deletes a printer class."
+msgstr "Löscht eine Druckerklasse."
 
-#. type: SS
-#: cupsd.conf.man.in:662
+#. type: TP
+#: cupsd.conf.5:512
 #, no-wrap
-msgid "DIRECTIVES VALID WITHIN LOCATION AND LIMIT SECTIONS"
-msgstr "DIREKTIVEN, DIE INNERHALB VON ORTS- UND EINSCHRÄNKUNGSABSCHNITTEN GÜLTIG SIND"
+msgid "CUPS-Delete-Printer"
+msgstr "CUPS-Delete-Printer"
 
 #. type: Plain text
-#: cupsd.conf.man.in:664
-msgid ""
-"The following directives may be placed inside Location and Limit sections in "
-"the B<cupsd.conf> file:"
-msgstr ""
-"Die folgenden Direktiven können innerhalb von Orts- und "
-"Einschränkungsabschnitten in der Datei B<cupsd.conf> eingetragen werden:"
+#: cupsd.conf.5:515
+msgid "Deletes a printer."
+msgstr "Löscht einen Drucker."
 
 #. type: TP
-#: cupsd.conf.man.in:664
+#: cupsd.conf.5:515
 #, no-wrap
-msgid "B<Allow all>"
-msgstr "B<Allow all>"
+msgid "CUPS-Get-Classes"
+msgstr "CUPS-Get-Classes"
 
-#. type: TP
-#: cupsd.conf.man.in:666
-#, no-wrap
-msgid "B<Allow none>"
-msgstr "B<Allow none>"
+#. type: Plain text
+#: cupsd.conf.5:518
+msgid "Gets a list of printer classes."
+msgstr "Ermittelt eine Liste von Druckerklassen."
 
 #. type: TP
-#: cupsd.conf.man.in:668
+#: cupsd.conf.5:518
 #, no-wrap
-msgid "B<Allow >I<host.domain.com>"
-msgstr "B<Allow >I<Rechner.domain.com>"
+msgid "CUPS-Get-Default"
+msgstr "CUPS-Get-Default"
 
-#. type: TP
-#: cupsd.conf.man.in:670
-#, no-wrap
-msgid "B<Allow *.>I<domain.com>"
-msgstr "B<Allow *.>I<domain.com>"
+#. type: Plain text
+#: cupsd.conf.5:521
+msgid "Gets the server default printer or printer class."
+msgstr "Ermittelt die Servervorgabe für den Drucker oder die Druckerklasse."
 
 #. type: TP
-#: cupsd.conf.man.in:672
+#: cupsd.conf.5:521
 #, no-wrap
-msgid "B<Allow >I<ipv4-address>"
-msgstr "B<Allow >I<IPv4-Adresse>"
+msgid "CUPS-Get-Devices"
+msgstr "CUPS-Get-Devices"
 
-#. type: TP
-#: cupsd.conf.man.in:674
-#, no-wrap
-msgid "B<Allow >I<ipv4-address>B</>I<netmask>"
-msgstr "B<Allow >I<IPv4-Adresse>B</>I<Netzmaske>"
+#. type: Plain text
+#: cupsd.conf.5:524
+msgid "Gets a list of devices that are currently available."
+msgstr "Ermittelt eine Liste von derzeit verfügbaren Geräten."
 
 #. type: TP
-#: cupsd.conf.man.in:676
+#: cupsd.conf.5:524
 #, no-wrap
-msgid "B<Allow >I<ipv4-address>B</>I<mm>"
-msgstr "B<Allow >I<IPv4-Adresse>B</>I<mm>"
+msgid "CUPS-Get-Document"
+msgstr "CUPS-Get-Document"
 
-#. type: TP
-#: cupsd.conf.man.in:678
-#, no-wrap
-msgid "B<Allow [>I<ipv6-address>B<]>"
-msgstr "B<Allow [>I<IPv6-Adresse>B<]>"
+#. type: Plain text
+#: cupsd.conf.5:527
+msgid "Gets a document file for a job."
+msgstr "Ermittelt eine Dokumentendatei für einen Auftrag."
 
 #. type: TP
-#: cupsd.conf.man.in:680
+#: cupsd.conf.5:527
 #, no-wrap
-msgid "B<Allow [>I<ipv6-address>B<]/>I<mm>"
-msgstr "B<Allow [>I<IPv6-Adresse>B<]/>I<mm>"
+msgid "CUPS-Get-PPD"
+msgstr "CUPS-Get-PPD"
 
-#. type: TP
-#: cupsd.conf.man.in:682
-#, no-wrap
-msgid "B<Allow @IF(>I<name>B<)>"
-msgstr "B<Allow @IF(>I<Name>B<)>"
+#. type: Plain text
+#: cupsd.conf.5:530
+msgid "Gets a PPD file."
+msgstr "Ermittelt eine PPD-Datei."
 
 #. type: TP
-#: cupsd.conf.man.in:684
+#: cupsd.conf.5:530
 #, no-wrap
-msgid "B<Allow @LOCAL>"
-msgstr "B<Allow @LOCAL>"
+msgid "CUPS-Get-PPDs"
+msgstr "CUPS-Get-PPDs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:688
-msgid ""
-"Allows access from the named hosts, domains, addresses, or interfaces.  The "
-"Order directive controls whether Allow lines are evaluated before or after "
-"Deny lines."
-msgstr ""
-"Erlaubt Zugriffe von den benannten Rechnern, Domains, Adressen oder "
-"Schnittstellen. Die Direktive »Order« steuert, ob »Allow«-Zeilen vor oder "
-"nach »Deny«-Zeilen ausgewertet werden."
+#: cupsd.conf.5:533
+msgid "Gets a list of installed PPD files."
+msgstr "Ermittelt eine Liste von installierten PPD-Dateien."
 
 #. type: TP
-#: cupsd.conf.man.in:688
+#: cupsd.conf.5:533
 #, no-wrap
-msgid "B<AuthType None>"
-msgstr "B<AuthType None>"
+msgid "CUPS-Get-Printers"
+msgstr "CUPS-Get-Printers"
 
-#. type: TP
-#: cupsd.conf.man.in:690
-#, no-wrap
-msgid "B<AuthType Basic>"
-msgstr "B<AuthType Basic>"
+#. type: Plain text
+#: cupsd.conf.5:536
+msgid "Gets a list of printers."
+msgstr "Ermittelt eine Liste von Druckern."
 
 #. type: TP
-#: cupsd.conf.man.in:692
+#: cupsd.conf.5:536
 #, no-wrap
-msgid "B<AuthType Default>"
-msgstr "B<AuthType Default>"
+msgid "CUPS-Move-Job"
+msgstr "CUPS-Move-Job"
+
+#. type: Plain text
+#: cupsd.conf.5:539
+msgid "Moves a job."
+msgstr "Verschiebt einen Auftrag."
 
 #. type: TP
-#: cupsd.conf.man.in:694
+#: cupsd.conf.5:539
 #, no-wrap
-msgid "B<AuthType Negotiate>"
-msgstr "B<AuthType Negotiate>"
+msgid "CUPS-Reject-Jobs"
+msgstr "CUPS-Reject-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:698
-msgid ""
-"Specifies the type of authentication required.  The value \"Default\" "
-"corresponds to the DefaultAuthType value."
-msgstr ""
-"Legt die Art der benötigten Authentifizierung fest. Der Wert »Default« "
-"entspricht dem Wert »DefaultAuthType«."
+#: cupsd.conf.5:542
+msgid "Prevents a printer from accepting new jobs."
+msgstr "Verhindert, dass ein Drucker neue Aufträge akzeptiert."
 
 #. type: TP
-#: cupsd.conf.man.in:698
+#: cupsd.conf.5:542
 #, no-wrap
-msgid "B<Deny all>"
-msgstr "B<Deny all>"
+msgid "CUPS-Set-Default"
+msgstr "CUPS-Set-Default"
+
+#. type: Plain text
+#: cupsd.conf.5:545
+msgid "Sets the server default printer or printer class."
+msgstr "Setzt die Server-Vorgabe für einen Drucker oder eine Druckerklasse."
 
 #. type: TP
-#: cupsd.conf.man.in:700
+#: cupsd.conf.5:545
 #, no-wrap
-msgid "B<Deny none>"
-msgstr "B<Deny none>"
+msgid "Cancel-Job"
+msgstr "Cancel-Job"
+
+#. type: Plain text
+#: cupsd.conf.5:548
+msgid "Cancels a job."
+msgstr "Bricht einen Auftrag ab."
 
 #. type: TP
-#: cupsd.conf.man.in:702
+#: cupsd.conf.5:548
 #, no-wrap
-msgid "B<Deny >I<host.domain.com>"
-msgstr "B<Deny >I<Rechner.domain.com>"
+msgid "Cancel-Jobs"
+msgstr "Cancel-Jobs"
+
+#. type: Plain text
+#: cupsd.conf.5:551
+msgid "Cancels one or more jobs."
+msgstr "Bricht einen oder mehrere Aufträge ab."
 
 #. type: TP
-#: cupsd.conf.man.in:704
+#: cupsd.conf.5:551
 #, no-wrap
-msgid "B<Deny *.>I<domain.com>"
-msgstr "B<Deny *.>I<domain.com>"
+msgid "Cancel-My-Jobs"
+msgstr "Cancel-My-Jobs"
 
-#. type: TP
-#: cupsd.conf.man.in:706
-#, no-wrap
-msgid "B<Deny >I<ipv4-address>"
-msgstr "B<Deny >I<IPv4-Adresse>"
+#. type: Plain text
+#: cupsd.conf.5:554
+msgid "Cancels one or more jobs creates by a user."
+msgstr "Bricht einen oder mehrere von einem Benutzer erstellte Aufträge ab."
 
 #. type: TP
-#: cupsd.conf.man.in:708
+#: cupsd.conf.5:554
 #, no-wrap
-msgid "B<Deny >I<ipv4-address>B</>I<netmask>"
-msgstr "B<Deny >I<IPv4-Adresse>B</>I<Netzmaske>"
+msgid "Cancel-Subscription"
+msgstr "Cancel-Subscription"
+
+#. type: Plain text
+#: cupsd.conf.5:557
+msgid "Cancels a subscription."
+msgstr "Beendet ein Abonnement."
 
 #. type: TP
-#: cupsd.conf.man.in:710
+#: cupsd.conf.5:557
 #, no-wrap
-msgid "B<Deny >I<ipv4-address>B</>I<mm>"
-msgstr "B<Deny >I<IPv4-Adresse>B</>I<mm>"
+msgid "Close-Job"
+msgstr "Close-Job"
+
+#. type: Plain text
+#: cupsd.conf.5:560
+msgid "Closes a job that is waiting for more documents."
+msgstr "Schließt einen Auftrag, der auf weitere Dokumente wartet."
 
 #. type: TP
-#: cupsd.conf.man.in:712
+#: cupsd.conf.5:560
 #, no-wrap
-msgid "B<Deny [>I<ipv6-address>B<]>"
-msgstr "B<Deny [>I<IPv6-Adresse>B<]>"
+msgid "Create-Job"
+msgstr "Create-Job"
+
+#. type: Plain text
+#: cupsd.conf.5:563
+msgid "Creates a new job with no documents."
+msgstr "Erstellt einen neuen Auftrag ohne Dokumente."
 
 #. type: TP
-#: cupsd.conf.man.in:714
+#: cupsd.conf.5:563
 #, no-wrap
-msgid "B<Deny [>I<ipv6-address>B<]/>I<mm>"
-msgstr "B<Deny [>I<IPv6-Adresse>B<]/>I<mm>"
+msgid "Create-Job-Subscriptions"
+msgstr "Create-Job-Subscriptions"
+
+#. type: Plain text
+#: cupsd.conf.5:566
+msgid "Creates a subscription for job events."
+msgstr "Erstellt ein Abonnement für Auftragsereignisse."
 
 #. type: TP
-#: cupsd.conf.man.in:716
+#: cupsd.conf.5:566
 #, no-wrap
-msgid "B<Deny @IF(>I<name>B<)>"
-msgstr "B<Deny @IF(>I<Name>B<)>"
+msgid "Create-Printer-Subscriptions"
+msgstr "Create-Printer-Subscriptions"
+
+#. type: Plain text
+#: cupsd.conf.5:569
+msgid "Creates a subscription for printer events."
+msgstr "Erstellt ein Abonnement für Druckerereignisse."
 
 #. type: TP
-#: cupsd.conf.man.in:718
+#: cupsd.conf.5:569
 #, no-wrap
-msgid "B<Deny @LOCAL>"
-msgstr "B<Deny @LOCAL>"
+msgid "Get-Job-Attributes"
+msgstr "Get-Job-Attributes"
 
 #. type: Plain text
-#: cupsd.conf.man.in:722
-msgid ""
-"Denies access from the named hosts, domains, addresses, or interfaces.  The "
-"Order directive controls whether Deny lines are evaluated before or after "
-"Allow lines."
-msgstr ""
-"Verweigert Zugriffe von den benannten Rechnern, Domains, Adressen oder "
-"Schnittstellen. Die Direktive »Order« steuert, ob »Deny«-Zeilen vor oder "
-"nach »Allow«-Zeilen ausgewertet werden."
+#: cupsd.conf.5:572
+msgid "Gets information about a job."
+msgstr "Ermittelt Informationen über einen Auftrag."
+
+#. type: TP
+#: cupsd.conf.5:572
+#, no-wrap
+msgid "Get-Jobs"
+msgstr "Get-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:730
-msgid ""
-"Specifies the level of encryption that is required for a particular "
-"location.  The default value is \"IfRequested\"."
-msgstr ""
-"Legt die Verschlüsselungsstufe, die für einen bestimmten Ort benötigt wird, "
-"fest. Der Vorgabewert ist »IfRequested«."
+#: cupsd.conf.5:575
+msgid "Gets a list of jobs."
+msgstr "Ermittelt eine Liste von Aufträgen."
 
 #. type: TP
-#: cupsd.conf.man.in:730
+#: cupsd.conf.5:575
 #, no-wrap
-msgid "B<Order allow,deny>"
-msgstr "B<Order allow,deny>"
+msgid "Get-Notifications"
+msgstr "Get-Notifications"
 
 #. type: Plain text
-#: cupsd.conf.man.in:733
-msgid ""
-"Specifies that access is denied by default. Allow lines are then processed "
-"followed by Deny lines to determine whether a client may access a particular "
-"resource."
+#: cupsd.conf.5:578
+msgid "Gets a list of event notifications for a subscription."
 msgstr ""
-"Legt fest, dass der Zugriff standardmäßig verweigert wird. »Allow«-Zeilen "
-"werden dann nach »Deny«-Zeilen verarbeitet, um zu bestimmen, ob ein Client "
-"auf eine bestimmte Ressource zugreifen darf."
+"Ermittelt eine Liste von Ereignisbenachrichtigungen für ein Abonnement."
 
 #. type: TP
-#: cupsd.conf.man.in:733
+#: cupsd.conf.5:578
 #, no-wrap
-msgid "B<Order deny,allow>"
-msgstr "B<Order deny,allow>"
+msgid "Get-Printer-Attributes"
+msgstr "Get-Printer-Attributes"
 
 #. type: Plain text
-#: cupsd.conf.man.in:736
-msgid ""
-"Specifies that access is allowed by default. Deny lines are then processed "
-"followed by Allow lines to determine whether a client may access a "
-"particular resource."
-msgstr ""
-"Legt fest, dass der Zugriff standardmäßig erlaubt wird. »Deny«-Zeilen werden "
-"dann nach »Allow«-Zeilen verarbeitet, um zu bestimmen, ob ein Client auf "
-"eine bestimmte Ressource zugreifen darf."
+#: cupsd.conf.5:581
+msgid "Gets information about a printer or printer class."
+msgstr "Ermittelt Informationen über einen Drucker oder eine Druckerklasse."
 
 #. type: TP
-#: cupsd.conf.man.in:736
+#: cupsd.conf.5:581
 #, no-wrap
-msgid "B<Require group >I<group-name >[ I<group-name >... ]"
-msgstr "B<Require group >I<Gruppenname >[ I<Gruppenname >… ]"
+msgid "Get-Subscription-Attributes"
+msgstr "Get-Subscription-Attributes"
 
 #. type: Plain text
-#: cupsd.conf.man.in:739
-msgid ""
-"Specifies that an authenticated user must be a member of one of the named "
-"groups."
-msgstr ""
-"Legt fest, dass ein authentifizierter Benutzer ein Mitglied einer der "
-"benannten Gruppen sein muss."
+#: cupsd.conf.5:584
+msgid "Gets information about a subscription."
+msgstr "Ermittelt Informationen über ein Abonnement."
 
 #. type: TP
-#: cupsd.conf.man.in:739
+#: cupsd.conf.5:584
 #, no-wrap
-msgid "B<Require user {>I<user-name>|B<@>I<group-name>} ..."
-msgstr "B<Require user {>I<Benutzername>|B<@>I<Gruppenname>} …"
+msgid "Get-Subscriptions"
+msgstr "Get-Subscriptions"
 
 #. type: Plain text
-#: cupsd.conf.man.in:747
-msgid ""
-"Specifies that an authenticated user must match one of the named users or be "
-"a member of one of the named groups.  The group name \"@SYSTEM\" corresponds "
-"to the list of groups defined by the SystemGroup directive in the B<cups-"
-"files.conf>(5)  file.  The group name \"@OWNER\" corresponds to the owner of "
-"the resource, for example the person that submitted a print job.  Note: The "
-"'root' user is not special and must be granted privileges like any other "
-"user account."
-msgstr ""
-"Legt fest, dass ein authentifizierter Benutzer auf eine der benannten "
-"Benutzer passen oder ein Mitglied einer der benannten Gruppen sein muss. Der "
-"Gruppenname »@SYSTEM« entspricht der in der Direktive SystemGroup in der "
-"Datei B<cups-files.conf>(5) definierten Liste von Gruppen. Der Gruppenname "
-"»@OWNER« entspricht dem Eigentümer der Ressource, beispielsweise der Person, "
-"die den Auftrag eingereicht hat. Hinweis: Der Benutzer »root« wird nicht "
-"besonders behandelt und ihm müssen die Privilegien wie bei jedem anderen "
-"Benutzerkonto übertragen werden."
+#: cupsd.conf.5:587
+msgid "Gets a list of subscriptions."
+msgstr "Ermittelt eine Liste von Abonnements."
 
 #. type: TP
-#: cupsd.conf.man.in:747
+#: cupsd.conf.5:587
 #, no-wrap
-msgid "B<Require valid-user>"
-msgstr "B<Require valid-user>"
+msgid "Hold-Job"
+msgstr "Hold-Job"
 
 #. type: Plain text
-#: cupsd.conf.man.in:750
-msgid "Specifies that any authenticated user is acceptable."
-msgstr "Legt fest, dass jeder authentifizierte Benutzer akzeptiert wird."
+#: cupsd.conf.5:590
+msgid "Holds a job from printing."
+msgstr "Hält einen Auftrag vom Druck zurück."
 
 #. type: TP
-#: cupsd.conf.man.in:750
+#: cupsd.conf.5:590
 #, no-wrap
-msgid "B<Satisfy all>"
-msgstr "B<Satisfy all>"
+msgid "Hold-New-Jobs"
+msgstr "Hold-New-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:753
-msgid ""
-"Specifies that all Allow, AuthType, Deny, Order, and Require conditions must "
-"be satisfied to allow access."
-msgstr ""
-"Legt fest, dass alle »Allow«-, »AuthType«-, »Deny«-, »Order«- und »Require«-"
-"Bedingungen erfüllt sein müssen, damit der Zugriff erlaubt wird."
+#: cupsd.conf.5:593
+msgid "Holds all new jobs from printing."
+msgstr "Hält alle neuen Aufträge vom Druck zurück."
 
 #. type: TP
-#: cupsd.conf.man.in:753
+#: cupsd.conf.5:593
 #, no-wrap
-msgid "B<Satisfy any>"
-msgstr "B<Satisfy any>"
+msgid "Pause-Printer"
+msgstr "Pause-Printer"
 
 #. type: Plain text
-#: cupsd.conf.man.in:757
-msgid ""
-"Specifies that any a client may access a resource if either the "
-"authentication (AuthType/Require) or address (Allow/Deny/Order) conditions "
-"are satisfied.  For example, this can be used to require authentication only "
-"for remote accesses."
+#: cupsd.conf.5:596
+msgid "Stops processing of jobs by a printer or printer class."
 msgstr ""
-"Legt fest, dass jeder Client auf eine Ressource zugreifen darf, falls "
-"entweder die Authentifizierungs- (AuthType/Require) oder die Adress- (Allow/"
-"Deny/Order) Bedingung erfüllt ist. Beispielsweise kann dies dazu verwandt "
-"werden, Authentifizierung nur bei Zugriff aus der Ferne zu verlangen."
+"Beendet die Verarbeitung von Aufträgen von einem Drucker oder einer "
+"Druckerklasse."
 
-#. type: SS
-#: cupsd.conf.man.in:757
+#. type: TP
+#: cupsd.conf.5:596
 #, no-wrap
-msgid "DIRECTIVES VALID WITHIN POLICY SECTIONS"
-msgstr "DIREKTIVEN, DIE INNERHALB VON POLICY-ABSCHNITTEN GÜLTIG SIND"
+msgid "Pause-Printer-After-Current-Job"
+msgstr "Pause-Printer-After-Current-Job"
 
 #. type: Plain text
-#: cupsd.conf.man.in:759
+#: cupsd.conf.5:599
 msgid ""
-"The following directives may be placed inside Policy sections in the B<cupsd."
-"conf> file:"
+"Stops processing of jobs by a printer or printer class after the current job "
+"is finished."
 msgstr ""
-"Die folgenden Direktiven dürfen innerhalb von Policy-Abschnitten in der "
-"Datei B<cupsd.conf> gesetzt werden."
+"Beendet die Verarbeitung von Aufträgen durch einen Drucker oder eine "
+"Druckerklasse, nachdem der aktuelle Auftrag beendet wurde."
 
 #. type: TP
-#: cupsd.conf.man.in:759
+#: cupsd.conf.5:599
 #, no-wrap
-msgid "B<JobPrivateAccess all>"
-msgstr "B<JobPrivateAccess all>"
+msgid "Print-Job"
+msgstr "Print-Job"
 
-#. type: TP
-#: cupsd.conf.man.in:761
-#, no-wrap
-msgid "B<JobPrivateAccess default>"
-msgstr "B<JobPrivateAccess default>"
+#. type: Plain text
+#: cupsd.conf.5:602
+msgid "Creates a new job with a single document."
+msgstr "Erstellt einen neuen Auftrag mit einem einzelnen Dokument."
 
 #. type: TP
-#: cupsd.conf.man.in:763
+#: cupsd.conf.5:602
 #, no-wrap
-msgid "B<JobPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
-msgstr "B<JobPrivateAccess >{I<Benutzer>|B<@>I<Gruppe>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} …"
+msgid "Purge-Jobs"
+msgstr "Purge-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:772
-msgid ""
-"Specifies an access list for a job's private values.  The \"default\" access "
-"list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's requesting-user-"
-"name-allowed or requesting-user-name-denied values.  \"@OWNER\" maps to the "
-"job's owner.  \"@SYSTEM\" maps to the groups listed for the SystemGroup "
-"directive in the B<cups-files.conf>(5)  file."
-msgstr ""
-"Legt eine Zugriffsliste für die privaten Werte eines Auftrags fest. Die "
-"»Standard«- (default) Zugriffsliste ist »@OWNER @SYSTEM«. »@ACL« passt auf "
-"die Werte requesting-user-name-allowed oder requesting-user-name-denied des "
-"Druckers. »@OWNER« passt auf den Eigentümer des Auftrags. »@SYSTEM« passt "
-"auf die in der Direktive SystemGroup in der Datei B<cups-files.conf>(5) "
-"aufgeführten Gruppen."
+#: cupsd.conf.5:605
+msgid "Cancels one or more jobs and deletes the job history."
+msgstr "Bricht einen oder mehrere Aufträge ab und löscht die Auftragschronik."
 
 #. type: TP
-#: cupsd.conf.man.in:772
+#: cupsd.conf.5:605
 #, no-wrap
-msgid "B<JobPrivateValues all>"
-msgstr "B<JobPrivateValues all>"
+msgid "Release-Held-New-Jobs"
+msgstr "Release-Held-New-Jobs"
 
-#. type: TP
-#: cupsd.conf.man.in:774
-#, no-wrap
-msgid "B<JobPrivateValues default>"
-msgstr "B<JobPrivateValues default>"
+#. type: Plain text
+#: cupsd.conf.5:608
+msgid "Allows previously held jobs to print."
+msgstr "Erlaubt, vorher angehaltenen Aufträgen zu drucken."
 
 #. type: TP
-#: cupsd.conf.man.in:776
+#: cupsd.conf.5:608
 #, no-wrap
-msgid "B<JobPrivateValues none>"
-msgstr "B<JobPrivateValues none>"
+msgid "Release-Job"
+msgstr "Release-Job"
+
+#. type: Plain text
+#: cupsd.conf.5:611
+msgid "Allows a job to print."
+msgstr "Erlaubt einem Auftrag, zu drucken."
 
 #. type: TP
-#: cupsd.conf.man.in:778
+#: cupsd.conf.5:611
 #, no-wrap
-msgid "B<JobPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
-msgstr "B<JobPrivateValues >I<Attributename >[ … I<Attributname >]"
+msgid "Renew-Subscription"
+msgstr "Renew-Subscription"
 
 #. type: Plain text
-#: cupsd.conf.man.in:782
-msgid ""
-"Specifies the list of job values to make private.  The \"default\" values "
-"are \"job-name\", \"job-originating-host-name\", \"job-originating-user-name"
-"\", and \"phone\"."
-msgstr ""
-"Legt die Liste der Auftragswerte, die privat werden sollen, fest. Die "
-"»Standard«- (default) Werte sind »job-name«, »job-originating-host-name«, "
-"»job-originating-user-name« und »phone«."
+#: cupsd.conf.5:614
+msgid "Renews a subscription."
+msgstr "Erneuert ein Abonnement."
 
 #. type: TP
-#: cupsd.conf.man.in:782
+#: cupsd.conf.5:614
 #, no-wrap
-msgid "B<SubscriptionPrivateAccess all>"
-msgstr "B<SubscriptionPrivateAccess all>"
+msgid "Restart-Job"
+msgstr "Restart-Job"
+
+#. type: Plain text
+#: cupsd.conf.5:617
+msgid "Reprints a job, if possible."
+msgstr "Druckt falls möglich einen Auftrag erneut."
 
 #. type: TP
-#: cupsd.conf.man.in:784
+#: cupsd.conf.5:617
 #, no-wrap
-msgid "B<SubscriptionPrivateAccess default>"
-msgstr "B<SubscriptionPrivateAccess default>"
-
-#. type: TP
-#: cupsd.conf.man.in:786
-#, no-wrap
-msgid "B<SubscriptionPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
-msgstr "B<SubscriptionPrivateAccess >{I<Benutzer>|B<@>I<Gruppe>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} …"
+msgid "Send-Document"
+msgstr "Send-Document"
 
 #. type: Plain text
-#: cupsd.conf.man.in:795
-msgid ""
-"Specifies an access list for a subscription's private values.  The \"default"
-"\" access list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's "
-"requesting-user-name-allowed or requesting-user-name-denied values.  \"@OWNER"
-"\" maps to the job's owner.  \"@SYSTEM\" maps to the groups listed for the "
-"SystemGroup directive in the B<cups-files.conf>(5)  file."
-msgstr ""
-"Legt eine Zugriffsliste für die privaten Werte eines Abonnements fest. Die "
-"»Standard«- (default) Zugriffsliste ist »@OWNER @SYSTEM«. »@ACL« passt auf "
-"die Werte requesting-user-name-allowed oder requesting-user-name-denied des "
-"Druckers. »@OWNER« passt auf den Eigentümer des Auftrags. »@SYSTEM« passt "
-"auf die in der Direktive SystemGroup in der Datei B<cups-files.conf>(5) "
-"aufgeführten Gruppen."
+#: cupsd.conf.5:620
+msgid "Adds a document to a job."
+msgstr "Fügt ein Dokument zu einem Auftrag hinzu."
 
 #. type: TP
-#: cupsd.conf.man.in:795
+#: cupsd.conf.5:620
 #, no-wrap
-msgid "B<SubscriptionPrivateValues all>"
-msgstr "B<SubscriptionPrivateValues all>"
+msgid "Set-Job-Attributes"
+msgstr "Set-Job-Attributes"
 
-#. type: TP
-#: cupsd.conf.man.in:797
-#, no-wrap
-msgid "B<SubscriptionPrivateValues default>"
-msgstr "B<SubscriptionPrivateValues default>"
+#. type: Plain text
+#: cupsd.conf.5:623
+msgid "Changes job information."
+msgstr "Ändert Auftragsinformationen."
 
 #. type: TP
-#: cupsd.conf.man.in:799
+#: cupsd.conf.5:623
 #, no-wrap
-msgid "B<SubscriptionPrivateValues none>"
-msgstr "B<SubscriptionPrivateValues none>"
+msgid "Set-Printer-Attributes"
+msgstr "Set-Printer-Attributes"
+
+#. type: Plain text
+#: cupsd.conf.5:626
+msgid "Changes printer or printer class information."
+msgstr "Ändert Drucker- oder Druckerklasseninformationen."
 
 #. type: TP
-#: cupsd.conf.man.in:801
+#: cupsd.conf.5:626
 #, no-wrap
-msgid "B<SubscriptionPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
-msgstr "B<SubscriptionPrivateValues >I<Attributname >[ … I<Attributname >]"
+msgid "Validate-Job"
+msgstr "Validate-Job"
 
 #. type: Plain text
-#: cupsd.conf.man.in:805
-msgid ""
-"Specifies the list of subscription values to make private.  The \"default\" "
-"values are \"notify-events\", \"notify-pull-method\", \"notify-recipient-uri"
-"\", \"notify-subscriber-user-name\", and \"notify-user-data\"."
-msgstr ""
-"Legt die Liste der Abonnementswerte, die privat werden sollen, fest. Die "
-"»Standard«- (default) Werte sind »notify-events«, »notify-pull-method«, "
-"»notify-recipient-uri«, »notify-subscriber-user-name« und »notify-user-data«."
+#: cupsd.conf.5:629
+msgid "Validates options for a new job."
+msgstr "Validiert Optionen für einen neuen Auftrag."
 
 #. type: SS
-#: cupsd.conf.man.in:805 cups-files.conf.man.in:233
+#: cupsd.conf.5:629
 #, no-wrap
-msgid "DEPRECATED DIRECTIVES"
-msgstr "VERALTETE DIREKTIVEN"
+msgid "LOCATION PATHS"
+msgstr "ORTSPFADE"
 
-#. #Classification
 #. type: Plain text
-#: cupsd.conf.man.in:808
-msgid ""
-"The following directives are deprecated and will be removed in a future "
-"release of CUPS:"
+#: cupsd.conf.5:632
+msgid "The following paths are commonly used when configuring B<cupsd>(8):"
 msgstr ""
-"I<Die nachfolgenden Direktiven sind veraltet und werden in einer zukünftigen "
-"Veröffentlichung von CUPS entfernt werden>:"
+"Die folgenden Pfade werden bei der Konfiguration von B<cupsd>(8) häufig "
+"verwandt:"
 
 #. type: TP
-#: cupsd.conf.man.in:808
+#: cupsd.conf.5:632
 #, no-wrap
-msgid "B<Classification >I<banner>"
-msgstr "B<Classification >I<Deckblatt>"
+msgid "/"
+msgstr "/"
 
-#. #ClassifyOverride
 #. type: Plain text
-#: cupsd.conf.man.in:815
-msgid ""
-"Specifies the security classification of the server.  Any valid banner name "
-"can be used, including \"classified\", \"confidential\", \"secret\", "
-"\"topsecret\", and \"unclassified\", or the banner can be omitted to disable "
-"secure printing functions.  The default is no classification banner."
-msgstr ""
-"Legt die Sicherheitsklassifizierung des Servers fest. Jeder gültige "
-"Deckblattname kann verwandt werden, darunter »classified«, »confidential«, "
-"»secret«, »topsecret« und »unclassified«. Der Deckblattname kann auch "
-"entfallen, um die sicheren Druckfunktionen zu deaktivieren. Standardmäßig "
-"gibt es kein Einstufungsdeckblatt."
-
-#. type: TP
-#: cupsd.conf.man.in:815
-#, no-wrap
-msgid "B<ClassifyOverride Yes>"
-msgstr "B<ClassifyOverride Yes>"
+#: cupsd.conf.5:635
+msgid "The path for all get operations (get-printers, get-jobs, etc.)"
+msgstr "Der Pfad für alle »get«-Vorgänge (get-printers, get-jobs, usw.)"
 
 #. type: TP
-#: cupsd.conf.man.in:817
+#: cupsd.conf.5:635
 #, no-wrap
-msgid "B<ClassifyOverride No>"
-msgstr "B<ClassifyOverride No>"
+msgid "/admin"
+msgstr "/admin"
 
-#. #PageLogFormat
 #. type: Plain text
-#: cupsd.conf.man.in:823
+#: cupsd.conf.5:638
 msgid ""
-"Specifies whether users may override the classification (cover page) of "
-"individual print jobs using the \"job-sheets\" option.  The default is \"No"
-"\"."
+"The path for all administration operations (add-printer, delete-printer, "
+"start-printer, etc.)"
 msgstr ""
-"Legt fest, ob es Benutzern erlaubt werden soll, die Einstufung (Titelseite) "
-"individueller Druckaufträge mit der Option »job-sheets« zu ändern. Die "
-"Vorgabe ist »No«."
+"Der Pfad für alle Administrationsvorgänge (add-printer, delete-printer, "
+"start-printer, usw.)"
 
 #. type: TP
-#: cupsd.conf.man.in:823
+#: cupsd.conf.5:638
 #, no-wrap
-msgid "B<PageLogFormat >I<format-string>"
-msgstr "B<PageLogFormat >I<Formatzeichenkette>"
+msgid "/admin/conf"
+msgstr "/admin/conf"
 
 #. type: Plain text
-#: cupsd.conf.man.in:828
+#: cupsd.conf.5:641
 msgid ""
-"Specifies the format of PageLog lines.  Sequences beginning with percent (%) "
-"characters are replaced with the corresponding information, while all other "
-"characters are copied literally.  The following percent sequences are "
-"recognized:"
+"The path for access to the CUPS configuration files (cupsd.conf, client."
+"conf, etc.)"
 msgstr ""
-"Legt das Format der PageLog-Zeilen fest. Sequenzen beginnen mit einem "
-"Prozentzeichen (%) und werden durch die entsprechende Information ersetzt, "
-"während alle anderen Zeichen unverändert kopiert werden. Die folgenden "
-"Prozentsequenzen werden erkannt:"
+"Der Pfad, um auf die CUPS-Konfigurationsdateien (cupsd.conf, client.conf, "
+"usw.) zuzugreifen"
 
-#. type: Plain text
-#: cupsd.conf.man.in:838
+#. type: TP
+#: cupsd.conf.5:641
 #, no-wrap
-msgid ""
-"    \"%%\" inserts a single percent character.\n"
-"    \"%{name}\" inserts the value of the specified IPP attribute.\n"
-"    \"%C\" inserts the number of copies for the current page.\n"
-"    \"%P\" inserts the current page number.\n"
-"    \"%T\" inserts the current date and time in common log format.\n"
-"    \"%j\" inserts the job ID.\n"
-"    \"%p\" inserts the printer name.\n"
-"    \"%u\" inserts the username.\n"
-msgstr ""
-"    \"%%\" fügt ein einzelnes Prozentzeichen ein.\n"
-"    \"%{name}\" fügt den Wert des angegebenen IPP-Attributs ein.\n"
-"    \"%C\" fügt die Anzahl der Kopien für die aktuelle Seite ein.\n"
-"    \"%P\" fügt die aktuelle Seitenzahl ein.\n"
-"    \"%T\" fügt das aktuelle Datum und die aktuelle Zeit im »common log format« ein.\n"
-"    \"%j\" fügt die Auftrags-ID ein.\n"
-"    \"%p\" fügt den Druckernamen ein.\n"
-"    \"%u\" fügt den Benutzernamen ein.\n"
+msgid "/admin/log"
+msgstr "/admin/log"
 
-#. #RIPCache
 #. type: Plain text
-#: cupsd.conf.man.in:843
-#, fuzzy
+#: cupsd.conf.5:644
 msgid ""
-"The default is the empty string, which disables page logging.  The string "
-"\"%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} "
-"%{media} %{sides}\" creates a page log with the standard items."
+"The path for access to the CUPS log files (access_log, error_log, page_log)"
 msgstr ""
-"Die Vorgabe ist die leere Zeichenkette, womit das Protokollieren der Seiten "
-"deaktiviert wird. Die Zeichenkette »%p %u %j %T %P %C %{job-billing} %{job-"
-"originating-host-name} %{job-name} %{media} %{sides}« erstellt ein "
-"Seitenprotokoll mit den Standardeinträgen."
+"Der Pfad, um auf die CUPS-Protokolldateien (access_log, error_log, page_log) "
+"zuzugreifen"
 
 #. type: TP
-#: cupsd.conf.man.in:843
+#: cupsd.conf.5:644
 #, no-wrap
-msgid "B<RIPCache >I<size>"
-msgstr "B<RIPCache >I<Größe>"
+msgid "/classes"
+msgstr "/classes"
 
 #. type: Plain text
-#: cupsd.conf.man.in:847
-msgid ""
-"Specifies the maximum amount of memory to use when converting documents into "
-"bitmaps for a printer.  The default is \"128m\"."
-msgstr ""
-"Legt die maximale Menge an zu verwendendem Speicher beim Konvertieren von "
-"Dokumenten in Bitmaps für den Drucker fest. Die Vorgabe ist »128m«."
+#: cupsd.conf.5:647
+msgid "The path for all printer classes"
+msgstr "Der Pfad für alle Druckerklassen"
 
-#. type: Plain text
-#: cupsd.conf.man.in:849
-msgid ""
-"The B<cupsd.conf> file format is based on the Apache HTTP Server "
-"configuration file format."
-msgstr ""
-"Das Dateiformat der B<cupsd.conf> basiert auf dem Apache-HTTP-Server-"
-"Konfigurationsdateiformat."
+#. type: TP
+#: cupsd.conf.5:647
+#, no-wrap
+msgid "/classes/name"
+msgstr "/classes/name"
 
 #. type: Plain text
-#: cupsd.conf.man.in:851
-msgid "Log everything with a maximum log file size of 32 megabytes:"
-msgstr ""
-"Alles protokollieren, mit einer maximalen Protokolldateigröße von 32 "
-"Megabytes:"
+#: cupsd.conf.5:650
+msgid "The resource for the named printer class"
+msgstr "Die Ressourcen für die benannte Druckerklasse"
 
-#. type: Plain text
-#: cupsd.conf.man.in:856
+#. type: TP
+#: cupsd.conf.5:650
 #, no-wrap
-msgid ""
-"    AccessLogLevel all\n"
-"    LogLevel debug2\n"
-"    MaxLogSize 32m\n"
-msgstr ""
-"    AccessLogLevel all\n"
-"    LogLevel debug2\n"
-"    MaxLogSize 32m\n"
+msgid "/jobs"
+msgstr "/jobs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:859
-msgid "Require authentication for accesses from outside the 10. network:"
-msgstr "Authentifizierung für Zugriffe außerhalb des 10er-Netzes verlangen:"
+#: cupsd.conf.5:653
+msgid "The path for all jobs (hold-job, release-job, etc.)"
+msgstr "Der Pfad für alle Aufträge (hold-job, release-job, usw.)"
 
-#. type: Plain text
-#: cupsd.conf.man.in:868
+#. type: TP
+#: cupsd.conf.5:653
 #, no-wrap
-msgid ""
-"    E<lt>Location /E<gt>\n"
-"    Order allow,deny\n"
-"    Allow from 10./8\n"
-"    AuthType Basic\n"
-"    Require valid-user\n"
-"    Satisfy any\n"
-"    E<lt>/LocationE<gt>\n"
-msgstr ""
-"    E<lt>Location /E<gt>\n"
-"    Order allow,deny\n"
-"    Allow from 10./8\n"
-"    AuthType Basic\n"
-"    Require valid-user\n"
-"    Satisfy any\n"
-"    E<lt>/LocationE<gt>\n"
+msgid "/jobs/id"
+msgstr "/jobs/id"
 
 #. type: Plain text
-#: cupsd.conf.man.in:878
-msgid ""
-"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<mime.convs>(5), "
-"B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), CUPS Online "
-"Help (http://localhost:631/help)"
-msgstr ""
-"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<mime.convs>(5), "
-"B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), CUPS-Online-"
-"Hilfe (http://localhost:631/help)"
+#: cupsd.conf.5:656
+msgid "The path for the specified job"
+msgstr "Der Pfad für den angegebenen Auftrag"
+
+#. type: TP
+#: cupsd.conf.5:656
+#, no-wrap
+msgid "/printers"
+msgstr "/printers"
 
 #. type: Plain text
-#: cupsd.conf.man.in:879 ipptoolfile.man:652
-msgid "Copyright \\[co] 2007-2019 by Apple Inc."
-msgstr "Copyright \\[co] 2007-2019 by Apple Inc."
+#: cupsd.conf.5:659
+msgid "The path for all printers"
+msgstr "Der Pfad für alle Drucker"
 
-#. type: TH
-#: cupsd-helper.man:13
+#. type: TP
+#: cupsd.conf.5:659
 #, no-wrap
-msgid "cupsd-helper"
-msgstr "cupsd-helper"
+msgid "/printers/name"
+msgstr "/printers/name"
 
 #. type: Plain text
-#: cupsd-helper.man:16
-#, fuzzy
-msgid "cupsd-helper - cupsd helper programs"
-msgstr "cupsd-helper - cupsd-Helferprogramme"
+#: cupsd.conf.5:662
+msgid "The path for the named printer"
+msgstr "Der Pfad für den benannten Drucker"
+
+#. type: TP
+#: cupsd.conf.5:662
+#, no-wrap
+msgid "/printers/name.png"
+msgstr "/printers/name.png"
 
 #. type: Plain text
-#: cupsd-helper.man:22
-msgid "B<cups-deviced> I<request-id> I<limit> I<user-id> I<options>"
-msgstr "B<cups-deviced> I<Anfrage-ID> I<Begrenzung> I<Benutzer-ID> I<Optionen>"
+#: cupsd.conf.5:665
+msgid "The icon file path for the named printer"
+msgstr "Der Icon-Dateipfad für den benannten Drucker"
 
-#. type: Plain text
-#: cupsd-helper.man:26
-msgid "B<cups-driverd> B<cat> I<ppd-name>"
-msgstr "B<cups-driverd> B<cat> I<PPD-Name>"
+#. type: TP
+#: cupsd.conf.5:665
+#, no-wrap
+msgid "/printers/name.ppd"
+msgstr "/printers/name.ppd"
 
 #. type: Plain text
-#: cupsd-helper.man:32
-msgid "B<cups-driverd> B<list> I<request_id> I<limit> I<options>"
-msgstr "B<cups-driverd> B<list> I<Anfrage-ID> I<Begrenzung> I<Optionen>"
+#: cupsd.conf.5:668
+msgid "The PPD file path for the named printer"
+msgstr "Der PPD-Dateipfad für den benannten Drucker"
+
+#. type: SS
+#: cupsd.conf.5:668
+#, no-wrap
+msgid "DIRECTIVES VALID WITHIN LOCATION AND LIMIT SECTIONS"
+msgstr "DIREKTIVEN, DIE INNERHALB VON ORTS- UND EINSCHRÄNKUNGSABSCHNITTEN GÜLTIG SIND"
 
 #. type: Plain text
-#: cupsd-helper.man:49
+#: cupsd.conf.5:670
 msgid ""
-"B<cups-exec> I<sandbox-profile> [ I<-g> I<group-id> ] [ I<-n> I<nice-"
-"value> ] [ I<-u> I<user-id> ] I</path/to/program> I<argv0> I<...> I<argvN>"
+"The following directives may be placed inside Location and Limit sections in "
+"the B<cupsd.conf> file:"
 msgstr ""
-"B<cups-exec> I<Sandbox-Profil> [ I<-g> I<Gruppen-ID> ] [ I<-n> I<nice-"
-"Wert> ] [ I<-u> I<Benutzer-ID> ] I</Pfad/zu/Programm> I<argv0> I<…> I<argvN>"
+"Die folgenden Direktiven können innerhalb von Orts- und "
+"Einschränkungsabschnitten in der Datei B<cupsd.conf> eingetragen werden:"
+
+#. type: TP
+#: cupsd.conf.5:670
+#, no-wrap
+msgid "B<Allow all>"
+msgstr "B<Allow all>"
+
+#. type: TP
+#: cupsd.conf.5:672
+#, no-wrap
+msgid "B<Allow none>"
+msgstr "B<Allow none>"
+
+#. type: TP
+#: cupsd.conf.5:674
+#, no-wrap
+msgid "B<Allow >I<host.domain.com>"
+msgstr "B<Allow >I<Rechner.domain.com>"
+
+#. type: TP
+#: cupsd.conf.5:676
+#, no-wrap
+msgid "B<Allow *.>I<domain.com>"
+msgstr "B<Allow *.>I<domain.com>"
+
+#. type: TP
+#: cupsd.conf.5:678
+#, no-wrap
+msgid "B<Allow >I<ipv4-address>"
+msgstr "B<Allow >I<IPv4-Adresse>"
+
+#. type: TP
+#: cupsd.conf.5:680
+#, no-wrap
+msgid "B<Allow >I<ipv4-address>B</>I<netmask>"
+msgstr "B<Allow >I<IPv4-Adresse>B</>I<Netzmaske>"
+
+#. type: TP
+#: cupsd.conf.5:682
+#, no-wrap
+msgid "B<Allow >I<ipv4-address>B</>I<mm>"
+msgstr "B<Allow >I<IPv4-Adresse>B</>I<mm>"
+
+#. type: TP
+#: cupsd.conf.5:684
+#, no-wrap
+msgid "B<Allow [>I<ipv6-address>B<]>"
+msgstr "B<Allow [>I<IPv6-Adresse>B<]>"
+
+#. type: TP
+#: cupsd.conf.5:686
+#, no-wrap
+msgid "B<Allow [>I<ipv6-address>B<]/>I<mm>"
+msgstr "B<Allow [>I<IPv6-Adresse>B<]/>I<mm>"
+
+#. type: TP
+#: cupsd.conf.5:688
+#, no-wrap
+msgid "B<Allow @IF(>I<name>B<)>"
+msgstr "B<Allow @IF(>I<Name>B<)>"
+
+#. type: TP
+#: cupsd.conf.5:690
+#, no-wrap
+msgid "B<Allow @LOCAL>"
+msgstr "B<Allow @LOCAL>"
 
 #. type: Plain text
-#: cupsd-helper.man:55
+#: cupsd.conf.5:696
 msgid ""
-"The B<cupsd-helper> programs perform long-running operations on behalf of "
-"the scheduler, B<cupsd>(8).  The B<cups-deviced> helper program runs each "
-"CUPS B<backend>(7)  with no arguments in order to discover the available "
-"printers."
+"Allows access from the named hosts, domains, addresses, or interfaces.  The "
+"@IF(name) form uses the current subnets configured for the named interface.  "
+"The @LOCAL form uses the current subnets configured for all interfaces that "
+"are not point-to-point, for example Ethernet and Wi-Fi interfaces are used "
+"but DSL and VPN interfaces are not.  The Order directive controls whether "
+"Allow lines are evaluated before or after Deny lines."
 msgstr ""
-"Die Programme B<cupsd-helper> führen langlaufende Vorgänge im Auftrag des "
-"Auftragsplaners, B<cupsd>(8), durch. Das Helferprogramm B<cups-deviced> "
-"führt jedes CUPS-B<backend>(7) ohne Argumente aus, um verfügbare Drucker zu "
-"entdecken."
+
+#. type: TP
+#: cupsd.conf.5:696
+#, no-wrap
+msgid "B<AuthType None>"
+msgstr "B<AuthType None>"
+
+#. type: TP
+#: cupsd.conf.5:698
+#, no-wrap
+msgid "B<AuthType Basic>"
+msgstr "B<AuthType Basic>"
+
+#. type: TP
+#: cupsd.conf.5:700
+#, no-wrap
+msgid "B<AuthType Default>"
+msgstr "B<AuthType Default>"
+
+#. type: TP
+#: cupsd.conf.5:702
+#, no-wrap
+msgid "B<AuthType Negotiate>"
+msgstr "B<AuthType Negotiate>"
 
 #. type: Plain text
-#: cupsd-helper.man:57
+#: cupsd.conf.5:706
 msgid ""
-"The B<cups-driverd> helper program lists all available printer drivers, a "
-"subset of \"matching\" printer drivers, or a copy of a specific driver PPD "
-"file."
+"Specifies the type of authentication required.  The value \"Default\" "
+"corresponds to the DefaultAuthType value."
 msgstr ""
-"Das Helferprogramm B<cups-driverd> listet alle verfügbaren Druckertreiber "
-"auf, eine Teilmenge, die auf Druckertreiber »passt« oder eine Kopie einer "
-"bestimmten PPD-Treiberdatei."
+"Legt die Art der benötigten Authentifizierung fest. Der Wert »Default« "
+"entspricht dem Wert »DefaultAuthType«."
+
+#. type: TP
+#: cupsd.conf.5:706
+#, no-wrap
+msgid "B<Deny all>"
+msgstr "B<Deny all>"
+
+#. type: TP
+#: cupsd.conf.5:708
+#, no-wrap
+msgid "B<Deny none>"
+msgstr "B<Deny none>"
+
+#. type: TP
+#: cupsd.conf.5:710
+#, no-wrap
+msgid "B<Deny >I<host.domain.com>"
+msgstr "B<Deny >I<Rechner.domain.com>"
+
+#. type: TP
+#: cupsd.conf.5:712
+#, no-wrap
+msgid "B<Deny *.>I<domain.com>"
+msgstr "B<Deny *.>I<domain.com>"
+
+#. type: TP
+#: cupsd.conf.5:714
+#, no-wrap
+msgid "B<Deny >I<ipv4-address>"
+msgstr "B<Deny >I<IPv4-Adresse>"
+
+#. type: TP
+#: cupsd.conf.5:716
+#, no-wrap
+msgid "B<Deny >I<ipv4-address>B</>I<netmask>"
+msgstr "B<Deny >I<IPv4-Adresse>B</>I<Netzmaske>"
+
+#. type: TP
+#: cupsd.conf.5:718
+#, no-wrap
+msgid "B<Deny >I<ipv4-address>B</>I<mm>"
+msgstr "B<Deny >I<IPv4-Adresse>B</>I<mm>"
+
+#. type: TP
+#: cupsd.conf.5:720
+#, no-wrap
+msgid "B<Deny [>I<ipv6-address>B<]>"
+msgstr "B<Deny [>I<IPv6-Adresse>B<]>"
+
+#. type: TP
+#: cupsd.conf.5:722
+#, no-wrap
+msgid "B<Deny [>I<ipv6-address>B<]/>I<mm>"
+msgstr "B<Deny [>I<IPv6-Adresse>B<]/>I<mm>"
+
+#. type: TP
+#: cupsd.conf.5:724
+#, no-wrap
+msgid "B<Deny @IF(>I<name>B<)>"
+msgstr "B<Deny @IF(>I<Name>B<)>"
+
+#. type: TP
+#: cupsd.conf.5:726
+#, no-wrap
+msgid "B<Deny @LOCAL>"
+msgstr "B<Deny @LOCAL>"
 
 #. type: Plain text
-#: cupsd-helper.man:59
+#: cupsd.conf.5:732
 msgid ""
-"The B<cups-exec> helper program runs backends, filters, and other programs. "
-"On macOS these programs are run in a secure sandbox."
+"Denies access from the named hosts, domains, addresses, or interfaces.  The "
+"@IF(name) form uses the current subnets configured for the named interface.  "
+"The @LOCAL form uses the current subnets configured for all interfaces that "
+"are not point-to-point, for example Ethernet and Wi-Fi interfaces are used "
+"but DSL and VPN interfaces are not.  The Order directive controls whether "
+"Deny lines are evaluated before or after Allow lines."
 msgstr ""
-"Das Helferprogramm B<cups-exec> führt Backends, Filter und andere Programme "
-"aus. Unter macOS laufen diese Programme in einer sicheren Sandbox."
 
 #. type: Plain text
-#: cupsd-helper.man:61
+#: cupsd.conf.5:740
 msgid ""
-"The B<cups-driverd> program looks for PPD and driver information files in "
-"the following directories:"
+"Specifies the level of encryption that is required for a particular "
+"location.  The default value is \"IfRequested\"."
 msgstr ""
-"Das Programm B<cups-driverd> sucht in den folgenden Verzeichnissen nach PPDs "
-"und Treiberinformationen:"
+"Legt die Verschlüsselungsstufe, die für einen bestimmten Ort benötigt wird, "
+"fest. Der Vorgabewert ist »IfRequested«."
 
-#. type: Plain text
-#: cupsd-helper.man:70
+#. type: TP
+#: cupsd.conf.5:740
 #, no-wrap
-msgid ""
-"    I</Library/Printers>\n"
-"    I</opt/share/ppd>\n"
-"    I</System/Library/Printers>\n"
-"    I</usr/local/share/ppd>\n"
-"    I</usr/share/cups/drv>\n"
-"    I</usr/share/cups/model>\n"
-"    I</usr/share/ppd>\n"
-msgstr ""
-"    I</Library/Printers>\n"
-"    I</opt/share/ppd>\n"
-"    I</System/Library/Printers>\n"
-"    I</usr/local/share/ppd>\n"
-"    I</usr/share/cups/drv>\n"
-"    I</usr/share/cups/model>\n"
-"    I</usr/share/ppd>\n"
+msgid "B<Order allow,deny>"
+msgstr "B<Order allow,deny>"
 
 #. type: Plain text
-#: cupsd-helper.man:77
+#: cupsd.conf.5:743
 msgid ""
-"PPD files can be compressed using the B<gzip>(1)  program or placed in "
-"compressed B<tar>(1)  archives to further reduce their size."
+"Specifies that access is denied by default. Allow lines are then processed "
+"followed by Deny lines to determine whether a client may access a particular "
+"resource."
 msgstr ""
-"PPD-Dateien können mit dem Programm B<gzip>(1) komprimiert oder innerhalb "
-"von komprimierten B<tar>(1)-Archiven abgelegt werden, um ihre Größe weiter "
-"zu reduzieren."
+"Legt fest, dass der Zugriff standardmäßig verweigert wird. »Allow«-Zeilen "
+"werden dann nach »Deny«-Zeilen verarbeitet, um zu bestimmen, ob ein Client "
+"auf eine bestimmte Ressource zugreifen darf."
+
+#. type: TP
+#: cupsd.conf.5:743
+#, no-wrap
+msgid "B<Order deny,allow>"
+msgstr "B<Order deny,allow>"
 
 #. type: Plain text
-#: cupsd-helper.man:80
+#: cupsd.conf.5:746
 msgid ""
-"Driver information files must conform to the format defined in "
-"B<ppdcfile>(5)."
+"Specifies that access is allowed by default. Deny lines are then processed "
+"followed by Allow lines to determine whether a client may access a "
+"particular resource."
 msgstr ""
-"Treiberinformationsdateien müssen dem in B<ppdcfile>(5) definierten Format "
-"folgen."
+"Legt fest, dass der Zugriff standardmäßig erlaubt wird. »Deny«-Zeilen werden "
+"dann nach »Allow«-Zeilen verarbeitet, um zu bestimmen, ob ein Client auf "
+"eine bestimmte Ressource zugreifen darf."
+
+#. type: TP
+#: cupsd.conf.5:746
+#, no-wrap
+msgid "B<Require group >I<group-name >[ I<group-name >... ]"
+msgstr "B<Require group >I<Gruppenname >[ I<Gruppenname >… ]"
 
 #. type: Plain text
-#: cupsd-helper.man:88
+#: cupsd.conf.5:749
 msgid ""
-"B<backend>(7), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), B<filter>(7), "
-"B<ppdcfile>(5), CUPS Online Help (http://localhost:631/help)"
+"Specifies that an authenticated user must be a member of one of the named "
+"groups."
 msgstr ""
-"B<backend>(7), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), B<filter>(7), "
-"B<ppdcfile>(5), CUPS-Online-Hilfe (http://localhost:631/help)"
+"Legt fest, dass ein authentifizierter Benutzer ein Mitglied einer der "
+"benannten Gruppen sein muss."
 
-#. type: TH
-#: cupsd-logs.man:13
+#. type: TP
+#: cupsd.conf.5:749
 #, no-wrap
-msgid "cupsd-logs"
-msgstr "cupsd-logs"
-
-#. type: TH
-#: cupsd-logs.man:13
-#, no-wrap
-msgid "8 November 2017"
-msgstr "8. November 2017"
-
-#. type: Plain text
-#: cupsd-logs.man:16
-msgid "cupsd-logs - cupsd log files (access_log, error_log, and page_log)"
-msgstr ""
-"cupsd-logs - Cupsd-Protokolldateien (access_log, error_log und page_log)"
-
-#. type: Plain text
-#: cupsd-logs.man:24
-msgid ""
-"B<cupsd>(8)  normally maintains three log files: I<access_log> to track "
-"requests that are submitted to the scheduler, I<error_log> to track progress "
-"and errors, and I<page_log> to track pages that are printed.  Configuration "
-"directives in B<cupsd.conf>(5)  and B<cups-files.conf>(5)  control what "
-"information is logged and where it is stored."
-msgstr ""
-"B<cupsd>(8) verwaltet normalerweise drei Protokolldateien: I<access_log>, um "
-"Anfragen, die an den Auftragsplaner eingereicht wurden, nachzuverfolgen, "
-"I<error_log>, um den Fortgang und Fehler nachzuverfolgen und I<page_log>, um "
-"gedruckte Seiten nachzuverfolgen. Konfigurationsdirektiven in B<cupsd."
-"conf>(5) und B<cups-files.conf>(5) regeln, welche Informationen "
-"protokolliert und wo sie gespeichert werden."
-
-#. type: SS
-#: cupsd-logs.man:24
-#, no-wrap
-msgid "ACCESS LOG FILE FORMAT"
-msgstr "ZUGRIFFSPROTOKOLL-DATEIFORMAT"
+msgid "B<Require user {>I<user-name>|B<@>I<group-name>} ..."
+msgstr "B<Require user {>I<Benutzername>|B<@>I<Gruppenname>} …"
 
 #. type: Plain text
-#: cupsd-logs.man:27
+#: cupsd.conf.5:757
 msgid ""
-"The I<access_log> file lists each HTTP resource that is accessed by a web "
-"browser or client.  Each line is in an extended version of the so-called "
-"\"Common Log Format\" used by many web servers and web reporting tools:"
+"Specifies that an authenticated user must match one of the named users or be "
+"a member of one of the named groups.  The group name \"@SYSTEM\" corresponds "
+"to the list of groups defined by the SystemGroup directive in the B<cups-"
+"files.conf>(5)  file.  The group name \"@OWNER\" corresponds to the owner of "
+"the resource, for example the person that submitted a print job.  Note: The "
+"'root' user is not special and must be granted privileges like any other "
+"user account."
 msgstr ""
-"Die Datei I<access_log> führt jede HTTP-Ressource auf, auf die durch einen "
-"Web-Browser oder -Client zugegriffen wird. Jede Zeile ist eine ausführliche "
-"Version des sogenannten »Common Log Format«, wie es von vielen Web-Servern "
-"und Web-Berichtswerkzeugen verwandt wird:"
+"Legt fest, dass ein authentifizierter Benutzer auf eine der benannten "
+"Benutzer passen oder ein Mitglied einer der benannten Gruppen sein muss. Der "
+"Gruppenname »@SYSTEM« entspricht der in der Direktive SystemGroup in der "
+"Datei B<cups-files.conf>(5) definierten Liste von Gruppen. Der Gruppenname "
+"»@OWNER« entspricht dem Eigentümer der Ressource, beispielsweise der Person, "
+"die den Auftrag eingereicht hat. Hinweis: Der Benutzer »root« wird nicht "
+"besonders behandelt und ihm müssen die Privilegien wie bei jedem anderen "
+"Benutzerkonto übertragen werden."
 
-#. type: Plain text
-#: cupsd-logs.man:31
+#. type: TP
+#: cupsd.conf.5:757
 #, no-wrap
-msgid ""
-"    I<host group user date-time >\"I<method resource version>\" I<status bytes\n"
-"      ipp-operation ipp-status>\n"
-msgstr ""
-"    I<Rechner Gruppe Benutzer Datum-Zeit >\"I<Methode Ressource Version>\" I<Status Bytes\n"
-"      Ipp-Vorgang Ipp-Status>\n"
+msgid "B<Require valid-user>"
+msgstr "B<Require valid-user>"
 
 #. type: Plain text
-#: cupsd-logs.man:34 cupsd-logs.man:129
-msgid "For example:"
-msgstr "Zum Beispiel:"
+#: cupsd.conf.5:760
+msgid "Specifies that any authenticated user is acceptable."
+msgstr "Legt fest, dass jeder authentifizierte Benutzer akzeptiert wird."
 
-#. type: Plain text
-#: cupsd-logs.man:47
+#. type: TP
+#: cupsd.conf.5:760
 #, no-wrap
-msgid ""
-"    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] \"POST / HTTP/1.1\" 200 317\n"
-"      CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes\n"
-"    localhost - - [01/Dec/2005:21:50:32 +0000] \"GET /admin HTTP/1.1\"\n"
-"      200 0 - -\n"
-"    localhost - - [01/Dec/2005:21:50:32 +0000] \"POST / HTTP/1.1\"\n"
-"      200 157 CUPS-Get-Printers\n"
-"      successful-ok-ignored-or-substituted-attributes\n"
-"    localhost - - [01/Dec/2005:21:50:32 +0000] \"POST / HTTP/1.1\"\n"
-"      200 1411 CUPS-Get-Devices -\n"
-"    localhost - - [01/Dec/2005:21:50:32 +0000] \"GET /admin HTTP/1.1\"\n"
-"      200 6667 - -\n"
-msgstr ""
-"    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] \"POST / HTTP/1.1\" 200 317\n"
-"      CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes\n"
-"    localhost - - [01/Dec/2005:21:50:32 +0000] \"GET /admin HTTP/1.1\"\n"
-"      200 0 - -\n"
-"    localhost - - [01/Dec/2005:21:50:32 +0000] \"POST / HTTP/1.1\"\n"
-"      200 157 CUPS-Get-Printers\n"
-"      successful-ok-ignored-or-substituted-attributes\n"
-"    localhost - - [01/Dec/2005:21:50:32 +0000] \"POST / HTTP/1.1\"\n"
-"      200 1411 CUPS-Get-Devices -\n"
-"    localhost - - [01/Dec/2005:21:50:32 +0000] \"GET /admin HTTP/1.1\"\n"
-"      200 6667 - -\n"
+msgid "B<Satisfy all>"
+msgstr "B<Satisfy all>"
 
 #. type: Plain text
-#: cupsd-logs.man:50
+#: cupsd.conf.5:763
 msgid ""
-"The I<host> field will normally only be an IP address unless you have "
-"enabled the HostNameLookups directive in the I<cupsd.conf> file or if the IP "
-"address corresponds to your local machine."
+"Specifies that all Allow, AuthType, Deny, Order, and Require conditions must "
+"be satisfied to allow access."
 msgstr ""
-"Das Feld I<Rechner> enthält normalerweise nur eine IP-Adresse, es sei denn, "
-"Sie haben die Direktive HostNameLookups in der Datei I<cupsd.conf> aktiviert "
-"oder die IP-Adresse entspricht Ihrem lokalen Rechner."
+"Legt fest, dass alle »Allow«-, »AuthType«-, »Deny«-, »Order«- und »Require«-"
+"Bedingungen erfüllt sein müssen, damit der Zugriff erlaubt wird."
 
-#. type: Plain text
-#: cupsd-logs.man:52
-msgid "The I<group> field always contains \"-\"."
-msgstr "Das Feld I<Gruppe> enthält immer »-«."
+#. type: TP
+#: cupsd.conf.5:763
+#, no-wrap
+msgid "B<Satisfy any>"
+msgstr "B<Satisfy any>"
 
 #. type: Plain text
-#: cupsd-logs.man:55
+#: cupsd.conf.5:767
 msgid ""
-"The I<user> field is the authenticated username of the requesting user.  If "
-"no username and password is supplied for the request then this field "
-"contains \"-\"."
+"Specifies that any a client may access a resource if either the "
+"authentication (AuthType/Require) or address (Allow/Deny/Order) conditions "
+"are satisfied.  For example, this can be used to require authentication only "
+"for remote accesses."
 msgstr ""
-"Das Feld I<Benutzer> enthält den authentifizierten Benutzernamen des "
-"anfragenden Benutzers. Falls kein Benutzername und Passwort für die Anfrage "
-"bereitgestellt wurde, enthält dieses Feld »-«."
+"Legt fest, dass jeder Client auf eine Ressource zugreifen darf, falls "
+"entweder die Authentifizierungs- (AuthType/Require) oder die Adress- (Allow/"
+"Deny/Order) Bedingung erfüllt ist. Beispielsweise kann dies dazu verwandt "
+"werden, Authentifizierung nur bei Zugriff aus der Ferne zu verlangen."
 
-#. type: Plain text
-#: cupsd-logs.man:57
-msgid ""
-"The I<date-time> field is the date and time of the request in local time and "
-"is in the format \"[DD/MON/YYYY:HH:MM:SS +ZZZZ]\"."
-msgstr ""
-"Das Feld I<Datum-Zeit> enthält das Datum und die Uhrzeit der Anfrage in "
-"lokaler Zeit und im Format »[TT/MON/JJJJ:HH:MM:SS +ZZZZ]«."
+#. type: SS
+#: cupsd.conf.5:767
+#, no-wrap
+msgid "DIRECTIVES VALID WITHIN POLICY SECTIONS"
+msgstr "DIREKTIVEN, DIE INNERHALB VON POLICY-ABSCHNITTEN GÜLTIG SIND"
 
 #. type: Plain text
-#: cupsd-logs.man:64
+#: cupsd.conf.5:769
 msgid ""
-"The I<method> field is the HTTP method used: \"GET\", \"HEAD\", \"OPTIONS\", "
-"\"POST\", or \"PUT\".  \"GET\" requests are used to get files from the "
-"server, both for the web interface and to get configuration and log files.  "
-"\"HEAD\" requests are used to get information about a resource prior to a "
-"\"GET\".  \"OPTIONS\" requests are used to upgrade connections to TLS "
-"encryption.  \"POST\" requests are used for web interface forms and IPP "
-"requests.  \"PUT\" requests are used to upload configuration files."
+"The following directives may be placed inside Policy sections in the B<cupsd."
+"conf> file:"
 msgstr ""
-"Das Feld I<Methode> enthält die verwandte HTTP-Methode: »GET«, »HEAD«, "
-"»OPTIONS«, »POST« oder PUT«. »GET«-Anfragen werden verwandt, um Dateien vom "
-"Server zu erhalten, sowohl für die Web-Schnittstelle als auch um die "
-"Konfigurations- und Protokolldateien zu erhalten. »HEAD«-Anfragen werden zum "
-"Erhalt von Informationen über eine Ressource vor einem »GET« verwandt. "
-"»OPTIONS«-Anfragen werden zum Hochstufen einer Anfrage auf TLS-"
-"Verschlüsselung verwandt. »POST«-Anfragen werden für Webformulare und IPP-"
-"Anfragen verwandt. »PUT«-Anfragen dienen dem Hochladen von "
-"Konfigurationsdateien."
+"Die folgenden Direktiven dürfen innerhalb von Policy-Abschnitten in der "
+"Datei B<cupsd.conf> gesetzt werden."
 
-#. type: Plain text
-#: cupsd-logs.man:66
-msgid "The I<resource> field is the filename of the requested resource."
-msgstr "Das Feld I<Ressource> ist der Dateiname der angefragten Ressource."
+#. type: TP
+#: cupsd.conf.5:769
+#, no-wrap
+msgid "B<JobPrivateAccess all>"
+msgstr "B<JobPrivateAccess all>"
 
-#. type: Plain text
-#: cupsd-logs.man:69
-msgid ""
-"The I<version> field is the HTTP specification version used by the client.  "
-"For CUPS clients this will always be \"HTTP/1.1\"."
-msgstr ""
-"Das Feld I<Version> ist die vom Client verwandte HTTP-Spezifikationsversion. "
-"Für CUPS-Clients wird sie stets »HTTP/1.1« sein."
+#. type: TP
+#: cupsd.conf.5:771
+#, no-wrap
+msgid "B<JobPrivateAccess default>"
+msgstr "B<JobPrivateAccess default>"
+
+#. type: TP
+#: cupsd.conf.5:773
+#, no-wrap
+msgid "B<JobPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
+msgstr "B<JobPrivateAccess >{I<Benutzer>|B<@>I<Gruppe>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} …"
 
 #. type: Plain text
-#: cupsd-logs.man:71
+#: cupsd.conf.5:782
 msgid ""
-"The I<status> field contains the HTTP result status of the request, as "
-"follows:"
+"Specifies an access list for a job's private values.  The \"default\" access "
+"list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's requesting-user-"
+"name-allowed or requesting-user-name-denied values.  \"@OWNER\" maps to the "
+"job's owner.  \"@SYSTEM\" maps to the groups listed for the SystemGroup "
+"directive in the B<cups-files.conf>(5)  file."
 msgstr ""
-"Das Feld I<Status> enthält den HTTP-Ergebnisstatus der Anfrage, wie folgt:"
+"Legt eine Zugriffsliste für die privaten Werte eines Auftrags fest. Die "
+"»Standard«- (default) Zugriffsliste ist »@OWNER @SYSTEM«. »@ACL« passt auf "
+"die Werte requesting-user-name-allowed oder requesting-user-name-denied des "
+"Druckers. »@OWNER« passt auf den Eigentümer des Auftrags. »@SYSTEM« passt "
+"auf die in der Direktive SystemGroup in der Datei B<cups-files.conf>(5) "
+"aufgeführten Gruppen."
 
 #. type: TP
-#: cupsd-logs.man:72
+#: cupsd.conf.5:782
 #, no-wrap
-msgid "200"
-msgstr "200"
-
-#. type: Plain text
-#: cupsd-logs.man:75
-msgid "Successful operation."
-msgstr "Vorgang erfolgreich"
+msgid "B<JobPrivateValues all>"
+msgstr "B<JobPrivateValues all>"
 
 #. type: TP
-#: cupsd-logs.man:75
+#: cupsd.conf.5:784
 #, no-wrap
-msgid "201"
-msgstr "201"
-
-#. type: Plain text
-#: cupsd-logs.man:78
-msgid "File created/modified successfully."
-msgstr "Datei erfolgreich erstellt/verändert"
+msgid "B<JobPrivateValues default>"
+msgstr "B<JobPrivateValues default>"
 
 #. type: TP
-#: cupsd-logs.man:78
+#: cupsd.conf.5:786
 #, no-wrap
-msgid "304"
-msgstr "304"
-
-#. type: Plain text
-#: cupsd-logs.man:81
-msgid "The requested file has not changed."
-msgstr "Die angeforderte Datei hat sich nicht geändert."
+msgid "B<JobPrivateValues none>"
+msgstr "B<JobPrivateValues none>"
 
 #. type: TP
-#: cupsd-logs.man:81
+#: cupsd.conf.5:788
 #, no-wrap
-msgid "400"
-msgstr "400"
+msgid "B<JobPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
+msgstr "B<JobPrivateValues >I<Attributename >[ … I<Attributname >]"
 
 #. type: Plain text
-#: cupsd-logs.man:84
+#: cupsd.conf.5:792
 msgid ""
-"Bad HTTP request; typically this means that you have a malicious program "
-"trying to access your server."
+"Specifies the list of job values to make private.  The \"default\" values "
+"are \"job-name\", \"job-originating-host-name\", \"job-originating-user-name"
+"\", and \"phone\"."
 msgstr ""
-"Fehlerhafte HTTP-Anfrage. Typischerweise bedeutet dies, dass ein "
-"Schadprogramm einen Zugriff auf Ihren Server versucht."
+"Legt die Liste der Auftragswerte, die privat werden sollen, fest. Die "
+"»Standard«- (default) Werte sind »job-name«, »job-originating-host-name«, "
+"»job-originating-user-name« und »phone«."
 
 #. type: TP
-#: cupsd-logs.man:84
+#: cupsd.conf.5:792
 #, no-wrap
-msgid "401"
-msgstr "401"
-
-#. type: Plain text
-#: cupsd-logs.man:87
-msgid "Unauthorized, authentication (username + password) is required."
-msgstr ""
-"Unauthorisiert, Authentifizierung (Benutzername + Passwort) wird benötigt."
+msgid "B<SubscriptionPrivateAccess all>"
+msgstr "B<SubscriptionPrivateAccess all>"
 
 #. type: TP
-#: cupsd-logs.man:87
+#: cupsd.conf.5:794
 #, no-wrap
-msgid "403"
-msgstr "403"
-
-#. type: Plain text
-#: cupsd-logs.man:90
-msgid ""
-"Access is forbidden; typically this means that a client tried to access a "
-"file or resource they do not have permission to access."
-msgstr ""
-"Zugriff verboten; typischerweise bedeutet dies, dass ein Client versucht, "
-"auf eine Datei oder Ressource zuzugreifen, für den sie keine Zugriffsrechte "
-"hat."
+msgid "B<SubscriptionPrivateAccess default>"
+msgstr "B<SubscriptionPrivateAccess default>"
 
 #. type: TP
-#: cupsd-logs.man:90
+#: cupsd.conf.5:796
 #, no-wrap
-msgid "404"
-msgstr "404"
+msgid "B<SubscriptionPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
+msgstr "B<SubscriptionPrivateAccess >{I<Benutzer>|B<@>I<Gruppe>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} …"
 
 #. type: Plain text
-#: cupsd-logs.man:93
-msgid "The file or resource does not exist."
-msgstr "Die Datei oder Ressource existiert nicht."
+#: cupsd.conf.5:805
+msgid ""
+"Specifies an access list for a subscription's private values.  The \"default"
+"\" access list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's "
+"requesting-user-name-allowed or requesting-user-name-denied values.  \"@OWNER"
+"\" maps to the job's owner.  \"@SYSTEM\" maps to the groups listed for the "
+"SystemGroup directive in the B<cups-files.conf>(5)  file."
+msgstr ""
+"Legt eine Zugriffsliste für die privaten Werte eines Abonnements fest. Die "
+"»Standard«- (default) Zugriffsliste ist »@OWNER @SYSTEM«. »@ACL« passt auf "
+"die Werte requesting-user-name-allowed oder requesting-user-name-denied des "
+"Druckers. »@OWNER« passt auf den Eigentümer des Auftrags. »@SYSTEM« passt "
+"auf die in der Direktive SystemGroup in der Datei B<cups-files.conf>(5) "
+"aufgeführten Gruppen."
 
 #. type: TP
-#: cupsd-logs.man:93
+#: cupsd.conf.5:805
 #, no-wrap
-msgid "405"
-msgstr "405"
+msgid "B<SubscriptionPrivateValues all>"
+msgstr "B<SubscriptionPrivateValues all>"
 
-#. type: Plain text
-#: cupsd-logs.man:96
-msgid ""
-"URL access method is not allowed; typically this means you have a web "
-"browser using your server as a proxy."
-msgstr ""
-"URL-Zugriffsmethode ist nicht erlaubt. Typischerweise bedeutet dies, dass "
-"ein Web-Browser Ihren Server als Proxy verwendet."
+#. type: TP
+#: cupsd.conf.5:807
+#, no-wrap
+msgid "B<SubscriptionPrivateValues default>"
+msgstr "B<SubscriptionPrivateValues default>"
 
 #. type: TP
-#: cupsd-logs.man:96
+#: cupsd.conf.5:809
 #, no-wrap
-msgid "413"
-msgstr "413"
+msgid "B<SubscriptionPrivateValues none>"
+msgstr "B<SubscriptionPrivateValues none>"
+
+#. type: TP
+#: cupsd.conf.5:811
+#, no-wrap
+msgid "B<SubscriptionPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
+msgstr "B<SubscriptionPrivateValues >I<Attributname >[ … I<Attributname >]"
 
 #. type: Plain text
-#: cupsd-logs.man:99
+#: cupsd.conf.5:815
 msgid ""
-"Request too large; typically this means that a client tried to print a file "
-"larger than the MaxRequestSize allows."
+"Specifies the list of subscription values to make private.  The \"default\" "
+"values are \"notify-events\", \"notify-pull-method\", \"notify-recipient-uri"
+"\", \"notify-subscriber-user-name\", and \"notify-user-data\"."
 msgstr ""
-"Anfrage zu groß. Typischerweise bedeutet dies, dass ein Client versuchte, "
-"eine Datei zu drucken, die größer ist als MaxRequestSize erlaubt."
+"Legt die Liste der Abonnementswerte, die privat werden sollen, fest. Die "
+"»Standard«- (default) Werte sind »notify-events«, »notify-pull-method«, "
+"»notify-recipient-uri«, »notify-subscriber-user-name« und »notify-user-data«."
 
-#. type: TP
-#: cupsd-logs.man:99
+#. type: SS
+#: cupsd.conf.5:815 cups-files.conf.5:230
 #, no-wrap
-msgid "426"
-msgstr "426"
+msgid "DEPRECATED DIRECTIVES"
+msgstr "VERALTETE DIREKTIVEN"
 
+#. #Classification
 #. type: Plain text
-#: cupsd-logs.man:102
-msgid "Upgrading to TLS-encrypted connection."
-msgstr "Hochstufen auf TLS-verschlüsselte Verbindung"
+#: cupsd.conf.5:818
+msgid ""
+"The following directives are deprecated and will be removed in a future "
+"release of CUPS:"
+msgstr ""
+"I<Die nachfolgenden Direktiven sind veraltet und werden in einer zukünftigen "
+"Veröffentlichung von CUPS entfernt werden>:"
 
 #. type: TP
-#: cupsd-logs.man:102
+#: cupsd.conf.5:818
 #, no-wrap
-msgid "500"
-msgstr "500"
+msgid "B<Classification >I<banner>"
+msgstr "B<Classification >I<Deckblatt>"
 
+#. #ClassifyOverride
 #. type: Plain text
-#: cupsd-logs.man:105
+#: cupsd.conf.5:825
 msgid ""
-"Server error; typically this happens when the server is unable to open/"
-"create a file - consult the error_log file for details."
+"Specifies the security classification of the server.  Any valid banner name "
+"can be used, including \"classified\", \"confidential\", \"secret\", "
+"\"topsecret\", and \"unclassified\", or the banner can be omitted to disable "
+"secure printing functions.  The default is no classification banner."
 msgstr ""
-"Server-Fehler. Typischerweise passiert dies, wenn der Server nicht in der "
-"Lage ist, eine Datei zu öffnen/zu erstellen. Schauen Sie in der Datei "
-"error_log für weitere Details."
+"Legt die Sicherheitsklassifizierung des Servers fest. Jeder gültige "
+"Deckblattname kann verwandt werden, darunter »classified«, »confidential«, "
+"»secret«, »topsecret« und »unclassified«. Der Deckblattname kann auch "
+"entfallen, um die sicheren Druckfunktionen zu deaktivieren. Standardmäßig "
+"gibt es kein Einstufungsdeckblatt."
 
 #. type: TP
-#: cupsd-logs.man:105
+#: cupsd.conf.5:825
 #, no-wrap
-msgid "501"
-msgstr "501"
+msgid "B<ClassifyOverride Yes>"
+msgstr "B<ClassifyOverride Yes>"
+
+#. type: TP
+#: cupsd.conf.5:827
+#, no-wrap
+msgid "B<ClassifyOverride No>"
+msgstr "B<ClassifyOverride No>"
 
+#. #PageLogFormat
 #. type: Plain text
-#: cupsd-logs.man:108
+#: cupsd.conf.5:833
 msgid ""
-"The client requested encryption but encryption support is not enabled/"
-"compiled in."
+"Specifies whether users may override the classification (cover page) of "
+"individual print jobs using the \"job-sheets\" option.  The default is \"No"
+"\"."
 msgstr ""
-"Der Client erbat Verschlüsselung aber die Unterstützung dafür ist nicht "
-"aktiviert/einkompiliert."
+"Legt fest, ob es Benutzern erlaubt werden soll, die Einstufung (Titelseite) "
+"individueller Druckaufträge mit der Option »job-sheets« zu ändern. Die "
+"Vorgabe ist »No«."
 
 #. type: TP
-#: cupsd-logs.man:108
+#: cupsd.conf.5:833
 #, no-wrap
-msgid "505"
-msgstr "505"
+msgid "B<PageLogFormat >I<format-string>"
+msgstr "B<PageLogFormat >I<Formatzeichenkette>"
 
 #. type: Plain text
-#: cupsd-logs.man:111
+#: cupsd.conf.5:838
 msgid ""
-"HTTP version number not supported; typically this means that you have a "
-"malicious program trying to access your server."
+"Specifies the format of PageLog lines.  Sequences beginning with percent (%) "
+"characters are replaced with the corresponding information, while all other "
+"characters are copied literally.  The following percent sequences are "
+"recognized:"
 msgstr ""
-"HTTP-Versionsnummer wird nicht unterstützt. Typischerweise bedeutet dies, "
-"dass ein Schadprogramm versucht, auf Ihren Server zuzugreifen."
+"Legt das Format der PageLog-Zeilen fest. Sequenzen beginnen mit einem "
+"Prozentzeichen (%) und werden durch die entsprechende Information ersetzt, "
+"während alle anderen Zeichen unverändert kopiert werden. Die folgenden "
+"Prozentsequenzen werden erkannt:"
 
 #. type: Plain text
-#: cupsd-logs.man:115
+#: cupsd.conf.5:848
+#, no-wrap
 msgid ""
-"The I<bytes> field contains the number of bytes in the request.  For POST "
-"requests the bytes field contains the number of bytes of non-IPP data that "
-"is received from the client."
+"    \"%%\" inserts a single percent character.\n"
+"    \"%{name}\" inserts the value of the specified IPP attribute.\n"
+"    \"%C\" inserts the number of copies for the current page.\n"
+"    \"%P\" inserts the current page number.\n"
+"    \"%T\" inserts the current date and time in common log format.\n"
+"    \"%j\" inserts the job ID.\n"
+"    \"%p\" inserts the printer name.\n"
+"    \"%u\" inserts the username.\n"
 msgstr ""
-"Das Feld I<Bytes> enthält die Anzahl an Bytes in der Anfrage. Für POST-"
-"Anfragen enthält das Feld Bytes die Anzahl von Bytes in nicht IPP-Daten, die "
-"vom Client empfangen wurden."
+"    \"%%\" fügt ein einzelnes Prozentzeichen ein.\n"
+"    \"%{name}\" fügt den Wert des angegebenen IPP-Attributs ein.\n"
+"    \"%C\" fügt die Anzahl der Kopien für die aktuelle Seite ein.\n"
+"    \"%P\" fügt die aktuelle Seitenzahl ein.\n"
+"    \"%T\" fügt das aktuelle Datum und die aktuelle Zeit im »common log format« ein.\n"
+"    \"%j\" fügt die Auftrags-ID ein.\n"
+"    \"%p\" fügt den Druckernamen ein.\n"
+"    \"%u\" fügt den Benutzernamen ein.\n"
 
+#. #RIPCache
 #. type: Plain text
-#: cupsd-logs.man:117
+#: cupsd.conf.5:854
+#, fuzzy
 msgid ""
-"The I<ipp-operation> field contains either \"-\" for non-IPP requests or the "
-"IPP operation name for POST requests containing an IPP request."
+"The default is the empty string, which disables page logging.  The string "
+"\"%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} "
+"%{media} %{sides}\" creates a page log with the standard items.  Use \"%{job-"
+"impressions-completed}\" to insert the number of pages (sides) that were "
+"printed, or \"%{job-media-sheets-completed}\" to insert the number of sheets "
+"that were printed."
 msgstr ""
-"Das Feld I<Ipp-Vorgang> enthält entweder »-« für nicht IPP-Anfragen oder den "
-"IPP-Vorgangsnamen für POST-Anfragen, die eine IPP-Anfrage enthalten."
+"Die Vorgabe ist die leere Zeichenkette, womit das Protokollieren der Seiten "
+"deaktiviert wird. Die Zeichenkette »%p %u %j %T %P %C %{job-billing} %{job-"
+"originating-host-name} %{job-name} %{media} %{sides}« erstellt ein "
+"Seitenprotokoll mit den Standardeinträgen."
+
+#. type: TP
+#: cupsd.conf.5:854
+#, no-wrap
+msgid "B<RIPCache >I<size>"
+msgstr "B<RIPCache >I<Größe>"
 
 #. type: Plain text
-#: cupsd-logs.man:119
+#: cupsd.conf.5:858
 msgid ""
-"The I<ipp-status> field contains either \"-\" for non-IPP requests or the "
-"IPP status code name for POST requests containing an IPP response."
+"Specifies the maximum amount of memory to use when converting documents into "
+"bitmaps for a printer.  The default is \"128m\"."
 msgstr ""
-"Das Feld I<Ipp-Status> enthält entweder »-« für nicht IPP-Anfragen oder den "
-"IPP-Status-Codenamen für POST-Anfragen, die eine IPP-Antwort enthalten."
-
-#. type: SS
-#: cupsd-logs.man:119
-#, no-wrap
-msgid "ERROR LOG FILE FORMAT"
-msgstr "FEHLERPROTOKOLL-DATEIFORMAT"
+"Legt die maximale Menge an zu verwendendem Speicher beim Konvertieren von "
+"Dokumenten in Bitmaps für den Drucker fest. Die Vorgabe ist »128m«."
 
 #. type: Plain text
-#: cupsd-logs.man:123
+#: cupsd.conf.5:862
+#, fuzzy
 msgid ""
-"The I<error_log> file lists messages from the scheduler - errors, warnings, "
-"etc. The LogLevel directive in the B<cupsd.conf>(5)  file controls which "
-"messages are logged:"
+"File, directory, and user configuration directives that used to be allowed "
+"in the B<cupsd.conf> file are now stored in the B<cups-files.conf>(5)  file "
+"instead in order to prevent certain types of privilege escalation attacks."
 msgstr ""
-"Die Datei I<error_log> listet Nachrichten vom Auftragsplaner auf - Fehler, "
-"Warnungen usw. Die Direktive LogLevel in der Datei B<cupsd.conf>(5) steuert, "
-"welche Nachrichten protokolliert werden:"
+"Die Datei I<cupsd.conf> konfiguriert den CUPS-Auftragsplaner (Scheduler), "
+"B<cupsd>(8). Sie befindet sich normalerweise in dem Verzeichnis I</etc/"
+"cups>. B<Hinweis:> Datei-, Verzeichnis- und "
+"Benutzerkonfigurationsdirektiven, die früher in der Datei B<cupsd.conf> "
+"erlaubt wurden, werden jetzt stattdessen in der Datei B<cups-files.conf>(5) "
+"gespeichert, um bestimmte Arten von Angriffen zur Rechteerweiterung zu "
+"vermeiden."
 
 #. type: Plain text
-#: cupsd-logs.man:126
-#, no-wrap
-msgid "    level date-time message\n"
-msgstr "    Stufe Datum-Uhrzeit Nachricht\n"
+#: cupsd.conf.5:869
+msgid ""
+"The scheduler MUST be restarted manually after making changes to the B<cupsd."
+"conf> file.  On Linux this is typically done using the B<systemctl>(8)  "
+"command, while on macOS the B<launchctl>(8)  command is used instead."
+msgstr ""
 
 #. type: Plain text
-#: cupsd-logs.man:143
-#, no-wrap
+#: cupsd.conf.5:873
 msgid ""
-"    I [20/May/1999:19:18:28 +0000] [Job 1] Queued on 'DeskJet' by 'mike'.\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[0]=\"DeskJet\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[1]=\"1\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[2]=\"mike\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[3]=\"myjob\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[4]=\"1\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[5]=\"media=\n"
-"      na_letter_8.5x11in sides=one-sided\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[6]=\"/var/spool/cups/\n"
-"      d000001-001\"\n"
-"    I [20/May/1999:19:21:02 +0000] [Job 2] Queued on 'DeskJet' by 'mike'.\n"
-"    I [20/May/1999:19:22:24 +0000] [Job 2] Canceled by 'mike'.\n"
+"The @LOCAL macro name can be confusing since the system running B<cupsd> "
+"often belongs to a different set of subnets from its clients."
 msgstr ""
-"    I [20/May/1999:19:18:28 +0000] [Job 1] Queued on 'DeskJet' by 'mike'.\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[0]=\"DeskJet\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[1]=\"1\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[2]=\"mike\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[3]=\"myjob\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[4]=\"1\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[5]=\"media=\n"
-"      na_letter_8.5x11in sides=one-sided\"\n"
-"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[6]=\"/var/spool/cups/\n"
-"      d000001-001\"\n"
-"    I [20/May/1999:19:21:02 +0000] [Job 2] Queued on 'DeskJet' by 'mike'.\n"
-"    I [20/May/1999:19:22:24 +0000] [Job 2] Canceled by 'mike'.\n"
 
 #. type: Plain text
-#: cupsd-logs.man:146
-msgid "The I<level> field contains the type of message:"
-msgstr "Das Feld I<Stufe> enthält den Typ der Nachricht:"
-
-#. type: TP
-#: cupsd-logs.man:146
-#, no-wrap
-msgid "A"
-msgstr "A"
+#: cupsd.conf.5:875
+msgid ""
+"The B<cupsd.conf> file format is based on the Apache HTTP Server "
+"configuration file format."
+msgstr ""
+"Das Dateiformat der B<cupsd.conf> basiert auf dem Apache-HTTP-Server-"
+"Konfigurationsdateiformat."
 
 #. type: Plain text
-#: cupsd-logs.man:149
-msgid "Alert message (LogLevel alert)"
-msgstr "Warnungsnachricht (LogLevel alert)"
-
-#. type: TP
-#: cupsd-logs.man:149
-#, no-wrap
-msgid "C"
-msgstr "C"
+#: cupsd.conf.5:877
+msgid "Log everything with a maximum log file size of 32 megabytes:"
+msgstr ""
+"Alles protokollieren, mit einer maximalen Protokolldateigröße von 32 "
+"Megabytes:"
 
 #. type: Plain text
-#: cupsd-logs.man:152
-msgid "Critical error message (LogLevel crit)"
-msgstr "Kritische Fehlernachricht (LogLevel crit)"
-
-#. type: TP
-#: cupsd-logs.man:152
+#: cupsd.conf.5:882
 #, no-wrap
-msgid "D"
-msgstr "D"
+msgid ""
+"    AccessLogLevel all\n"
+"    LogLevel debug2\n"
+"    MaxLogSize 32m\n"
+msgstr ""
+"    AccessLogLevel all\n"
+"    LogLevel debug2\n"
+"    MaxLogSize 32m\n"
 
 #. type: Plain text
-#: cupsd-logs.man:155
-msgid "Debugging message (LogLevel debug)"
-msgstr "Fehlersuchnachricht (LogLevel debug)"
-
-#. type: TP
-#: cupsd-logs.man:155
-#, no-wrap
-msgid "d"
-msgstr "d"
+#: cupsd.conf.5:885
+msgid "Require authentication for accesses from outside the 10. network:"
+msgstr "Authentifizierung für Zugriffe außerhalb des 10er-Netzes verlangen:"
 
 #. type: Plain text
-#: cupsd-logs.man:158
-msgid "Detailed debugging message (LogLevel debug2)"
-msgstr "Detaillierte Fehlersuchnachricht (LogLevel debug2)"
-
-#. type: TP
-#: cupsd-logs.man:158
+#: cupsd.conf.5:894
 #, no-wrap
-msgid "E"
-msgstr "E"
+msgid ""
+"    E<lt>Location /E<gt>\n"
+"    Order allow,deny\n"
+"    Allow from 10./8\n"
+"    AuthType Basic\n"
+"    Require valid-user\n"
+"    Satisfy any\n"
+"    E<lt>/LocationE<gt>\n"
+msgstr ""
+"    E<lt>Location /E<gt>\n"
+"    Order allow,deny\n"
+"    Allow from 10./8\n"
+"    AuthType Basic\n"
+"    Require valid-user\n"
+"    Satisfy any\n"
+"    E<lt>/LocationE<gt>\n"
 
 #. type: Plain text
-#: cupsd-logs.man:161
-msgid "Normal error message (LogLevel error)"
-msgstr "Normale Fehlernachricht (LogLevel error)"
+#: cupsd.conf.5:904
+msgid ""
+"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<mime.convs>(5), "
+"B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), CUPS Online "
+"Help (http://localhost:631/help)"
+msgstr ""
+"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<mime.convs>(5), "
+"B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), CUPS-Online-"
+"Hilfe (http://localhost:631/help)"
 
-#. type: TP
-#: cupsd-logs.man:161
+#. type: TH
+#: cupsd-helper.8:10
 #, no-wrap
-msgid "I"
-msgstr "I"
+msgid "cupsd-helper"
+msgstr "cupsd-helper"
 
 #. type: Plain text
-#: cupsd-logs.man:164
-msgid "Informational message (LogLevel info)"
-msgstr "Informative Nachricht (LogLevel info)"
-
-#. type: TP
-#: cupsd-logs.man:164
-#, no-wrap
-msgid "N"
-msgstr "N"
+#: cupsd-helper.8:13
+#, fuzzy
+msgid "cupsd-helper - cupsd helper programs (deprecated)"
+msgstr "cupsd-helper - cupsd-Helferprogramme"
 
 #. type: Plain text
-#: cupsd-logs.man:167
-msgid "Notice message (LogLevel notice)"
-msgstr "Hinweisnachricht (LogLevel notice)"
-
-#. type: TP
-#: cupsd-logs.man:167
-#, no-wrap
-msgid "W"
-msgstr "W"
+#: cupsd-helper.8:19
+msgid "B<cups-deviced> I<request-id> I<limit> I<user-id> I<options>"
+msgstr "B<cups-deviced> I<Anfrage-ID> I<Begrenzung> I<Benutzer-ID> I<Optionen>"
 
 #. type: Plain text
-#: cupsd-logs.man:170
-msgid "Warning message (LogLevel warn)"
-msgstr "Warnungsnachricht (LogLevel warn)"
-
-#. type: TP
-#: cupsd-logs.man:170
-#, no-wrap
-msgid "X"
-msgstr "X"
+#: cupsd-helper.8:23
+msgid "B<cups-driverd> B<cat> I<ppd-name>"
+msgstr "B<cups-driverd> B<cat> I<PPD-Name>"
 
 #. type: Plain text
-#: cupsd-logs.man:173
-msgid "Emergency error message (LogLevel emerg)"
-msgstr "Notfallfehlernachricht (LogLevel emerg)"
+#: cupsd-helper.8:29
+msgid "B<cups-driverd> B<list> I<request_id> I<limit> I<options>"
+msgstr "B<cups-driverd> B<list> I<Anfrage-ID> I<Begrenzung> I<Optionen>"
 
 #. type: Plain text
-#: cupsd-logs.man:175
+#: cupsd-helper.8:46
 msgid ""
-"The I<date-time> field contains the date and time of when the page started "
-"printing. The format of this field is identical to the data-time field in "
-"the I<access_log> file."
+"B<cups-exec> I<sandbox-profile> [ I<-g> I<group-id> ] [ I<-n> I<nice-"
+"value> ] [ I<-u> I<user-id> ] I</path/to/program> I<argv0> I<...> I<argvN>"
 msgstr ""
-"Das Feld I<Datum-Zeit> enthält das Datum und die Uhrzeit vom Beginn des "
-"Drucks. Das Format dieses Feldes ist identisch zu dem Datum-Uhrzeit-Feld in "
-"der Datei I<access_log>."
+"B<cups-exec> I<Sandbox-Profil> [ I<-g> I<Gruppen-ID> ] [ I<-n> I<nice-"
+"Wert> ] [ I<-u> I<Benutzer-ID> ] I</Pfad/zu/Programm> I<argv0> I<…> I<argvN>"
 
 #. type: Plain text
-#: cupsd-logs.man:178
+#: cupsd-helper.8:52
 msgid ""
-"The I<message> field contains a free-form textual message.  Messages from "
-"job filters are prefixed with \"[Job NNN]\" where \"NNN\" is the job ID."
+"The B<cupsd-helper> programs perform long-running operations on behalf of "
+"the scheduler, B<cupsd>(8).  The B<cups-deviced> helper program runs each "
+"CUPS B<backend>(7)  with no arguments in order to discover the available "
+"printers."
 msgstr ""
-"Das Feld I<Nachricht> enthält eine formlose Textnachricht. Nachrichten von "
-"Auftragsfiltern haben den Präfix »[Job NNN]«, wobei »NNN« die Auftrags-ID "
-"ist."
-
-#. type: SS
-#: cupsd-logs.man:178
-#, no-wrap
-msgid "PAGE LOG FILE FORMAT"
-msgstr "SEITENPROTOKOLL-DATEIFORMAT"
+"Die Programme B<cupsd-helper> führen langlaufende Vorgänge im Auftrag des "
+"Auftragsplaners, B<cupsd>(8), durch. Das Helferprogramm B<cups-deviced> "
+"führt jedes CUPS-B<backend>(7) ohne Argumente aus, um verfügbare Drucker zu "
+"entdecken."
 
 #. type: Plain text
-#: cupsd-logs.man:181
+#: cupsd-helper.8:54
 msgid ""
-"The I<page_log> file lists the total number of pages (sheets) that are "
-"printed.  By default, each line contains the following information:"
+"The B<cups-driverd> helper program lists all available printer drivers, a "
+"subset of \"matching\" printer drivers, or a copy of a specific driver PPD "
+"file."
 msgstr ""
-"Die Datei I<page_log> listet die Gesamtzahl an gedruckten Seiten (Blättern) "
-"auf. Standardmäßig enthält jede Zeile die folgenden Informationen:"
+"Das Helferprogramm B<cups-driverd> listet alle verfügbaren Druckertreiber "
+"auf, eine Teilmenge, die auf Druckertreiber »passt« oder eine Kopie einer "
+"bestimmten PPD-Treiberdatei."
 
 #. type: Plain text
-#: cupsd-logs.man:185
-#, no-wrap
+#: cupsd-helper.8:56
 msgid ""
-"    I<printer user job-id date-time >B<total >I<num-sheets job-billing\n"
-"      job-originating-host-name job-name media sides>\n"
+"The B<cups-exec> helper program runs backends, filters, and other programs. "
+"On macOS these programs are run in a secure sandbox."
 msgstr ""
-"    I<Drucker Benutzer Auftrags-ID Datum-Uhrzeit >B<total >I<Anzahl-Blätter\n"
-"      Auftrags-Abrechnung Auftrags-erstellender-Rechnername Auftragsname Medium Seiten>\n"
+"Das Helferprogramm B<cups-exec> führt Backends, Filter und andere Programme "
+"aus. Unter macOS laufen diese Programme in einer sicheren Sandbox."
 
 #. type: Plain text
-#: cupsd-logs.man:188
+#: cupsd-helper.8:58
 msgid ""
-"For example the entry for a two page job called \"myjob\" might look like:"
+"The B<cups-driverd> program looks for PPD and driver information files in "
+"the following directories:"
 msgstr ""
-"Beispielsweise könnte der Eintrag für einen zweiseitigen Auftrag namens "
-"»meinAuftrag« wie folgt aussehen:"
+"Das Programm B<cups-driverd> sucht in den folgenden Verzeichnissen nach PPDs "
+"und Treiberinformationen:"
 
 #. type: Plain text
-#: cupsd-logs.man:192
+#: cupsd-helper.8:67
 #, no-wrap
 msgid ""
-"    DeskJet root 1 [20/May/1999:19:21:06 +0000] total 2 acme-123\n"
-"      localhost myjob na_letter_8.5x11in one-sided\n"
+"    I</Library/Printers>\n"
+"    I</opt/share/ppd>\n"
+"    I</System/Library/Printers>\n"
+"    I</usr/local/share/ppd>\n"
+"    I</usr/share/cups/drv>\n"
+"    I</usr/share/cups/model>\n"
+"    I</usr/share/ppd>\n"
 msgstr ""
-"    DeskJet root 1 [20/May/1999:19:21:06 +0000] total 2 acme-123\n"
-"      localhost meinAuftrag na_letter_8.5x11in one-sided\n"
+"    I</Library/Printers>\n"
+"    I</opt/share/ppd>\n"
+"    I</System/Library/Printers>\n"
+"    I</usr/local/share/ppd>\n"
+"    I</usr/share/cups/drv>\n"
+"    I</usr/share/cups/model>\n"
+"    I</usr/share/ppd>\n"
 
 #. type: Plain text
-#: cupsd-logs.man:197
+#: cupsd-helper.8:74
 msgid ""
-"The PageLogFormat directive in the B<cupsd.conf>(5)  file can be used to "
-"change this information."
+"PPD files can be compressed using the B<gzip>(1)  program or placed in "
+"compressed B<tar>(1)  archives to further reduce their size."
 msgstr ""
-"Die Direktive PageLogFormat in der Datei B<cupsd.conf>(5) kann zum Ändern "
-"der Information verwandt werden."
+"PPD-Dateien können mit dem Programm B<gzip>(1) komprimiert oder innerhalb "
+"von komprimierten B<tar>(1)-Archiven abgelegt werden, um ihre Größe weiter "
+"zu reduzieren."
 
 #. type: Plain text
-#: cupsd-logs.man:200
+#: cupsd-helper.8:77
 msgid ""
-"The I<printer> field contains the name of the printer that printed the "
-"page.  If you send a job to a printer class, this field will contain the "
-"name of the printer that was assigned the job."
+"Driver information files must conform to the format defined in "
+"B<ppdcfile>(5)."
 msgstr ""
-"Das Feld I<Drucker> enthält den Namen des Druckers, der die Seite gedruckt "
-"hat. Falls Sie einen Auftrag an eine Druckerklasse gesendet haben, wird "
-"dieses Feld den Namen des Druckers enthalten, dem dieser Auftrag zugewiesen "
-"wurde."
+"Treiberinformationsdateien müssen dem in B<ppdcfile>(5) definierten Format "
+"folgen."
 
 #. type: Plain text
-#: cupsd-logs.man:202
+#: cupsd-helper.8:89
 msgid ""
-"The I<user> field contains the name of the user (the IPP requesting-user-"
-"name attribute) that submitted this file for printing."
+"B<backend>(7), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), B<filter>(7), "
+"B<ppdcfile>(5), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
-"Das Feld I<Benutzer> enthält den Namen des Benutzers (des IPP-Attributs "
-"requesting-user-name), der diesen Auftrag zum Druck eingereicht hat."
+"B<backend>(7), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), B<filter>(7), "
+"B<ppdcfile>(5), CUPS-Online-Hilfe (http://localhost:631/help)"
 
-#. type: Plain text
-#: cupsd-logs.man:204
-msgid "The I<job-id> field contains the job number of the page being printed."
-msgstr ""
-"Das Feld I<Auftrags-ID> enthält die Auftragsnummer der im Druck befindlichen "
-"Seite."
+#. type: TH
+#: cupsd-logs.5:10
+#, no-wrap
+msgid "cupsd-logs"
+msgstr "cupsd-logs"
 
 #. type: Plain text
-#: cupsd-logs.man:207
-msgid ""
-"The I<date-time> field contains the date and time of when the page started "
-"printing.  The format of this field is identical to the data-time field in "
-"the I<access_log> file."
+#: cupsd-logs.5:13
+msgid "cupsd-logs - cupsd log files (access_log, error_log, and page_log)"
 msgstr ""
-"Das Feld I<Datum-Uhrzeit> enthält das Datum und die Uhrzeit, zu dem der "
-"Druck der Seite begonnen wurde. Das Format dieses Feldes ist identisch zu "
-"dem Datum-Uhrzeit-Feld in der Datei I<access_log>."
+"cupsd-logs - Cupsd-Protokolldateien (access_log, error_log und page_log)"
 
 #. type: Plain text
-#: cupsd-logs.man:209
+#: cupsd-logs.5:21
 msgid ""
-"The I<num-sheets> field provides the total number of pages (sheets) that "
-"have been printed on for the job."
+"B<cupsd>(8)  normally maintains three log files: I<access_log> to track "
+"requests that are submitted to the scheduler, I<error_log> to track progress "
+"and errors, and I<page_log> to track pages that are printed.  Configuration "
+"directives in B<cupsd.conf>(5)  and B<cups-files.conf>(5)  control what "
+"information is logged and where it is stored."
 msgstr ""
-"Das Feld I<Anzahl-Blätter> stellt die Gesamtzahl an Seiten (Blättern) "
-"bereit, auf die für den Auftrag gedruckt wurde."
+"B<cupsd>(8) verwaltet normalerweise drei Protokolldateien: I<access_log>, um "
+"Anfragen, die an den Auftragsplaner eingereicht wurden, nachzuverfolgen, "
+"I<error_log>, um den Fortgang und Fehler nachzuverfolgen und I<page_log>, um "
+"gedruckte Seiten nachzuverfolgen. Konfigurationsdirektiven in B<cupsd."
+"conf>(5) und B<cups-files.conf>(5) regeln, welche Informationen "
+"protokolliert und wo sie gespeichert werden."
 
-#. type: Plain text
-#: cupsd-logs.man:211
-msgid ""
-"The I<job-billing> field contains a copy of the job-billing or job-account-"
-"id attributes provided with the IPP Create-Job or Print-Job requests or \"-"
-"\" if neither was provided."
-msgstr ""
-"Das Feld I<Auftrags-Abrechnung> enthält eine Kopie der mit den IPP-Create-"
-"Job- oder -Print-Job-Anfragen bereitgestellten Attribute »job-billing« oder "
-"»job-account-id« oder »-«, falls keines der beiden bereitgestellt wurde."
+#. type: SS
+#: cupsd-logs.5:21
+#, no-wrap
+msgid "ACCESS LOG FILE FORMAT"
+msgstr "ZUGRIFFSPROTOKOLL-DATEIFORMAT"
 
 #. type: Plain text
-#: cupsd-logs.man:213
+#: cupsd-logs.5:24
 msgid ""
-"The I<job-originating-host-name> field contains the hostname or IP address "
-"of the client that printed the job."
+"The I<access_log> file lists each HTTP resource that is accessed by a web "
+"browser or client.  Each line is in an extended version of the so-called "
+"\"Common Log Format\" used by many web servers and web reporting tools:"
 msgstr ""
-"Das Feld I<Auftrags-erstellender-Rechnername> enthält den Rechnernamen oder "
-"die IP-Adresse des Clients, der den Auftrag gedruckt hat."
+"Die Datei I<access_log> führt jede HTTP-Ressource auf, auf die durch einen "
+"Web-Browser oder -Client zugegriffen wird. Jede Zeile ist eine ausführliche "
+"Version des sogenannten »Common Log Format«, wie es von vielen Web-Servern "
+"und Web-Berichtswerkzeugen verwandt wird:"
 
 #. type: Plain text
-#: cupsd-logs.man:215
+#: cupsd-logs.5:28
+#, no-wrap
 msgid ""
-"The I<job-name> field contains a copy of the job-name attribute provided "
-"with the IPP Create-Job or Print-Job requests or \"-\" if none was provided."
+"    I<host group user date-time >\"I<method resource version>\" I<status bytes\n"
+"      ipp-operation ipp-status>\n"
 msgstr ""
-"Das Feld I<Auftragsname> enthält eine Kopie des mit der IPP-Anfrage »Create-"
-"Job« oder »Print-Job« bereitgestellten Attributes »job-name« oder »-«, falls "
-"keines bereitgestellt wurde."
+"    I<Rechner Gruppe Benutzer Datum-Zeit >\"I<Methode Ressource Version>\" I<Status Bytes\n"
+"      Ipp-Vorgang Ipp-Status>\n"
 
 #. type: Plain text
-#: cupsd-logs.man:217
-msgid ""
-"The I<media> field contains a copy of the media or media-col/media-size "
-"attribute provided with the IPP Create-Job or Print-Job requests or \"-\" if "
-"none was provided."
-msgstr ""
-"Das Feld I<Medium> enthält eine Kopie des mit der IPP-Anfrage »Create-Job« "
-"oder »Print-Job« bereitgestellten Attribute »media« oder »media-col/media-"
-"size« oder »-«, falls keines der beiden bereitgestellt wurde."
+#: cupsd-logs.5:31 cupsd-logs.5:126
+msgid "For example:"
+msgstr "Zum Beispiel:"
 
 #. type: Plain text
-#: cupsd-logs.man:219
+#: cupsd-logs.5:44
+#, no-wrap
 msgid ""
-"The I<sides> field contains a copy of the sides attribute provided with the "
-"IPP Create-Job or Print-Job requests or \"-\" if none was provided."
-msgstr ""
-"Das Feld I<Seiten> enthält eine Kopie des mit der IPP-Anfrage »Create-Job« "
-"oder »Print-Job« bereitgestellten Attributs »sides« oder »-«, falls keines "
-"bereitgestellt wurde."
+"    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] \"POST / HTTP/1.1\" 200 317\n"
+"      CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes\n"
+"    localhost - - [01/Dec/2005:21:50:32 +0000] \"GET /admin HTTP/1.1\"\n"
+"      200 0 - -\n"
+"    localhost - - [01/Dec/2005:21:50:32 +0000] \"POST / HTTP/1.1\"\n"
+"      200 157 CUPS-Get-Printers\n"
+"      successful-ok-ignored-or-substituted-attributes\n"
+"    localhost - - [01/Dec/2005:21:50:32 +0000] \"POST / HTTP/1.1\"\n"
+"      200 1411 CUPS-Get-Devices -\n"
+"    localhost - - [01/Dec/2005:21:50:32 +0000] \"GET /admin HTTP/1.1\"\n"
+"      200 6667 - -\n"
+msgstr ""
+"    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] \"POST / HTTP/1.1\" 200 317\n"
+"      CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes\n"
+"    localhost - - [01/Dec/2005:21:50:32 +0000] \"GET /admin HTTP/1.1\"\n"
+"      200 0 - -\n"
+"    localhost - - [01/Dec/2005:21:50:32 +0000] \"POST / HTTP/1.1\"\n"
+"      200 157 CUPS-Get-Printers\n"
+"      successful-ok-ignored-or-substituted-attributes\n"
+"    localhost - - [01/Dec/2005:21:50:32 +0000] \"POST / HTTP/1.1\"\n"
+"      200 1411 CUPS-Get-Devices -\n"
+"    localhost - - [01/Dec/2005:21:50:32 +0000] \"GET /admin HTTP/1.1\"\n"
+"      200 6667 - -\n"
 
 #. type: Plain text
-#: cupsd-logs.man:224
+#: cupsd-logs.5:47
 msgid ""
-"B<cupsd>(8), B<cupsd.conf>(5), B<cups-files.conf>(5), CUPS Online Help "
-"(http://localhost:631/help)"
+"The I<host> field will normally only be an IP address unless you have "
+"enabled the HostNameLookups directive in the I<cupsd.conf> file or if the IP "
+"address corresponds to your local machine."
 msgstr ""
-"B<cupsd>(8), B<cupsd.conf>(5), B<cups-files.conf>(5), CUPS-Online-Hilfe "
-"(http://localhost:631/help)"
+"Das Feld I<Rechner> enthält normalerweise nur eine IP-Adresse, es sei denn, "
+"Sie haben die Direktive HostNameLookups in der Datei I<cupsd.conf> aktiviert "
+"oder die IP-Adresse entspricht Ihrem lokalen Rechner."
 
 #. type: Plain text
-#: cupsd-logs.man:225 cups-files.conf.man.in:287 lpadmin.man:217
-#: lpoptions.man.in:121
-msgid "Copyright \\[co] 2007-2018 by Apple Inc."
-msgstr "Copyright \\[co] 2007-2018 by Apple Inc."
+#: cupsd-logs.5:49
+msgid "The I<group> field always contains \"-\"."
+msgstr "Das Feld I<Gruppe> enthält immer »-«."
 
-#. type: TH
-#: cupsd.man.in:13
-#, no-wrap
-msgid "cupsd"
-msgstr "cupsd"
+#. type: Plain text
+#: cupsd-logs.5:52
+msgid ""
+"The I<user> field is the authenticated username of the requesting user.  If "
+"no username and password is supplied for the request then this field "
+"contains \"-\"."
+msgstr ""
+"Das Feld I<Benutzer> enthält den authentifizierten Benutzernamen des "
+"anfragenden Benutzers. Falls kein Benutzername und Passwort für die Anfrage "
+"bereitgestellt wurde, enthält dieses Feld »-«."
 
-#. type: TH
-#: cupsd.man.in:13
-#, no-wrap
-msgid "12 February 2016"
-msgstr "12. Februar 2016"
+#. type: Plain text
+#: cupsd-logs.5:54
+msgid ""
+"The I<date-time> field is the date and time of the request in local time and "
+"is in the format \"[DD/MON/YYYY:HH:MM:SS +ZZZZ]\"."
+msgstr ""
+"Das Feld I<Datum-Zeit> enthält das Datum und die Uhrzeit der Anfrage in "
+"lokaler Zeit und im Format »[TT/MON/JJJJ:HH:MM:SS +ZZZZ]«."
 
 #. type: Plain text
-#: cupsd.man.in:16
-msgid "cupsd - cups scheduler"
-msgstr "cupsd - Cups-Autragsplaner"
+#: cupsd-logs.5:61
+msgid ""
+"The I<method> field is the HTTP method used: \"GET\", \"HEAD\", \"OPTIONS\", "
+"\"POST\", or \"PUT\".  \"GET\" requests are used to get files from the "
+"server, both for the web interface and to get configuration and log files.  "
+"\"HEAD\" requests are used to get information about a resource prior to a "
+"\"GET\".  \"OPTIONS\" requests are used to upgrade connections to TLS "
+"encryption.  \"POST\" requests are used for web interface forms and IPP "
+"requests.  \"PUT\" requests are used to upload configuration files."
+msgstr ""
+"Das Feld I<Methode> enthält die verwandte HTTP-Methode: »GET«, »HEAD«, "
+"»OPTIONS«, »POST« oder PUT«. »GET«-Anfragen werden verwandt, um Dateien vom "
+"Server zu erhalten, sowohl für die Web-Schnittstelle als auch um die "
+"Konfigurations- und Protokolldateien zu erhalten. »HEAD«-Anfragen werden zum "
+"Erhalt von Informationen über eine Ressource vor einem »GET« verwandt. "
+"»OPTIONS«-Anfragen werden zum Hochstufen einer Anfrage auf TLS-"
+"Verschlüsselung verwandt. »POST«-Anfragen werden für Webformulare und IPP-"
+"Anfragen verwandt. »PUT«-Anfragen dienen dem Hochladen von "
+"Konfigurationsdateien."
+
+#. type: Plain text
+#: cupsd-logs.5:63
+msgid "The I<resource> field is the filename of the requested resource."
+msgstr "Das Feld I<Ressource> ist der Dateiname der angefragten Ressource."
 
 #. type: Plain text
-#: cupsd.man.in:35
+#: cupsd-logs.5:66
 msgid ""
-"B<cupsd> [ B<-c> I<cupsd.conf> ] [ B<-f> ] [ B<-F> ] [ B<-h> ] [ B<-l> ] "
-"[ B<-s> I<cups-files.conf> ] [ B<-t> ]"
+"The I<version> field is the HTTP specification version used by the client.  "
+"For CUPS clients this will always be \"HTTP/1.1\"."
 msgstr ""
-"B<cupsd> [ B<-c> I<cupsd.conf> ] [ B<-f> ] [ B<-F> ] [ B<-h> ] [ B<-l> ] "
-"[ B<-s> I<cups-files.conf> ] [ B<-t> ]"
+"Das Feld I<Version> ist die vom Client verwandte HTTP-Spezifikationsversion. "
+"Für CUPS-Clients wird sie stets »HTTP/1.1« sein."
 
 #. type: Plain text
-#: cupsd.man.in:40
+#: cupsd-logs.5:68
 msgid ""
-"B<cupsd> is the scheduler for CUPS. It implements a printing system based "
-"upon the Internet Printing Protocol, version 2.1, and supports most of the "
-"requirements for IPP Everywhere. If no options are specified on the command-"
-"line then the default configuration file I</etc/cups/cupsd.conf> will be "
-"used."
+"The I<status> field contains the HTTP result status of the request, as "
+"follows:"
 msgstr ""
-"B<cupsd> ist der Auftragsplaner (Scheduler) für das Common UNIX Printing "
-"System. Es implementiert ein Drucksystem, das auf dem Internet Printing "
-"Protocol Version 2.1 basiert und die meisten der Anforderungen von »IPP "
-"Everywhere« erfüllt. Falls auf der Befehlszeile keine Optionen angegeben "
-"werden, wird stattdessen die Standard-Konfigurationsdatei I</etc/cups/cupsd."
-"conf> verwandt."
+"Das Feld I<Status> enthält den HTTP-Ergebnisstatus der Anfrage, wie folgt:"
 
 #. type: TP
-#: cupsd.man.in:41
+#: cupsd-logs.5:69
 #, no-wrap
-msgid "B<-c>I<\\ cupsd.conf>"
-msgstr "B<-c>I<\\ cupsd.conf>"
+msgid "200"
+msgstr "200"
 
 #. type: Plain text
-#: cupsd.man.in:44
-msgid "Uses the named cupsd.conf configuration file."
-msgstr "Verwendet die benannte cupsd.conf-Konfigurationsdatei."
+#: cupsd-logs.5:72
+msgid "Successful operation."
+msgstr "Vorgang erfolgreich"
 
 #. type: TP
-#: cupsd.man.in:44
+#: cupsd-logs.5:72
 #, no-wrap
-msgid "B<-f>"
-msgstr "B<-f>"
+msgid "201"
+msgstr "201"
 
 #. type: Plain text
-#: cupsd.man.in:49
-msgid ""
-"Run B<cupsd> in the foreground; the default is to run in the background as a "
-"\"daemon\"."
-msgstr ""
-"Führt B<cupsd> im Vordergrund aus; standardmäßig wird er im Hintergrund als "
-"»Daemon« ausgeführt."
+#: cupsd-logs.5:75
+msgid "File created/modified successfully."
+msgstr "Datei erfolgreich erstellt/verändert"
 
 #. type: TP
-#: cupsd.man.in:49
+#: cupsd-logs.5:75
 #, no-wrap
-msgid "B<-F>"
-msgstr "B<-F>"
+msgid "304"
+msgstr "304"
+
+#. type: Plain text
+#: cupsd-logs.5:78
+msgid "The requested file has not changed."
+msgstr "Die angeforderte Datei hat sich nicht geändert."
+
+#. type: TP
+#: cupsd-logs.5:78
+#, no-wrap
+msgid "400"
+msgstr "400"
 
 #. type: Plain text
-#: cupsd.man.in:57
+#: cupsd-logs.5:81
 msgid ""
-"Run B<cupsd> in the foreground but detach the process from the controlling "
-"terminal and current directory. This is useful for running B<cupsd> from "
-"B<init>(8)."
+"Bad HTTP request; typically this means that you have a malicious program "
+"trying to access your server."
 msgstr ""
-"Führt B<cupsd> im Vordergrund aus, aber kopple den Prozess von dem "
-"steuernden Terminal und dem aktuellen Verzeichnis ab. Dies ist nützlich, um "
-"B<cupsd> von B<init>(8) aus auszuführen."
+"Fehlerhafte HTTP-Anfrage. Typischerweise bedeutet dies, dass ein "
+"Schadprogramm einen Zugriff auf Ihren Server versucht."
 
 #. type: TP
-#: cupsd.man.in:57 ../test/ippserver.man:89 ipptool.man:158 lpr.man:91
+#: cupsd-logs.5:81
 #, no-wrap
-msgid "B<-h>"
-msgstr "B<-h>"
+msgid "401"
+msgstr "401"
 
 #. type: Plain text
-#: cupsd.man.in:60
-msgid "Shows the program usage."
-msgstr "Zeigt die Programm-Verwendung."
+#: cupsd-logs.5:84
+msgid "Unauthorized, authentication (username + password) is required."
+msgstr ""
+"Unauthorisiert, Authentifizierung (Benutzername + Passwort) wird benötigt."
 
 #. type: TP
-#: cupsd.man.in:60 ippfind.man:77 ipptool.man:167 lpinfo.man:74
-#: lpoptions.man.in:84 lpq.man:56 lpr.man:94 lpstat.man:107
+#: cupsd-logs.5:84
 #, no-wrap
-msgid "B<-l>"
-msgstr "B<-l>"
+msgid "403"
+msgstr "403"
 
 #. type: Plain text
-#: cupsd.man.in:68
+#: cupsd-logs.5:87
 msgid ""
-"This option is passed to B<cupsd> when it is run from B<launchd>(8)  or "
-"B<systemd>(8)."
+"Access is forbidden; typically this means that a client tried to access a "
+"file or resource they do not have permission to access."
 msgstr ""
-"Diese Option wird an B<cupsd> übergeben, wenn es von B<launchd(8)> oder "
-"B<systemd>(8) ausgeführt wird."
+"Zugriff verboten; typischerweise bedeutet dies, dass ein Client versucht, "
+"auf eine Datei oder Ressource zuzugreifen, für den sie keine Zugriffsrechte "
+"hat."
 
 #. type: TP
-#: cupsd.man.in:68
+#: cupsd-logs.5:87
 #, no-wrap
-msgid "B<-s>I<\\ cups-files.conf>"
-msgstr "B<-s>I<\\ cups-files.conf>"
+msgid "404"
+msgstr "404"
 
 #. type: Plain text
-#: cupsd.man.in:71 cupsfilter.man:75
-msgid "Uses the named cups-files.conf configuration file."
-msgstr "Verwendet die benannte cups-files.conf-Konfigurationsdatei."
+#: cupsd-logs.5:90
+msgid "The file or resource does not exist."
+msgstr "Die Datei oder Ressource existiert nicht."
 
 #. type: TP
-#: cupsd.man.in:71 ipptool.man:179 lpstat.man:125 ppdc.man:76
+#: cupsd-logs.5:90
 #, no-wrap
-msgid "B<-t>"
-msgstr "B<-t>"
-
-#. type: Plain text
-#: cupsd.man.in:74
-msgid "Test the configuration file for syntax errors."
-msgstr "Testet die Konfigurationsdatei auf Syntax-Fehler."
+msgid "405"
+msgstr "405"
 
 #. type: Plain text
-#: cupsd.man.in:83
-#, no-wrap
+#: cupsd-logs.5:93
 msgid ""
-"I</etc/cups/classes.conf>\n"
-"I</etc/cups/cups-files.conf>\n"
-"I</etc/cups/cupsd.conf>\n"
-"I</usr/share/cups/mime/mime.convs>\n"
-"I</usr/share/cups/mime/mime.types>\n"
-"I</etc/cups/printers.conf>\n"
-"I</etc/cups/subscriptions.conf>\n"
+"URL access method is not allowed; typically this means you have a web "
+"browser using your server as a proxy."
 msgstr ""
-"I</etc/cups/classes.conf>\n"
-"I</etc/cups/cups-files.conf>\n"
-"I</etc/cups/cupsd.conf>\n"
-"I</usr/share/cups/mime/mime.convs>\n"
-"I</usr/share/cups/mime/mime.types>\n"
-"I</etc/cups/printers.conf>\n"
-"I</etc/cups/subscriptions.conf>\n"
+"URL-Zugriffsmethode ist nicht erlaubt. Typischerweise bedeutet dies, dass "
+"ein Web-Browser Ihren Server als Proxy verwendet."
+
+#. type: TP
+#: cupsd-logs.5:93
+#, no-wrap
+msgid "413"
+msgstr "413"
 
 #. type: Plain text
-#: cupsd.man.in:87
+#: cupsd-logs.5:96
 msgid ""
-"B<cupsd> implements all of the required IPP/2.1 attributes and operations. "
-"It also implements several CUPS-specific administrative operations."
+"Request too large; typically this means that a client tried to print a file "
+"larger than the MaxRequestSize allows."
 msgstr ""
-"B<cupsd> implementiert alle benötigten IPP/2.1-Attribute und Vorgänge. Es "
-"implementiert auch mehrere CUPS-spezifische administrative Vorgänge."
-
-#. type: Plain text
-#: cupsd.man.in:91
-msgid "Run B<cupsd> in the background with the default configuration file:"
-msgstr "Führe I<cupsd> im Hintergrund mit der Standardkonfigurationsdatei aus:"
+"Anfrage zu groß. Typischerweise bedeutet dies, dass ein Client versuchte, "
+"eine Datei zu drucken, die größer ist als MaxRequestSize erlaubt."
 
-#. type: Plain text
-#: cupsd.man.in:94
+#. type: TP
+#: cupsd-logs.5:96
 #, no-wrap
-msgid "    cupsd\n"
-msgstr "    cupsd\n"
+msgid "426"
+msgstr "426"
 
 #. type: Plain text
-#: cupsd.man.in:98
-msgid "Test a configuration file called I<test.conf>:"
-msgstr "Eine Konfigurationsdatei namens I<test.conf> überprüfen:"
+#: cupsd-logs.5:99
+msgid "Upgrading to TLS-encrypted connection."
+msgstr "Hochstufen auf TLS-verschlüsselte Verbindung"
 
-#. type: Plain text
-#: cupsd.man.in:101
+#. type: TP
+#: cupsd-logs.5:99
 #, no-wrap
-msgid "    cupsd -t -c test.conf\n"
-msgstr "    cupsd -t -c test.conf\n"
+msgid "500"
+msgstr "500"
 
 #. type: Plain text
-#: cupsd.man.in:107
+#: cupsd-logs.5:102
 msgid ""
-"Run B<cupsd> in the foreground with a test configuration file called I<test."
-"conf>:"
+"Server error; typically this happens when the server is unable to open/"
+"create a file - consult the error_log file for details."
 msgstr ""
-"Führe B<cupsd> im Vordergrund mit einer Testkonfigurationsdatei namens "
-"I<test.conf> aus:"
+"Server-Fehler. Typischerweise passiert dies, wenn der Server nicht in der "
+"Lage ist, eine Datei zu öffnen/zu erstellen. Schauen Sie in der Datei "
+"error_log für weitere Details."
 
-#. type: Plain text
-#: cupsd.man.in:110
+#. type: TP
+#: cupsd-logs.5:102
 #, no-wrap
-msgid "    cupsd -f -c test.conf\n"
-msgstr "    cupsd -f -c test.conf\n"
+msgid "501"
+msgstr "501"
 
 #. type: Plain text
-#: cupsd.man.in:128
+#: cupsd-logs.5:105
 msgid ""
-"B<backend>(7), B<classes.conf>(5), B<cups>(1), B<cups-files.conf>(5), B<cups-"
-"lpd>(8), B<cupsd.conf>(5), B<cupsd-helper>(8), B<cupsd-logs>(8), "
-"B<filter>(7), B<launchd>(8), B<mime.convs>(5), B<mime.types>(5), B<printers."
-"conf>(5), B<systemd>(8), CUPS Online Help (http://localhost:631/help)"
+"The client requested encryption but encryption support is not enabled/"
+"compiled in."
 msgstr ""
-"B<backend>(7), B<classes.conf>(5), B<cups>(1), B<cups-files.conf>(5), B<cups-"
-"lpd>(8), B<cupsd.conf>(5), B<cupsd-helper>(8), B<cupsd-logs>(8), "
-"B<filter>(7), B<launchd>(8), B<mime.convs>(5), B<mime.types>(5), B<printers."
-"conf>(5), B<systemd>(8), CUPS-Online-Hilfe (http://localhost:631/help)"
+"Der Client erbat Verschlüsselung aber die Unterstützung dafür ist nicht "
+"aktiviert/einkompiliert."
 
-#. type: TH
-#: cupsenable.man:13
+#. type: TP
+#: cupsd-logs.5:105
 #, no-wrap
-msgid "cupsenable"
-msgstr "cupsenable"
+msgid "505"
+msgstr "505"
 
 #. type: Plain text
-#: cupsenable.man:16
-msgid "cupsdisable, cupsenable - stop/start printers and classes"
-msgstr "cupsdisable, cupsenable - beenden/starten von Druckern und Klassen"
+#: cupsd-logs.5:108
+msgid ""
+"HTTP version number not supported; typically this means that you have a "
+"malicious program trying to access your server."
+msgstr ""
+"HTTP-Versionsnummer wird nicht unterstützt. Typischerweise bedeutet dies, "
+"dass ein Schadprogramm versucht, auf Ihren Server zuzugreifen."
 
 #. type: Plain text
-#: cupsenable.man:34
+#: cupsd-logs.5:112
 msgid ""
-"B<cupsdisable> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h "
-">I<server>[B<:>I<port>] ] [ B<-r> I<reason> ] [ B<--hold> ] I<destination(s)>"
+"The I<bytes> field contains the number of bytes in the request.  For POST "
+"requests the bytes field contains the number of bytes of non-IPP data that "
+"is received from the client."
 msgstr ""
-"B<cupsdisable> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-c> ] [ B<-h "
-">I<Server>[B<:>I<Port>] ] [ B<-r> I<Grund> ] [ B<--hold> ] I<Ziel(e)>"
+"Das Feld I<Bytes> enthält die Anzahl an Bytes in der Anfrage. Für POST-"
+"Anfragen enthält das Feld Bytes die Anzahl von Bytes in nicht IPP-Daten, die "
+"vom Client empfangen wurden."
 
 #. type: Plain text
-#: cupsenable.man:49
+#: cupsd-logs.5:114
 msgid ""
-"B<cupsenable> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h >I<server>[B<:"
-">I<port>] ] [ B<--release> ] I<destination(s)>"
+"The I<ipp-operation> field contains either \"-\" for non-IPP requests or the "
+"IPP operation name for POST requests containing an IPP request."
 msgstr ""
-"B<cupsenable> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-c> ] [ B<-h "
-">I<Server>[B<:>I<Port>] ] [ B<--release> ] I<Ziel(e)>"
+"Das Feld I<Ipp-Vorgang> enthält entweder »-« für nicht IPP-Anfragen oder den "
+"IPP-Vorgangsnamen für POST-Anfragen, die eine IPP-Anfrage enthalten."
 
 #. type: Plain text
-#: cupsenable.man:54
+#: cupsd-logs.5:116
 msgid ""
-"B<cupsenable> starts the named printers or classes while B<cupsdisable> "
-"stops the named printers or classes."
+"The I<ipp-status> field contains either \"-\" for non-IPP requests or the "
+"IPP status code name for POST requests containing an IPP response."
 msgstr ""
-"I<cupsenable> startet die benannten Drucker oder Klassen während "
-"B<cupsdisable> die benannten Drucker oder Klassen anhält."
+"Das Feld I<Ipp-Status> enthält entweder »-« für nicht IPP-Anfragen oder den "
+"IPP-Status-Codenamen für POST-Anfragen, die eine IPP-Antwort enthalten."
 
-#. type: Plain text
-#: cupsenable.man:56
-msgid "The following options may be used:"
-msgstr "Die folgenden Optionen können benutzt werden:"
+#. type: SS
+#: cupsd-logs.5:116
+#, no-wrap
+msgid "ERROR LOG FILE FORMAT"
+msgstr "FEHLERPROTOKOLL-DATEIFORMAT"
 
 #. type: Plain text
-#: cupsenable.man:59
-msgid "Forces encryption of the connection to the server."
-msgstr "Erzwingt Verschlüsselung der Verbindung zum Server."
+#: cupsd-logs.5:120
+msgid ""
+"The I<error_log> file lists messages from the scheduler - errors, warnings, "
+"etc. The LogLevel directive in the B<cupsd.conf>(5)  file controls which "
+"messages are logged:"
+msgstr ""
+"Die Datei I<error_log> listet Nachrichten vom Auftragsplaner auf - Fehler, "
+"Warnungen usw. Die Direktive LogLevel in der Datei B<cupsd.conf>(5) steuert, "
+"welche Nachrichten protokolliert werden:"
 
 #. type: Plain text
-#: cupsenable.man:62
-msgid "Uses the specified username when connecting to the server."
-msgstr "Verwendet den angegebenen Benutzernamen bei Verbindungen zum Server."
-
-#. type: TP
-#: cupsenable.man:62 ipptool.man:149 lp.man:108
+#: cupsd-logs.5:123
 #, no-wrap
-msgid "B<-c>"
-msgstr "B<-c>"
+msgid "    level date-time message\n"
+msgstr "    Stufe Datum-Uhrzeit Nachricht\n"
 
 #. type: Plain text
-#: cupsenable.man:65
-msgid "Cancels all jobs on the named destination."
-msgstr "Bricht alle Aufträge auf dem benannten Ziel ab."
+#: cupsd-logs.5:140
+#, no-wrap
+msgid ""
+"    I [20/May/1999:19:18:28 +0000] [Job 1] Queued on 'DeskJet' by 'mike'.\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[0]=\"DeskJet\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[1]=\"1\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[2]=\"mike\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[3]=\"myjob\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[4]=\"1\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[5]=\"media=\n"
+"      na_letter_8.5x11in sides=one-sided\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[6]=\"/var/spool/cups/\n"
+"      d000001-001\"\n"
+"    I [20/May/1999:19:21:02 +0000] [Job 2] Queued on 'DeskJet' by 'mike'.\n"
+"    I [20/May/1999:19:22:24 +0000] [Job 2] Canceled by 'mike'.\n"
+msgstr ""
+"    I [20/May/1999:19:18:28 +0000] [Job 1] Queued on 'DeskJet' by 'mike'.\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[0]=\"DeskJet\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[1]=\"1\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[2]=\"mike\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[3]=\"myjob\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[4]=\"1\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[5]=\"media=\n"
+"      na_letter_8.5x11in sides=one-sided\"\n"
+"    D [20/May/1999:19:18:28 +0000] [Job 1] argv[6]=\"/var/spool/cups/\n"
+"      d000001-001\"\n"
+"    I [20/May/1999:19:21:02 +0000] [Job 2] Queued on 'DeskJet' by 'mike'.\n"
+"    I [20/May/1999:19:22:24 +0000] [Job 2] Canceled by 'mike'.\n"
 
 #. type: Plain text
-#: cupsenable.man:68
-msgid "Uses the specified server and port."
-msgstr "Verwendet den angegebenen Server und Port."
+#: cupsd-logs.5:143
+msgid "The I<level> field contains the type of message:"
+msgstr "Das Feld I<Stufe> enthält den Typ der Nachricht:"
 
 #. type: TP
-#: cupsenable.man:68
+#: cupsd-logs.5:143
 #, no-wrap
-msgid "B<--hold>"
-msgstr "B<--hold>"
+msgid "A"
+msgstr "A"
 
 #. type: Plain text
-#: cupsenable.man:72
-msgid ""
-"Holds remaining jobs on the named printer.  Useful for allowing the current "
-"job to complete before performing maintenance."
-msgstr ""
-"Die verbleibenden Druckaufträge auf dem genannten Drucker anhalten. "
-"Nützlich, um dem aktuellen Druckauftrag die Fertigstellung zu erlauben, wenn "
-"danach Wartungsarbeiten durchgeführt werden sollen."
+#: cupsd-logs.5:146
+msgid "Alert message (LogLevel alert)"
+msgstr "Warnungsnachricht (LogLevel alert)"
 
 #. type: TP
-#: cupsenable.man:72
+#: cupsd-logs.5:146
 #, no-wrap
-msgid "B<-r \">I<reason>B<\">"
-msgstr "B<-r \">I<Grund>B<\">"
+msgid "C"
+msgstr "C"
 
 #. type: Plain text
-#: cupsenable.man:76
-msgid ""
-"Sets the message associated with the stopped state.  If no reason is "
-"specified then the message is set to \"Reason Unknown\"."
-msgstr ""
-"Setzt die dem Beendet-Zustand zugeordnete Nachricht. Falls kein Grund "
-"festgelegt ist, wird die Nachricht auf »Reason Unknown« gesetzt."
+#: cupsd-logs.5:149
+msgid "Critical error message (LogLevel crit)"
+msgstr "Kritische Fehlernachricht (LogLevel crit)"
 
 #. type: TP
-#: cupsenable.man:76
+#: cupsd-logs.5:149
 #, no-wrap
-msgid "B<--release>"
-msgstr "B<--release>"
+msgid "D"
+msgstr "D"
 
 #. type: Plain text
-#: cupsenable.man:80
-msgid ""
-"Releases pending jobs for printing.  Use after running B<cupsdisable> with "
-"the I<--hold> option to resume printing."
-msgstr ""
-"Gibt wartende Aufträge zum Drucken frei. Benutzen Sie es nach der Ausführung "
-"von B<cupsdisable> mit der Option I<--hold>, um das Drucken fortzusetzen."
+#: cupsd-logs.5:152
+msgid "Debugging message (LogLevel debug)"
+msgstr "Fehlersuchnachricht (LogLevel debug)"
 
-#. type: Plain text
-#: cupsenable.man:83 lp.man:235
-msgid ""
-"Unlike the System V printing system, CUPS allows printer names to contain "
-"any printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer "
-"and class names are I<not> case-sensitive."
-msgstr ""
-"Anders als das System-V-Drucksystem erlaubt es CUPS, dass Druckernamen alle "
-"druckbaren Zeichen außer Leertaste, Tabulator, »/« und »#« enthalten. Auch "
-"sind Drucker- und Klassennamen I<unabhängig> von der Groß-/Kleinschreibung."
+#. type: TP
+#: cupsd-logs.5:152
+#, no-wrap
+msgid "d"
+msgstr "d"
 
 #. type: Plain text
-#: cupsenable.man:88
-msgid ""
-"The System V versions of these commands are B<disable> and B<enable>, "
-"respectively.  They have been renamed to avoid conflicts with the "
-"B<bash>(1)  build-in commands of the same names."
-msgstr ""
-"Die System-V-Versionen dieser Befehle sind B<disable> und B<enable>. Sie "
-"wurden umbenannt, um Konflikte mit den eingebauten Befehlen gleichen Namens "
-"der B<bash>(1) zu vermeiden."
+#: cupsd-logs.5:155
+msgid "Detailed debugging message (LogLevel debug2)"
+msgstr "Detaillierte Fehlersuchnachricht (LogLevel debug2)"
 
-#. type: Plain text
-#: cupsenable.man:91
-msgid ""
-"The CUPS versions of B<disable> and B<enable> may ask the user for an access "
-"password depending on the printing system configuration.  This differs from "
-"the System V versions which require the root user to execute these commands."
-msgstr ""
-"Die CUPS-Versionen von B<disable> und B<enable> könnten den Benutzer, "
-"abhängig von der Konfiguration des Drucksystems, nach einem Zugriffspasswort "
-"fragen. Dies unterscheidet sich von der System-V-Version, die verlangt, dass "
-"der Benutzer »root« diese Befehle ausführt."
+#. type: TP
+#: cupsd-logs.5:155
+#, no-wrap
+msgid "E"
+msgstr "E"
 
 #. type: Plain text
-#: cupsenable.man:99
-msgid ""
-"B<cupsaccept>(8), B<cupsreject>(8), B<cancel>(1), B<lp>(1), B<lpadmin>(8), "
-"B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
-msgstr ""
-"B<cupsaccept>(8), B<cupsreject>(8), B<cancel>(1), B<lp>(1), B<lpadmin>(8), "
-"B<lpstat>(1), CUPS-Online-Hilfe (http://localhost:631/help)"
-
-#. type: TH
-#: cups-files.conf.man.in:13
-#, no-wrap
-msgid "cups-files.conf"
-msgstr "cups-files.conf"
+#: cupsd-logs.5:158
+msgid "Normal error message (LogLevel error)"
+msgstr "Normale Fehlernachricht (LogLevel error)"
 
-#. type: TH
-#: cups-files.conf.man.in:13
+#. type: TP
+#: cupsd-logs.5:158
 #, no-wrap
-msgid "25 February 2018 "
-msgstr "25. Februar 2018"
+msgid "I"
+msgstr "I"
 
 #. type: Plain text
-#: cups-files.conf.man.in:16
-msgid "cups-files.conf - file and directory configuration file for cups"
-msgstr "cups-files.conf - Datei- und Verzeichnis-Konfigurationsdatei für CUPS"
+#: cupsd-logs.5:161
+msgid "Informational message (LogLevel info)"
+msgstr "Informative Nachricht (LogLevel info)"
 
-#. type: Plain text
-#: cups-files.conf.man.in:20
-msgid ""
-"The B<cups-files.conf> file configures the files and directories used by the "
-"CUPS scheduler, B<cupsd>(8).  It is normally located in the I</etc/cups> "
-"directory."
-msgstr ""
-"Die Datei B<cups-files.conf> konfiguriert die von dem CUPS-Auftragsplaner "
-"(Scheduler), B<cupsd>(8) verwandten Dateien und Verzeichnisse. Sie befindet "
-"sich normalerweise im Verzeichnis I</etc/cups>."
+#. type: TP
+#: cupsd-logs.5:161
+#, no-wrap
+msgid "N"
+msgstr "N"
 
-#. #AccessLog
 #. type: Plain text
-#: cups-files.conf.man.in:29
-msgid "The following directives are understood by B<cupsd>(8):"
-msgstr "Die nachfolgenden Direktiven werden von B<cupsd>(8) verstanden:"
+#: cupsd-logs.5:164
+msgid "Notice message (LogLevel notice)"
+msgstr "Hinweisnachricht (LogLevel notice)"
 
 #. type: TP
-#: cups-files.conf.man.in:29
+#: cupsd-logs.5:164
 #, no-wrap
-msgid "B<AccessLog>"
-msgstr "B<AccessLog>"
+msgid "W"
+msgstr "W"
 
-#. type: TP
-#: cups-files.conf.man.in:31
-#, no-wrap
-msgid "B<AccessLog >I<filename>"
-msgstr "B<AccessLog >I<Dateiname>"
+#. type: Plain text
+#: cupsd-logs.5:167
+msgid "Warning message (LogLevel warn)"
+msgstr "Warnungsnachricht (LogLevel warn)"
 
 #. type: TP
-#: cups-files.conf.man.in:33
+#: cupsd-logs.5:167
 #, no-wrap
-msgid "B<AccessLog stderr>"
-msgstr "B<AccessLog stderr>"
+msgid "X"
+msgstr "X"
 
-#. type: TP
-#: cups-files.conf.man.in:35
-#, no-wrap
-msgid "B<AccessLog syslog>"
-msgstr "B<AccessLog syslog>"
+#. type: Plain text
+#: cupsd-logs.5:170
+msgid "Emergency error message (LogLevel emerg)"
+msgstr "Notfallfehlernachricht (LogLevel emerg)"
 
 #. type: Plain text
-#: cups-files.conf.man.in:42
+#: cupsd-logs.5:172
 msgid ""
-"Defines the access log filename.  Specifying a blank filename disables "
-"access log generation.  The value \"stderr\" causes log entries to be sent "
-"to the standard error file when the scheduler is running in the foreground, "
-"or to the system log daemon when run in the background.  The value \"syslog"
-"\" causes log entries to be sent to the system log daemon.  The server name "
-"may be included in filenames using the string \"%s\", for example:"
+"The I<date-time> field contains the date and time of when the page started "
+"printing. The format of this field is identical to the data-time field in "
+"the I<access_log> file."
 msgstr ""
-"Definiert den Namen der Zugriffsprotokolldatei. Durch Angabe eines leeren "
-"Dateinamens wird die Protokollierung deaktiviert. Der Wert »stderr« führt "
-"dazu, dass Protokolleinträge an die Standardfehlerdatei gesandt werden, wenn "
-"der Auftragsplaner im Vordergrund läuft oder zum Systemprotokollier-Daemon, "
-"wenn er im Hintergrund läuft. Der Wert »syslog« führt dazu, dass die "
-"Protokolleinträge zum Systemprotokoll-Daemon gesandt werden. Mittels der "
-"Zeichenkette »%s« kann der Servername in Dateinamen eingebettet werden, z.B.:"
+"Das Feld I<Datum-Zeit> enthält das Datum und die Uhrzeit vom Beginn des "
+"Drucks. Das Format dieses Feldes ist identisch zu dem Datum-Uhrzeit-Feld in "
+"der Datei I<access_log>."
 
 #. type: Plain text
-#: cups-files.conf.man.in:45
+#: cupsd-logs.5:175
+msgid ""
+"The I<message> field contains a free-form textual message.  Messages from "
+"job filters are prefixed with \"[Job NNN]\" where \"NNN\" is the job ID."
+msgstr ""
+"Das Feld I<Nachricht> enthält eine formlose Textnachricht. Nachrichten von "
+"Auftragsfiltern haben den Präfix »[Job NNN]«, wobei »NNN« die Auftrags-ID "
+"ist."
+
+#. type: SS
+#: cupsd-logs.5:175
 #, no-wrap
-msgid "    AccessLog /var/log/cups/%s-access_log\n"
-msgstr "    AccessLog /var/log/cups/%s-access_log\n"
+msgid "PAGE LOG FILE FORMAT"
+msgstr "SEITENPROTOKOLL-DATEIFORMAT"
 
-#. #CacheDir
 #. type: Plain text
-#: cups-files.conf.man.in:49
-msgid "The default is \"/var/log/cups/access_log\"."
-msgstr "Die Vorgabe ist »/var/log/cups/access_log«."
+#: cupsd-logs.5:178
+msgid ""
+"The I<page_log> file lists the total number of pages (sheets) that are "
+"printed.  By default, each line contains the following information:"
+msgstr ""
+"Die Datei I<page_log> listet die Gesamtzahl an gedruckten Seiten (Blättern) "
+"auf. Standardmäßig enthält jede Zeile die folgenden Informationen:"
 
-#. type: TP
-#: cups-files.conf.man.in:49
+#. type: Plain text
+#: cupsd-logs.5:182
 #, no-wrap
-msgid "B<CacheDir >I<directory>"
-msgstr "B<CacheDir >I<Verzeichnis>"
+msgid ""
+"    I<printer user job-id date-time >B<total >I<num-sheets job-billing\n"
+"      job-originating-host-name job-name media sides>\n"
+msgstr ""
+"    I<Drucker Benutzer Auftrags-ID Datum-Uhrzeit >B<total >I<Anzahl-Blätter\n"
+"      Auftrags-Abrechnung Auftrags-erstellender-Rechnername Auftragsname Medium Seiten>\n"
 
-#. #ConfigFilePerm
 #. type: Plain text
-#: cups-files.conf.man.in:54
+#: cupsd-logs.5:185
 msgid ""
-"Specifies the directory to use for long-lived temporary (cache) files.  The "
-"default is \"/var/spool/cups/cache\" or \"/var/cache/cups\" depending on the "
-"platform."
+"For example the entry for a two page job called \"myjob\" might look like:"
 msgstr ""
-"Legt das für langlebige temporäre (Zwischenspeicher-)Dateien zu verwendene "
-"Verzeichnis fest. Die Vorgabe ist »/var/spool/cups/cache« oder »/var/cache/"
-"cups«, abhängig von der Plattform."
+"Beispielsweise könnte der Eintrag für einen zweiseitigen Auftrag namens "
+"»meinAuftrag« wie folgt aussehen:"
 
-#. type: TP
-#: cups-files.conf.man.in:54
+#. type: Plain text
+#: cupsd-logs.5:189
 #, no-wrap
-msgid "B<ConfigFilePerm >I<mode>"
-msgstr "B<ConfigFilePerm >I<Modus>"
+msgid ""
+"    DeskJet root 1 [20/May/1999:19:21:06 +0000] total 2 acme-123\n"
+"      localhost myjob na_letter_8.5x11in one-sided\n"
+msgstr ""
+"    DeskJet root 1 [20/May/1999:19:21:06 +0000] total 2 acme-123\n"
+"      localhost meinAuftrag na_letter_8.5x11in one-sided\n"
 
 #. type: Plain text
-#: cups-files.conf.man.in:58
+#: cupsd-logs.5:194
 msgid ""
-"Specifies the permissions for all configuration files that the scheduler "
-"writes.  The default is \"0644\" on macOS and \"0640\" on all other "
-"operating systems."
+"The PageLogFormat directive in the B<cupsd.conf>(5)  file can be used to "
+"change this information."
 msgstr ""
-"Legt die Rechte für alle vom Auftragsplaner (Scheduler) geschriebenen "
-"Konfigurationsdateien fest. Die Vorgabe ist »0644« unter macOS und »0640« "
-"unter allen anderen Betriebssystemen."
+"Die Direktive PageLogFormat in der Datei B<cupsd.conf>(5) kann zum Ändern "
+"der Information verwandt werden."
 
-#. #CreateSelfSignedCerts
 #. type: Plain text
-#: cups-files.conf.man.in:63
+#: cupsd-logs.5:197
 msgid ""
-"B<Note:> The permissions for the I<printers.conf> file are currently masked "
-"to only allow access from the scheduler user (typically root).  This is done "
-"because printer device URIs sometimes contain sensitive authentication "
-"information that should not be generally known on the system.  There is no "
-"way to disable this security feature."
+"The I<printer> field contains the name of the printer that printed the "
+"page.  If you send a job to a printer class, this field will contain the "
+"name of the printer that was assigned the job."
 msgstr ""
-"B<Hinweis>: Die Rechte für die Datei I<printers.conf> werden derzeit "
-"maskiert, um nur dem Benutzer des Auftragsplaners (typischerweise root) den "
-"Zugriff zu erlauben. Dies erfolgt, da einige Druckergeräte-URIs manchmal "
-"schützenswerte Anmeldeinformationen enthalten, die im System nicht allgemein "
-"bekannt sein sollen. Es ist nicht möglich, diese Sicherheitsfunktionalität "
-"zu deaktivieren."
-
-#. type: TP
-#: cups-files.conf.man.in:63
-#, no-wrap
-msgid "B<CreateSelfSignedCerts yes>"
-msgstr "B<CreateSelfSignedCerts yes>"
-
-#. type: TP
-#: cups-files.conf.man.in:65
-#, no-wrap
-msgid "B<CreateSelfSignedCerts no>"
-msgstr "B<CreateSelfSignedCerts no>"
+"Das Feld I<Drucker> enthält den Namen des Druckers, der die Seite gedruckt "
+"hat. Falls Sie einen Auftrag an eine Druckerklasse gesendet haben, wird "
+"dieses Feld den Namen des Druckers enthalten, dem dieser Auftrag zugewiesen "
+"wurde."
 
-#. #DataDir
 #. type: Plain text
-#: cups-files.conf.man.in:70
+#: cupsd-logs.5:199
 msgid ""
-"Specifies whether the scheduler automatically creates self-signed "
-"certificates for client connections using TLS.  The default is yes."
+"The I<user> field contains the name of the user (the IPP requesting-user-"
+"name attribute) that submitted this file for printing."
 msgstr ""
-"Legt fest, ob der Auftragsplaner automatisch selbstsignierte Zertifikate für "
-"die Clientverbindungen mittels TLS erzeugt. Die Vorgabe ist »yes«."
+"Das Feld I<Benutzer> enthält den Namen des Benutzers (des IPP-Attributs "
+"requesting-user-name), der diesen Auftrag zum Druck eingereicht hat."
 
-#. type: TP
-#: cups-files.conf.man.in:70
-#, no-wrap
-msgid "B<DataDir >I<path>"
-msgstr "B<DataDir >I<Pfad>"
+#. type: Plain text
+#: cupsd-logs.5:201
+msgid "The I<job-id> field contains the job number of the page being printed."
+msgstr ""
+"Das Feld I<Auftrags-ID> enthält die Auftragsnummer der im Druck befindlichen "
+"Seite."
 
-#. #DocumentRoot
 #. type: Plain text
-#: cups-files.conf.man.in:75
+#: cupsd-logs.5:204
 msgid ""
-"Specifies the directory where data files can be found.  The default is "
-"usually \"/usr/share/cups\"."
+"The I<date-time> field contains the date and time of when the page started "
+"printing.  The format of this field is identical to the data-time field in "
+"the I<access_log> file."
 msgstr ""
-"Legt das Verzeichnis, in dem Datendateien gefunden werden können, fest. Die "
-"Vorgabe ist normalerweise »/usr/share/cups«."
-
-#. type: TP
-#: cups-files.conf.man.in:75
-#, no-wrap
-msgid "B<DocumentRoot >I<directory>"
-msgstr "B<DocumentRoot >I<Verzeichnis>"
+"Das Feld I<Datum-Uhrzeit> enthält das Datum und die Uhrzeit, zu dem der "
+"Druck der Seite begonnen wurde. Das Format dieses Feldes ist identisch zu "
+"dem Datum-Uhrzeit-Feld in der Datei I<access_log>."
 
-#. #ErrorLog
 #. type: Plain text
-#: cups-files.conf.man.in:80
+#: cupsd-logs.5:206
 msgid ""
-"Specifies the root directory for the CUPS web interface content.  The "
-"default is usually \"/usr/share/doc/cups\"."
+"The I<num-sheets> field provides the total number of pages (sheets) that "
+"have been printed on for the job."
 msgstr ""
-"Legt das Wurzelverzeichnis für den Inhalt der CUPS-Weboberfläche fest. Die "
-"Vorgabe ist normalerweise »/usr/share/doc/cups«."
-
-#. type: TP
-#: cups-files.conf.man.in:80
-#, no-wrap
-msgid "B<ErrorLog>"
-msgstr "B<ErrorLog>"
-
-#. type: TP
-#: cups-files.conf.man.in:82
-#, no-wrap
-msgid "B<ErrorLog >I<filename>"
-msgstr "B<ErrorLog >I<Dateiname>"
-
-#. type: TP
-#: cups-files.conf.man.in:84
-#, no-wrap
-msgid "B<ErrorLog stderr>"
-msgstr "B<ErrorLog stderr>"
-
-#. type: TP
-#: cups-files.conf.man.in:86
-#, no-wrap
-msgid "B<ErrorLog syslog>"
-msgstr "B<ErrorLog syslog>"
+"Das Feld I<Anzahl-Blätter> stellt die Gesamtzahl an Seiten (Blättern) "
+"bereit, auf die für den Auftrag gedruckt wurde."
 
 #. type: Plain text
-#: cups-files.conf.man.in:93
+#: cupsd-logs.5:208
 msgid ""
-"Defines the error log filename.  Specifying a blank filename disables error "
-"log generation.  The value \"stderr\" causes log entries to be sent to the "
-"standard error file when the scheduler is running in the foreground, or to "
-"the system log daemon when run in the background.  The value \"syslog\" "
-"causes log entries to be sent to the system log daemon.  The server name may "
-"be included in filenames using the string \"%s\", for example:"
+"The I<job-billing> field contains a copy of the job-billing or job-account-"
+"id attributes provided with the IPP Create-Job or Print-Job requests or \"-"
+"\" if neither was provided."
 msgstr ""
-"Definiert den Namen der Fehlerprotokolldatei. Durch Angabe eines leeren "
-"Dateinamens wird die Fehlerprotokollierung deaktiviert. Der Wert »stderr« "
-"führt dazu, dass Protokolleinträge an die Standardfehlerdatei gesandt "
-"werden, wenn der Auftragsplaner im Vordergrund läuft oder zum "
-"Systemprotokollier-Daemon, wenn er im Hintergrund läuft. Der Wert »syslog« "
-"führt dazu, dass die Protokolleinträge zum Systemprotokoll-Daemon gesandt "
-"werden. Mittels der Zeichenkette »%s« kann der Servername in Dateinamen "
-"eingebettet werden, z.B.:"
+"Das Feld I<Auftrags-Abrechnung> enthält eine Kopie der mit den IPP-Create-"
+"Job- oder -Print-Job-Anfragen bereitgestellten Attribute »job-billing« oder "
+"»job-account-id« oder »-«, falls keines der beiden bereitgestellt wurde."
 
 #. type: Plain text
-#: cups-files.conf.man.in:96
-#, no-wrap
-msgid "    ErrorLog /var/log/cups/%s-error_log\n"
-msgstr "    ErrorLog /var/log/cups/%s-error_log\n"
+#: cupsd-logs.5:210
+msgid ""
+"The I<job-originating-host-name> field contains the hostname or IP address "
+"of the client that printed the job."
+msgstr ""
+"Das Feld I<Auftrags-erstellender-Rechnername> enthält den Rechnernamen oder "
+"die IP-Adresse des Clients, der den Auftrag gedruckt hat."
 
-#. #FatalErrors
 #. type: Plain text
-#: cups-files.conf.man.in:100
-msgid "The default is \"/var/log/cups/error_log\"."
-msgstr "Die Vorgabe ist »/var/log/cups/error_log«."
-
-#. type: TP
-#: cups-files.conf.man.in:100
-#, no-wrap
-msgid "B<FatalErrors none>"
-msgstr "B<FatalErrors none>"
-
-#. type: TP
-#: cups-files.conf.man.in:102
-#, no-wrap
-msgid "B<FatalErrors all >I<-kind >[ ... I<-kind >]"
-msgstr "B<FatalErrors all >I<-Art >[ … I<-Art >]"
-
-#. type: TP
-#: cups-files.conf.man.in:104
-#, no-wrap
-msgid "B<FatalErrors >I<kind >[ ... I<kind >]"
-msgstr "B<FatalErrors >I<Art >[ … I<Art >]"
+#: cupsd-logs.5:212
+msgid ""
+"The I<job-name> field contains a copy of the job-name attribute provided "
+"with the IPP Create-Job or Print-Job requests or \"-\" if none was provided."
+msgstr ""
+"Das Feld I<Auftragsname> enthält eine Kopie des mit der IPP-Anfrage »Create-"
+"Job« oder »Print-Job« bereitgestellten Attributes »job-name« oder »-«, falls "
+"keines bereitgestellt wurde."
 
 #. type: Plain text
-#: cups-files.conf.man.in:109
+#: cupsd-logs.5:214
 msgid ""
-"Specifies which errors are fatal, causing the scheduler to exit.  The "
-"default is \"config\".  The I<kind> strings are:"
+"The I<media> field contains a copy of the media or media-col/media-size "
+"attribute provided with the IPP Create-Job or Print-Job requests or \"-\" if "
+"none was provided."
 msgstr ""
-"Gibt an, welche Fehler fatal sind und den Zeitplaner zum Beenden "
-"veranlassen. Die Vorgabe ist »config«. I<Art> kann einer der folgenden "
-"Zeichenketten sein:"
+"Das Feld I<Medium> enthält eine Kopie des mit der IPP-Anfrage »Create-Job« "
+"oder »Print-Job« bereitgestellten Attribute »media« oder »media-col/media-"
+"size« oder »-«, falls keines der beiden bereitgestellt wurde."
 
-#. type: TP
-#: cups-files.conf.man.in:110
-#, no-wrap
-msgid "B<none>"
-msgstr "B<none>"
+#. type: Plain text
+#: cupsd-logs.5:216
+msgid ""
+"The I<sides> field contains a copy of the sides attribute provided with the "
+"IPP Create-Job or Print-Job requests or \"-\" if none was provided."
+msgstr ""
+"Das Feld I<Seiten> enthält eine Kopie des mit der IPP-Anfrage »Create-Job« "
+"oder »Print-Job« bereitgestellten Attributs »sides« oder »-«, falls keines "
+"bereitgestellt wurde."
 
 #. type: Plain text
-#: cups-files.conf.man.in:113
-msgid "No errors are fatal."
-msgstr "Keine Fehler sind fatal."
+#: cupsd-logs.5:221
+msgid ""
+"B<cupsd>(8), B<cupsd.conf>(5), B<cups-files.conf>(5), CUPS Online Help "
+"(http://localhost:631/help)"
+msgstr ""
+"B<cupsd>(8), B<cupsd.conf>(5), B<cups-files.conf>(5), CUPS-Online-Hilfe "
+"(http://localhost:631/help)"
 
-#. type: TP
-#: cups-files.conf.man.in:113
+#. type: TH
+#: cupsenable.8:10
 #, no-wrap
-msgid "B<all>"
-msgstr "B<all>"
+msgid "cupsenable"
+msgstr "cupsenable"
 
 #. type: Plain text
-#: cups-files.conf.man.in:116
-msgid "All of the errors below are fatal."
-msgstr "Alle der weiter unten aufgeführten Fehler sind fatal."
+#: cupsenable.8:13
+msgid "cupsdisable, cupsenable - stop/start printers and classes"
+msgstr "cupsdisable, cupsenable - beenden/starten von Druckern und Klassen"
 
-#. type: TP
-#: cups-files.conf.man.in:116
-#, no-wrap
-msgid "B<browse>"
-msgstr "B<browse>"
+#. type: Plain text
+#: cupsenable.8:31
+msgid ""
+"B<cupsdisable> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h "
+">I<server>[B<:>I<port>] ] [ B<-r> I<reason> ] [ B<--hold> ] I<destination(s)>"
+msgstr ""
+"B<cupsdisable> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-c> ] [ B<-h "
+">I<Server>[B<:>I<Port>] ] [ B<-r> I<Grund> ] [ B<--hold> ] I<Ziel(e)>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:119
+#: cupsenable.8:46
 msgid ""
-"Browsing initialization errors are fatal, for example failed connections to "
-"the DNS-SD daemon."
+"B<cupsenable> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h >I<server>[B<:"
+">I<port>] ] [ B<--release> ] I<destination(s)>"
 msgstr ""
-"Initialisierungsfehler beim Browsing sind fatal, beispielsweise "
-"fehlgeschlagene Verbindungen zu dem DNS-SD-Daemon."
+"B<cupsenable> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-c> ] [ B<-h "
+">I<Server>[B<:>I<Port>] ] [ B<--release> ] I<Ziel(e)>"
+
+#. type: Plain text
+#: cupsenable.8:51
+msgid ""
+"B<cupsenable> starts the named printers or classes while B<cupsdisable> "
+"stops the named printers or classes."
+msgstr ""
+"I<cupsenable> startet die benannten Drucker oder Klassen während "
+"B<cupsdisable> die benannten Drucker oder Klassen anhält."
+
+#. type: Plain text
+#: cupsenable.8:53
+msgid "The following options may be used:"
+msgstr "Die folgenden Optionen können benutzt werden:"
+
+#. type: Plain text
+#: cupsenable.8:56
+msgid "Forces encryption of the connection to the server."
+msgstr "Erzwingt Verschlüsselung der Verbindung zum Server."
+
+#. type: Plain text
+#: cupsenable.8:59
+msgid "Uses the specified username when connecting to the server."
+msgstr "Verwendet den angegebenen Benutzernamen bei Verbindungen zum Server."
 
 #. type: TP
-#: cups-files.conf.man.in:119
+#: cupsenable.8:59 ipptool.1:154 lp.1:105
 #, no-wrap
-msgid "B<config>"
-msgstr "B<config>"
+msgid "B<-c>"
+msgstr "B<-c>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:122
-msgid "Configuration file syntax errors are fatal."
-msgstr "Syntaxfehler in der Konfigurationsdatei sind fatal."
+#: cupsenable.8:62
+msgid "Cancels all jobs on the named destination."
+msgstr "Bricht alle Aufträge auf dem benannten Ziel ab."
+
+#. type: Plain text
+#: cupsenable.8:65
+msgid "Uses the specified server and port."
+msgstr "Verwendet den angegebenen Server und Port."
 
 #. type: TP
-#: cups-files.conf.man.in:122
+#: cupsenable.8:65
 #, no-wrap
-msgid "B<listen>"
-msgstr "B<listen>"
+msgid "B<--hold>"
+msgstr "B<--hold>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:125
+#: cupsenable.8:69
 msgid ""
-"Listen or Port errors are fatal, except for IPv6 failures on the loopback or "
-"\"any\" addresses."
+"Holds remaining jobs on the named printer.  Useful for allowing the current "
+"job to complete before performing maintenance."
 msgstr ""
-"Fehler beim Warten auf Anfragen oder Port-Fehler sind fatal, außer IPv6-"
-"Fehler auf der Loopback- oder der »any«-Adresse."
+"Die verbleibenden Druckaufträge auf dem genannten Drucker anhalten. "
+"Nützlich, um dem aktuellen Druckauftrag die Fertigstellung zu erlauben, wenn "
+"danach Wartungsarbeiten durchgeführt werden sollen."
 
 #. type: TP
-#: cups-files.conf.man.in:125
+#: cupsenable.8:69
 #, no-wrap
-msgid "B<log>"
-msgstr "B<log>"
+msgid "B<-r \">I<reason>B<\">"
+msgstr "B<-r \">I<Grund>B<\">"
 
 #. type: Plain text
-#: cups-files.conf.man.in:128
-msgid "Log file creation or write errors are fatal."
-msgstr "Protokolldateierstellungs- oder -schreibfehler sind fatal."
+#: cupsenable.8:73
+msgid ""
+"Sets the message associated with the stopped state.  If no reason is "
+"specified then the message is set to \"Reason Unknown\"."
+msgstr ""
+"Setzt die dem Beendet-Zustand zugeordnete Nachricht. Falls kein Grund "
+"festgelegt ist, wird die Nachricht auf »Reason Unknown« gesetzt."
 
 #. type: TP
-#: cups-files.conf.man.in:128
+#: cupsenable.8:73
 #, no-wrap
-msgid "B<permissions>"
-msgstr "B<permissions>"
+msgid "B<--release>"
+msgstr "B<--release>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:131
+#: cupsenable.8:77
 msgid ""
-"Bad startup file permissions are fatal, for example shared TLS certificate "
-"and key files with world-read permissions."
+"Releases pending jobs for printing.  Use after running B<cupsdisable> with "
+"the I<--hold> option to resume printing."
 msgstr ""
-"Fehlerhafte Dateirechte bei Initialisierungsdateien sind fatal, "
-"beispielsweise gemeinsam benutzte TLS-Zertifikate und Schlüsseldateien mit "
-"Leserechten für alle."
+"Gibt wartende Aufträge zum Drucken frei. Benutzen Sie es nach der Ausführung "
+"von B<cupsdisable> mit der Option I<--hold>, um das Drucken fortzusetzen."
 
-#. type: TP
-#: cups-files.conf.man.in:133
-#, no-wrap
-msgid "B<Group >I<group-name-or-number>"
-msgstr "B<Group >I<Gruppenname-oder-Nummer>"
+#. type: Plain text
+#: cupsenable.8:80 lp.1:199 lpadmin.8:200
+msgid ""
+"Unlike the System V printing system, CUPS allows printer names to contain "
+"any printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer "
+"and class names are I<not> case-sensitive."
+msgstr ""
+"Anders als das System-V-Drucksystem erlaubt es CUPS, dass Druckernamen alle "
+"druckbaren Zeichen außer Leertaste, Tabulator, »/« und »#« enthalten. Auch "
+"sind Drucker- und Klassennamen I<unabhängig> von der Groß-/Kleinschreibung."
 
-#. #LogFilePerm
 #. type: Plain text
-#: cups-files.conf.man.in:138
+#: cupsenable.8:85
 msgid ""
-"Specifies the group name or ID that will be used when executing external "
-"programs.  The default group is operating system specific but is usually \"lp"
-"\" or \"nobody\"."
+"The System V versions of these commands are B<disable> and B<enable>, "
+"respectively.  They have been renamed to avoid conflicts with the "
+"B<bash>(1)  build-in commands of the same names."
 msgstr ""
-"Legt den Gruppenname oder deren ID, die bei der Ausführung externer "
-"Programme verwandt wird, fest. Die Vorgabegruppe ist abhängig vom "
-"Betriebssystem; gewöhnlich ist sie »lp« oder »nobody«."
+"Die System-V-Versionen dieser Befehle sind B<disable> und B<enable>. Sie "
+"wurden umbenannt, um Konflikte mit den eingebauten Befehlen gleichen Namens "
+"der B<bash>(1) zu vermeiden."
 
-#. type: TP
-#: cups-files.conf.man.in:138
+#. type: Plain text
+#: cupsenable.8:88
+msgid ""
+"The CUPS versions of B<disable> and B<enable> may ask the user for an access "
+"password depending on the printing system configuration.  This differs from "
+"the System V versions which require the root user to execute these commands."
+msgstr ""
+"Die CUPS-Versionen von B<disable> und B<enable> könnten den Benutzer, "
+"abhängig von der Konfiguration des Drucksystems, nach einem Zugriffspasswort "
+"fragen. Dies unterscheidet sich von der System-V-Version, die verlangt, dass "
+"der Benutzer »root« diese Befehle ausführt."
+
+#. type: Plain text
+#: cupsenable.8:96
+msgid ""
+"B<cupsaccept>(8), B<cupsreject>(8), B<cancel>(1), B<lp>(1), B<lpadmin>(8), "
+"B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
+msgstr ""
+"B<cupsaccept>(8), B<cupsreject>(8), B<cancel>(1), B<lp>(1), B<lpadmin>(8), "
+"B<lpstat>(1), CUPS-Online-Hilfe (http://localhost:631/help)"
+
+#. type: TH
+#: cups-files.conf.5:10
 #, no-wrap
-msgid "B<LogFilePerm >I<mode>"
-msgstr "B<LogFilePerm >I<Modus>"
+msgid "cups-files.conf"
+msgstr "cups-files.conf"
+
+#. type: Plain text
+#: cups-files.conf.5:13
+msgid "cups-files.conf - file and directory configuration file for cups"
+msgstr "cups-files.conf - Datei- und Verzeichnis-Konfigurationsdatei für CUPS"
 
-#. #PageLog
 #. type: Plain text
-#: cups-files.conf.man.in:143
+#: cups-files.conf.5:17
 msgid ""
-"Specifies the permissions of all log files that the scheduler writes.  The "
-"default is \"0644\"."
+"The B<cups-files.conf> file configures the files and directories used by the "
+"CUPS scheduler, B<cupsd>(8).  It is normally located in the I</etc/cups> "
+"directory."
 msgstr ""
-"Legt die Rechte für alle vom Auftragsplaner (Scheduler) geschriebenen "
-"Protokolldateien fest. Die Vorgabe ist »0644«."
+"Die Datei B<cups-files.conf> konfiguriert die von dem CUPS-Auftragsplaner "
+"(Scheduler), B<cupsd>(8) verwandten Dateien und Verzeichnisse. Sie befindet "
+"sich normalerweise im Verzeichnis I</etc/cups>."
+
+#. type: Plain text
+#: cups-files.conf.5:22 mailto.conf.5:20
+msgid ""
+"Each line in the file can be a configuration directive, a blank line, or a "
+"comment.  Configuration directives typically consist of a name and zero or "
+"more values separated by whitespace.  The configuration directive name and "
+"values are case-insensitive.  Comment lines start with the # character."
+msgstr ""
+"Jede Zeile in der Datei kann eine Konfigurationsdirektive, eine leere Zeile "
+"oder ein Kommentar sein. Konfigurationsdirektiven bestehen typischerweise "
+"aus einem Namen und keinem oder mehren, durch Leerzeichen getrennten Werten. "
+"Die Groß- und Kleinschreibung der Namen und Werte der "
+"Konfigurationsdirektiven ist nicht relevant. Kommentarzeilen beginnen mit "
+"dem Zeichen »#«. "
+
+#. #AccessLog
+#. type: Plain text
+#: cups-files.conf.5:26
+msgid "The following directives are understood by B<cupsd>(8):"
+msgstr "Die nachfolgenden Direktiven werden von B<cupsd>(8) verstanden:"
 
 #. type: TP
-#: cups-files.conf.man.in:143
+#: cups-files.conf.5:26
 #, no-wrap
-msgid "B<PageLog >[ I<filename> ]"
-msgstr "B<PageLog >[ I<Dateiname> ]"
+msgid "B<AccessLog>"
+msgstr "B<AccessLog>"
 
 #. type: TP
-#: cups-files.conf.man.in:145
+#: cups-files.conf.5:28
 #, no-wrap
-msgid "B<PageLog stderr>"
-msgstr "B<PageLog stderr>"
+msgid "B<AccessLog >I<filename>"
+msgstr "B<AccessLog >I<Dateiname>"
 
 #. type: TP
-#: cups-files.conf.man.in:147
+#: cups-files.conf.5:30
 #, no-wrap
-msgid "B<PageLog syslog>"
-msgstr "B<PageLog syslog>"
+msgid "B<AccessLog stderr>"
+msgstr "B<AccessLog stderr>"
+
+#. type: TP
+#: cups-files.conf.5:32
+#, no-wrap
+msgid "B<AccessLog syslog>"
+msgstr "B<AccessLog syslog>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:154
+#: cups-files.conf.5:39
 msgid ""
-"Defines the page log filename.  The value \"stderr\" causes log entries to "
-"be sent to the standard error file when the scheduler is running in the "
-"foreground, or to the system log daemon when run in the background.  The "
-"value \"syslog\" causes log entries to be sent to the system log daemon.  "
-"Specifying a blank filename disables page log generation.  The server name "
+"Defines the access log filename.  Specifying a blank filename disables "
+"access log generation.  The value \"stderr\" causes log entries to be sent "
+"to the standard error file when the scheduler is running in the foreground, "
+"or to the system log daemon when run in the background.  The value \"syslog"
+"\" causes log entries to be sent to the system log daemon.  The server name "
 "may be included in filenames using the string \"%s\", for example:"
 msgstr ""
-"Definiert den Namen der Fehlerprotokolldatei. Der Wert »stderr« führt dazu, "
-"dass Protokolleinträge an die Standardfehlerdatei gesandt werden, wenn der "
-"Auftragsplaner im Vordergrund läuft oder zum Systemprotokollier-Daemon, wenn "
-"er im Hintergrund läuft. Der Wert »syslog« führt dazu, dass die "
-"Protokolleinträge zum Systemprotokoll-Daemon gesandt werden. Durch Angabe "
-"eines leeren Dateinamens wird die Fehlerprotokollierung deaktiviert. Mittels "
-"der Zeichenkette »%s« kann der Servername in Dateinamen eingebettet werden, "
-"z.B.:"
+"Definiert den Namen der Zugriffsprotokolldatei. Durch Angabe eines leeren "
+"Dateinamens wird die Protokollierung deaktiviert. Der Wert »stderr« führt "
+"dazu, dass Protokolleinträge an die Standardfehlerdatei gesandt werden, wenn "
+"der Auftragsplaner im Vordergrund läuft oder zum Systemprotokollier-Daemon, "
+"wenn er im Hintergrund läuft. Der Wert »syslog« führt dazu, dass die "
+"Protokolleinträge zum Systemprotokoll-Daemon gesandt werden. Mittels der "
+"Zeichenkette »%s« kann der Servername in Dateinamen eingebettet werden, z.B.:"
 
 #. type: Plain text
-#: cups-files.conf.man.in:157
+#: cups-files.conf.5:42
 #, no-wrap
-msgid "    PageLog /var/log/cups/%s-page_log\n"
-msgstr "    PageLog /var/log/cups/%s-page_log\n"
+msgid "    AccessLog /var/log/cups/%s-access_log\n"
+msgstr "    AccessLog /var/log/cups/%s-access_log\n"
 
-#. #PassEnv
+#. #CacheDir
 #. type: Plain text
-#: cups-files.conf.man.in:161
-msgid "The default is \"/var/log/cups/page_log\"."
-msgstr "Die Vorgabe ist »/var/log/cups/page_log«."
+#: cups-files.conf.5:46
+msgid "The default is \"/var/log/cups/access_log\"."
+msgstr "Die Vorgabe ist »/var/log/cups/access_log«."
 
 #. type: TP
-#: cups-files.conf.man.in:161
+#: cups-files.conf.5:46
 #, no-wrap
-msgid "B<PassEnv >I<variable >[ ... I<variable >]"
-msgstr "B<PassEnv >I<Variable >[ … I<Variable >]"
+msgid "B<CacheDir >I<directory>"
+msgstr "B<CacheDir >I<Verzeichnis>"
 
-#. #RemoteRoot
+#. #ConfigFilePerm
 #. type: Plain text
-#: cups-files.conf.man.in:166
+#: cups-files.conf.5:51
 msgid ""
-"Passes the specified environment variable(s) to child processes.  Note: the "
-"standard CUPS filter and backend environment variables cannot be overridden "
-"using this directive."
+"Specifies the directory to use for long-lived temporary (cache) files.  The "
+"default is \"/var/spool/cups/cache\" or \"/var/cache/cups\" depending on the "
+"platform."
 msgstr ""
-"Übergibt die festgelegten Umgebungsvariable(n) an Kindprozesse. Hinweis: die "
-"Standard-CUPS-Filter und -Backend-Umgebungsvariablen können mit dieser "
-"Direktive nicht außer Kraft gesetzt werden."
+"Legt das für langlebige temporäre (Zwischenspeicher-)Dateien zu verwendene "
+"Verzeichnis fest. Die Vorgabe ist »/var/spool/cups/cache« oder »/var/cache/"
+"cups«, abhängig von der Plattform."
 
 #. type: TP
-#: cups-files.conf.man.in:166
+#: cups-files.conf.5:51
 #, no-wrap
-msgid "B<RemoteRoot >I<username>"
-msgstr "B<RemoteRoot >I<Benutzername>"
+msgid "B<ConfigFilePerm >I<mode>"
+msgstr "B<ConfigFilePerm >I<Modus>"
 
-#. #RequestRoot
 #. type: Plain text
-#: cups-files.conf.man.in:171
+#: cups-files.conf.5:55
 msgid ""
-"Specifies the username that is associated with unauthenticated accesses by "
-"clients claiming to be the root user.  The default is \"remroot\"."
+"Specifies the permissions for all configuration files that the scheduler "
+"writes.  The default is \"0644\" on macOS and \"0640\" on all other "
+"operating systems."
 msgstr ""
-"Legt den Benutzernamen, der mit nicht-authentifiziertem Zugang durch "
-"Clients, die vorgeben, der Benutzer »root« zu sein, assoziiert ist, fest. "
-"Die Vorgabe ist »remroot«."
-
-#. type: TP
-#: cups-files.conf.man.in:171
-#, no-wrap
-msgid "B<RequestRoot >I<directory>"
-msgstr "B<RequestRoot >I<Verzeichnis>"
+"Legt die Rechte für alle vom Auftragsplaner (Scheduler) geschriebenen "
+"Konfigurationsdateien fest. Die Vorgabe ist »0644« unter macOS und »0640« "
+"unter allen anderen Betriebssystemen."
 
-#. #Sandboxing
+#. #CreateSelfSignedCerts
 #. type: Plain text
-#: cups-files.conf.man.in:176
+#: cups-files.conf.5:60
 msgid ""
-"Specifies the directory that contains print jobs and other HTTP request "
-"data.  The default is \"/var/spool/cups\"."
+"B<Note:> The permissions for the I<printers.conf> file are currently masked "
+"to only allow access from the scheduler user (typically root).  This is done "
+"because printer device URIs sometimes contain sensitive authentication "
+"information that should not be generally known on the system.  There is no "
+"way to disable this security feature."
 msgstr ""
-"Legt das Verzeichnis, in dem Druckaufträge und andere HTTP-Anfragedaten "
-"enthalten sind, fest. Die Vorgabe ist »/var/spool/cups«."
+"B<Hinweis>: Die Rechte für die Datei I<printers.conf> werden derzeit "
+"maskiert, um nur dem Benutzer des Auftragsplaners (typischerweise root) den "
+"Zugriff zu erlauben. Dies erfolgt, da einige Druckergeräte-URIs manchmal "
+"schützenswerte Anmeldeinformationen enthalten, die im System nicht allgemein "
+"bekannt sein sollen. Es ist nicht möglich, diese Sicherheitsfunktionalität "
+"zu deaktivieren."
 
 #. type: TP
-#: cups-files.conf.man.in:176
+#: cups-files.conf.5:60
 #, no-wrap
-msgid "B<Sandboxing relaxed>"
-msgstr "B<Sandboxing relaxed>"
+msgid "B<CreateSelfSignedCerts yes>"
+msgstr "B<CreateSelfSignedCerts yes>"
 
 #. type: TP
-#: cups-files.conf.man.in:178
+#: cups-files.conf.5:62
 #, no-wrap
-msgid "B<Sandboxing strict>"
-msgstr "B<Sandboxing strict>"
+msgid "B<CreateSelfSignedCerts no>"
+msgstr "B<CreateSelfSignedCerts no>"
 
-#. #ServerBin
+#. #DataDir
 #. type: Plain text
-#: cups-files.conf.man.in:184
+#: cups-files.conf.5:67
 msgid ""
-"Specifies the level of security sandboxing that is applied to print filters, "
-"backends, and other child processes of the scheduler.  The default is "
-"\"strict\".  This directive is currently only used/supported on macOS."
+"Specifies whether the scheduler automatically creates self-signed "
+"certificates for client connections using TLS.  The default is yes."
 msgstr ""
-"Legt die Sicherheitsstufe für die Sandbox fest, die auf Druckfilter, "
-"Backends und andere Kindprozesse des Auftragsplaners angewandt werden soll. "
-"Die Vorgabe ist »strict«. Diese Direktive wird derzeit nur unter macOS "
-"verwandt/unterstützt."
+"Legt fest, ob der Auftragsplaner automatisch selbstsignierte Zertifikate für "
+"die Clientverbindungen mittels TLS erzeugt. Die Vorgabe ist »yes«."
 
 #. type: TP
-#: cups-files.conf.man.in:184
+#: cups-files.conf.5:67
 #, no-wrap
-msgid "B<ServerBin >I<directory>"
-msgstr "B<ServerBin >I<Verzeichnis>"
+msgid "B<DataDir >I<path>"
+msgstr "B<DataDir >I<Pfad>"
 
-#. #ServerKeychain
+#. #DocumentRoot
 #. type: Plain text
-#: cups-files.conf.man.in:189
+#: cups-files.conf.5:72
 msgid ""
-"Specifies the directory containing the backends, CGI programs, filters, "
-"helper programs, notifiers, and port monitors.  The default is \"/usr/lib/"
-"cups\" or \"/usr/libexec/cups\" depending on the platform."
+"Specifies the directory where data files can be found.  The default is "
+"usually \"/usr/share/cups\"."
 msgstr ""
-"Legt das Verzeichnis, das die Backends, CGI-Programme, Filter, "
-"Helferprogramme, Benachrichtiger und Port-Monitore enthält, fest. Die "
-"Vorgabe ist »/usr/lib/cups« oder »/usr/libexec/cups«, abhängig von der "
-"Plattform."
+"Legt das Verzeichnis, in dem Datendateien gefunden werden können, fest. Die "
+"Vorgabe ist normalerweise »/usr/share/cups«."
 
 #. type: TP
-#: cups-files.conf.man.in:189
+#: cups-files.conf.5:72
 #, no-wrap
-msgid "B<ServerKeychain >I<path>"
-msgstr "B<ServerKeychain >I<Pfad>"
+msgid "B<DocumentRoot >I<directory>"
+msgstr "B<DocumentRoot >I<Verzeichnis>"
 
-#. #ServerRoot
+#. #ErrorLog
 #. type: Plain text
-#: cups-files.conf.man.in:195
+#: cups-files.conf.5:77
 msgid ""
-"Specifies the location of TLS certificates and private keys.  The default is "
-"\"/Library/Keychains/System.keychain\" on macOS and \"/etc/cups/ssl\" on all "
-"other operating systems.  macOS uses its keychain database to store "
-"certificates and keys while other platforms use separate files in the "
-"specified directory, *.crt for PEM-encoded certificates and *.key for PEM-"
-"encoded private keys."
+"Specifies the root directory for the CUPS web interface content.  The "
+"default is usually \"/usr/share/doc/cups\"."
 msgstr ""
-"Legt den Ort der TLS-Zertifikate und privaten Schlüssel fest. Die Vorgabe "
-"ist »/Library/Keychains/System.keychain« unter macOS und »/etc/cups/ssl« auf "
-"allen anderen Betriebssystemen. MacOS verwendet die Schlüsselring-Datenbank, "
-"um Zertifikate und Schlüssel zu speichern, während andere Plattformen "
-"einzelne Dateien in dem angegebenen Verzeichnis, *.crt für PEM-kodierte "
-"Zertifikate und *.key für PEM-kodierte private Schlüssel verwenden."
+"Legt das Wurzelverzeichnis für den Inhalt der CUPS-Weboberfläche fest. Die "
+"Vorgabe ist normalerweise »/usr/share/doc/cups«."
 
 #. type: TP
-#: cups-files.conf.man.in:195
+#: cups-files.conf.5:77
 #, no-wrap
-msgid "B<ServerRoot >I<directory>"
-msgstr "B<ServerRoot >I<Verzeichnis>"
+msgid "B<ErrorLog>"
+msgstr "B<ErrorLog>"
 
-#. #SetEnv
-#. type: Plain text
-#: cups-files.conf.man.in:200
-msgid ""
-"Specifies the directory containing the server configuration files.  The "
-"default is \"/etc/cups\"."
-msgstr ""
-"Legt das Verzeichnis, in dem die Serverkonfiguration enthalten ist, fest. "
-"Die Vorgabe ist »/etc/cups«."
+#. type: TP
+#: cups-files.conf.5:79
+#, no-wrap
+msgid "B<ErrorLog >I<filename>"
+msgstr "B<ErrorLog >I<Dateiname>"
 
 #. type: TP
-#: cups-files.conf.man.in:200
+#: cups-files.conf.5:81
 #, no-wrap
-msgid "B<SetEnv >I<variable value>"
-msgstr "B<SetEnv >I<Variable Wert>"
+msgid "B<ErrorLog stderr>"
+msgstr "B<ErrorLog stderr>"
+
+#. type: TP
+#: cups-files.conf.5:83
+#, no-wrap
+msgid "B<ErrorLog syslog>"
+msgstr "B<ErrorLog syslog>"
 
-#. #StateDir
 #. type: Plain text
-#: cups-files.conf.man.in:205
+#: cups-files.conf.5:90
 msgid ""
-"Set the specified environment variable to be passed to child processes.  "
-"Note: the standard CUPS filter and backend environment variables cannot be "
-"overridden using this directive."
+"Defines the error log filename.  Specifying a blank filename disables error "
+"log generation.  The value \"stderr\" causes log entries to be sent to the "
+"standard error file when the scheduler is running in the foreground, or to "
+"the system log daemon when run in the background.  The value \"syslog\" "
+"causes log entries to be sent to the system log daemon.  The server name may "
+"be included in filenames using the string \"%s\", for example:"
 msgstr ""
-"Setzt die festgelegte Umgebungsvariable, die an Kindprozesse weitergegeben "
-"werden soll. Hinweis: die Standard-CUPS-Filter und -Backend-"
-"Umgebungsvariablen können mit dieser Direktive nicht außer Kraft gesetzt "
-"werden."
+"Definiert den Namen der Fehlerprotokolldatei. Durch Angabe eines leeren "
+"Dateinamens wird die Fehlerprotokollierung deaktiviert. Der Wert »stderr« "
+"führt dazu, dass Protokolleinträge an die Standardfehlerdatei gesandt "
+"werden, wenn der Auftragsplaner im Vordergrund läuft oder zum "
+"Systemprotokollier-Daemon, wenn er im Hintergrund läuft. Der Wert »syslog« "
+"führt dazu, dass die Protokolleinträge zum Systemprotokoll-Daemon gesandt "
+"werden. Mittels der Zeichenkette »%s« kann der Servername in Dateinamen "
+"eingebettet werden, z.B.:"
 
-#. type: TP
-#: cups-files.conf.man.in:205
+#. type: Plain text
+#: cups-files.conf.5:93
 #, no-wrap
-msgid "B<StateDir >I<directory>"
-msgstr "B<StateDir >I<Verzeichnis>"
+msgid "    ErrorLog /var/log/cups/%s-error_log\n"
+msgstr "    ErrorLog /var/log/cups/%s-error_log\n"
 
-#. #SyncOnClose
+#. #FatalErrors
 #. type: Plain text
-#: cups-files.conf.man.in:210
-msgid ""
-"Specifies the directory to use for PID and local certificate files.  The "
-"default is \"/var/run/cups\" or \"/etc/cups\" depending on the platform."
-msgstr ""
-"Legt das für PID- und lokale Zertifikatdateien zu verwendene Verzeichnis "
-"fest. Die Vorgabe ist »/var/run/cups« oder »/etc/cups«, abhängig von der "
-"Plattform."
+#: cups-files.conf.5:97
+msgid "The default is \"/var/log/cups/error_log\"."
+msgstr "Die Vorgabe ist »/var/log/cups/error_log«."
 
 #. type: TP
-#: cups-files.conf.man.in:210
+#: cups-files.conf.5:97
 #, no-wrap
-msgid "B<SyncOnClose Yes>"
-msgstr "B<SyncOnClose Yes>"
+msgid "B<FatalErrors none>"
+msgstr "B<FatalErrors none>"
 
 #. type: TP
-#: cups-files.conf.man.in:212
+#: cups-files.conf.5:99
 #, no-wrap
-msgid "B<SyncOnClose No>"
-msgstr "B<SyncOnClose No>"
-
-#. #SystemGroup
-#. type: Plain text
-#: cups-files.conf.man.in:219
-msgid ""
-"Specifies whether the scheduler calls B<fsync>(2)  after writing "
-"configuration or state files.  The default is \"Yes\"."
-msgstr ""
-"Legt fest, ob der Auftragsplaner nach dem Schreiben der Konfigurations- oder "
-"Zustandsdateien B<fsync>(2) aufruft. Die Vorgabe ist »Yes«."
+msgid "B<FatalErrors all >I<-kind >[ ... I<-kind >]"
+msgstr "B<FatalErrors all >I<-Art >[ … I<-Art >]"
 
 #. type: TP
-#: cups-files.conf.man.in:219
+#: cups-files.conf.5:101
 #, no-wrap
-msgid "B<SystemGroup >I<group-name >[ ... I<group-name> ]"
-msgstr "B<SystemGroup >I<Gruppenname >[ … I<Gruppenname> ]"
+msgid "B<FatalErrors >I<kind >[ ... I<kind >]"
+msgstr "B<FatalErrors >I<Art >[ … I<Art >]"
 
-#. #TempDir
 #. type: Plain text
-#: cups-files.conf.man.in:224
+#: cups-files.conf.5:106
 msgid ""
-"Specifies the group(s) to use for I<@SYSTEM> group authentication.  The "
-"default contains \"admin\", \"lpadmin\", \"root\", \"sys\", and/or \"system"
-"\"."
+"Specifies which errors are fatal, causing the scheduler to exit.  The "
+"default is \"config\".  The I<kind> strings are:"
 msgstr ""
-"Legt die Gruppe(n), die für I<@SYSTEM>-Gruppenauthentifizierung verwendet "
-"werden, fest. Die Vorgabe enthält »admin«, »lpadmin«, »root«, »sys« und/oder "
-"»system«."
+"Gibt an, welche Fehler fatal sind und den Zeitplaner zum Beenden "
+"veranlassen. Die Vorgabe ist »config«. I<Art> kann einer der folgenden "
+"Zeichenketten sein:"
 
 #. type: TP
-#: cups-files.conf.man.in:224
+#: cups-files.conf.5:107
 #, no-wrap
-msgid "B<TempDir >I<directory>"
-msgstr "B<TempDir >I<Verzeichnis>"
+msgid "B<none>"
+msgstr "B<none>"
 
-#. #User
 #. type: Plain text
-#: cups-files.conf.man.in:229
-msgid ""
-"Specifies the directory where short-term temporary files are stored.  The "
-"default is \"/var/spool/cups/tmp\"."
-msgstr ""
-"Legt das Verzeichnis, in dem kurzlebige temporäre Dateien gespeichert "
-"werden, fest. Die Vorgabe ist »/var/spool/cups/tmp«."
+#: cups-files.conf.5:110
+msgid "No errors are fatal."
+msgstr "Keine Fehler sind fatal."
 
 #. type: TP
-#: cups-files.conf.man.in:229
+#: cups-files.conf.5:110
 #, no-wrap
-msgid "B<User >I<username>"
-msgstr "B<User >I<Benutzername>"
+msgid "B<all>"
+msgstr "B<all>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:233
-msgid ""
-"Specifies the user name or ID that is used when running external programs.  "
-"The default is \"lp\"."
-msgstr ""
-"Legt den Benutzernamen oder die ID, die bei der Ausführung externer "
-"Programme verwandt wird, fest. Die Vorgabe ist »lp«."
+#: cups-files.conf.5:113
+msgid "All of the errors below are fatal."
+msgstr "Alle der weiter unten aufgeführten Fehler sind fatal."
+
+#. type: TP
+#: cups-files.conf.5:113
+#, no-wrap
+msgid "B<browse>"
+msgstr "B<browse>"
 
-#. #FileDevice
 #. type: Plain text
-#: cups-files.conf.man.in:236
+#: cups-files.conf.5:116
 msgid ""
-"The following directives are deprecated and will be removed from a future "
-"version of CUPS:"
+"Browsing initialization errors are fatal, for example failed connections to "
+"the DNS-SD daemon."
 msgstr ""
-"I<Die nachfolgenden Direktiven sind veraltet und werden in einer zukünftigen "
-"Version von CUPS entfernt werden>:"
+"Initialisierungsfehler beim Browsing sind fatal, beispielsweise "
+"fehlgeschlagene Verbindungen zu dem DNS-SD-Daemon."
 
 #. type: TP
-#: cups-files.conf.man.in:236
+#: cups-files.conf.5:116
 #, no-wrap
-msgid "B<FileDevice Yes>"
-msgstr "B<FileDevice Yes>"
+msgid "B<config>"
+msgstr "B<config>"
+
+#. type: Plain text
+#: cups-files.conf.5:119
+msgid "Configuration file syntax errors are fatal."
+msgstr "Syntaxfehler in der Konfigurationsdatei sind fatal."
 
 #. type: TP
-#: cups-files.conf.man.in:238
+#: cups-files.conf.5:119
 #, no-wrap
-msgid "B<FileDevice No>"
-msgstr "B<FileDevice No>"
+msgid "B<listen>"
+msgstr "B<listen>"
 
-#. #FontPath
 #. type: Plain text
-#: cups-files.conf.man.in:246
+#: cups-files.conf.5:122
 msgid ""
-"Specifies whether the file pseudo-device can be used for new printer "
-"queues.  The URI \"file:///dev/null\" is always allowed.  File devices "
-"cannot be used with \"raw\" print queues - a PPD file is required.  The "
-"specified file is overwritten for every print job.  Writing to directories "
-"is not supported."
+"Listen or Port errors are fatal, except for IPv6 failures on the loopback or "
+"\"any\" addresses."
 msgstr ""
-"gibt an, ob die Datei-Pseudo-Geräte für neue Druckerwarteschlangen verwandt "
-"werden können. Die URI »file:///dev/null« ist immer erlaubt. Datei-Geräte "
-"können nicht mit »rohen« Warteschlangen verwandt werden - eine PPD-Datei ist "
-"notwendig. Die angegebene Datei wird für jeden Druckauftrag überschrieben. "
-"Schreiben in Verzeichnisse wird nicht unterstützt."
+"Fehler beim Warten auf Anfragen oder Port-Fehler sind fatal, außer IPv6-"
+"Fehler auf der Loopback- oder der »any«-Adresse."
 
 #. type: TP
-#: cups-files.conf.man.in:246
+#: cups-files.conf.5:122
 #, no-wrap
-msgid "B<FontPath >I<directory[:...:directoryN]>"
-msgstr "B<FontPath >I<Verzeichnis[:…:VerzeichnisN]>"
+msgid "B<log>"
+msgstr "B<log>"
 
-#. #LPDConfigFile
 #. type: Plain text
-#: cups-files.conf.man.in:254
-msgid ""
-"Specifies a colon separated list of directories where fonts can be found.  "
-"On Linux the B<font-config>(1)  mechanism is used instead.  On macOS the "
-"Font Book application manages system-installed fonts."
-msgstr ""
-"gibt eine Doppelpunkt-getrennte Liste von Verzeichnissen an, in denen "
-"Schriften gefunden werden können. Unter Linux wird stattdessen der "
-"Mechanismus B<font-config>(1) verwandt. Unter macOS verwaltet die Anwendung "
-"Font Book die systemweit installierten Schriften."
+#: cups-files.conf.5:125
+msgid "Log file creation or write errors are fatal."
+msgstr "Protokolldateierstellungs- oder -schreibfehler sind fatal."
 
 #. type: TP
-#: cups-files.conf.man.in:254
+#: cups-files.conf.5:125
 #, no-wrap
-msgid " B<LPDConfigFile >I<filename>"
-msgstr " B<LPDConfigFile >I<Dateiname>"
+msgid "B<permissions>"
+msgstr "B<permissions>"
 
-#. #Printcap
 #. type: Plain text
-#: cups-files.conf.man.in:258
-msgid "Specifies the LPD service configuration file to update."
-msgstr "Gibt die zu aktualisierende LPD-Dienstekonfigurationsdatei an."
+#: cups-files.conf.5:128
+msgid ""
+"Bad startup file permissions are fatal, for example shared TLS certificate "
+"and key files with world-read permissions."
+msgstr ""
+"Fehlerhafte Dateirechte bei Initialisierungsdateien sind fatal, "
+"beispielsweise gemeinsam benutzte TLS-Zertifikate und Schlüsseldateien mit "
+"Leserechten für alle."
 
 #. type: TP
-#: cups-files.conf.man.in:258
+#: cups-files.conf.5:130
 #, no-wrap
-msgid "B<Printcap >I<filename>"
-msgstr "B<Printcap >I<Dateiname>"
+msgid "B<Group >I<group-name-or-number>"
+msgstr "B<Group >I<Gruppenname-oder-Nummer>"
 
-#. #PrintcapFormat
+#. #LogFilePerm
 #. type: Plain text
-#: cups-files.conf.man.in:262
-msgid "Specifies a file that is filled with a list of local print queues."
+#: cups-files.conf.5:135
+msgid ""
+"Specifies the group name or ID that will be used when executing external "
+"programs.  The default group is operating system specific but is usually \"lp"
+"\" or \"nobody\"."
 msgstr ""
-"Gibt eine Datei an, die mit einer Liste von lokalen Druckerwarteschlangen "
-"gefüllt werden soll."
-
-#. type: TP
-#: cups-files.conf.man.in:262
-#, no-wrap
-msgid "B<PrintcapFormat bsd>"
-msgstr "B<PrintcapFormat bsd>"
-
-#. type: TP
-#: cups-files.conf.man.in:264
-#, no-wrap
-msgid "B<PrintcapFormat plist>"
-msgstr "B<PrintcapFormat plist>"
+"Legt den Gruppenname oder deren ID, die bei der Ausführung externer "
+"Programme verwandt wird, fest. Die Vorgabegruppe ist abhängig vom "
+"Betriebssystem; gewöhnlich ist sie »lp« oder »nobody«."
 
 #. type: TP
-#: cups-files.conf.man.in:266
+#: cups-files.conf.5:135
 #, no-wrap
-msgid "B<PrintcapFormat solaris>"
-msgstr "B<PrintcapFormat solaris>"
+msgid "B<LogFilePerm >I<mode>"
+msgstr "B<LogFilePerm >I<Modus>"
 
-#. #SMBConfigFile
+#. #PageLog
 #. type: Plain text
-#: cups-files.conf.man.in:273
+#: cups-files.conf.5:140
 msgid ""
-"Specifies the format to use for the Printcap file.  \"bsd\" is the "
-"historical LPD printcap file format.  \"plist\" is the Apple plist file "
-"format.  \"solaris\" is the historical Solaris LPD printcap file format."
+"Specifies the permissions of all log files that the scheduler writes.  The "
+"default is \"0644\"."
 msgstr ""
-"Gibt das für die Printcap-Datei zu verwendende Format an. »bsd« ist das "
-"historische LPD-Printcap-Dateiformat. »plist« ist das Apple-Plist-"
-"Dateiformat. »solaris« ist das historische Solaris-LPD-Printcap-Dateiformat."
+"Legt die Rechte für alle vom Auftragsplaner (Scheduler) geschriebenen "
+"Protokolldateien fest. Die Vorgabe ist »0644«."
 
 #. type: TP
-#: cups-files.conf.man.in:273
+#: cups-files.conf.5:140
 #, no-wrap
-msgid "B<SMBConfigFile >I<filename>"
-msgstr "B<SMBConfigFile >I<Dateiname>"
-
-#. type: Plain text
-#: cups-files.conf.man.in:276
-msgid "Specifies the SMB service configuration file to update."
-msgstr "Gibt die zu aktualisierende SMB-Dienstekonfigurationsdatei an."
+msgid "B<PageLog >[ I<filename> ]"
+msgstr "B<PageLog >[ I<Dateiname> ]"
 
-#. type: Plain text
-#: cups-files.conf.man.in:286
-msgid ""
-"B<classes.conf>(5), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), B<mime."
-"convs>(5), B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), "
-"CUPS Online Help (http://localhost:631/help)"
-msgstr ""
-"B<classes.conf>(5), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), B<mime."
-"convs>(5), B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), "
-"CUPS-Online-Hilfe (http://localhost:631/help)"
+#. type: TP
+#: cups-files.conf.5:142
+#, no-wrap
+msgid "B<PageLog stderr>"
+msgstr "B<PageLog stderr>"
 
-#. type: TH
-#: cupsfilter.man:12
+#. type: TP
+#: cups-files.conf.5:144
 #, no-wrap
-msgid "cupsfilter"
-msgstr "cupsfilter"
+msgid "B<PageLog syslog>"
+msgstr "B<PageLog syslog>"
 
 #. type: Plain text
-#: cupsfilter.man:15
-#, fuzzy
-msgid "cupsfilter - convert a file to another format using cups filters"
+#: cups-files.conf.5:151
+msgid ""
+"Defines the page log filename.  The value \"stderr\" causes log entries to "
+"be sent to the standard error file when the scheduler is running in the "
+"foreground, or to the system log daemon when run in the background.  The "
+"value \"syslog\" causes log entries to be sent to the system log daemon.  "
+"Specifying a blank filename disables page log generation.  The server name "
+"may be included in filenames using the string \"%s\", for example:"
 msgstr ""
-"cupsfilter - konvertiere eine Datei in ein anderes Format mittels CUPS-Filter"
+"Definiert den Namen der Fehlerprotokolldatei. Der Wert »stderr« führt dazu, "
+"dass Protokolleinträge an die Standardfehlerdatei gesandt werden, wenn der "
+"Auftragsplaner im Vordergrund läuft oder zum Systemprotokollier-Daemon, wenn "
+"er im Hintergrund läuft. Der Wert »syslog« führt dazu, dass die "
+"Protokolleinträge zum Systemprotokoll-Daemon gesandt werden. Durch Angabe "
+"eines leeren Dateinamens wird die Fehlerprotokollierung deaktiviert. Mittels "
+"der Zeichenkette »%s« kann der Servername in Dateinamen eingebettet werden, "
+"z.B.:"
 
 #. type: Plain text
-#: cupsfilter.man:57
-msgid ""
-"B<cupsfilter> [ B<--list-filters> ] [ B<-D> ] [ B<-U> I<user> ] [ B<-c> "
-"I<config-file> ] [ B<-d> I<printer> ] [ B<-e> ] [ B<-i> I<mime/type> ] [ B<-"
-"j> I<job-id[,N]> ] [ B<-m> I<mime/type> ] [ B<-n> I<copies> ] [ B<-o> "
-"I<name=value> ] [ B<-p> I<filename.ppd> ] [ B<-t> I<title> ] [ B<-u> ] "
-"I<filename>"
-msgstr ""
-"B<cupsfilter> [ B<--list-filters> ] [ B<-D> ] [ B<-U> I<Benutzer> ] [ B<-c> "
-"I<Konfig-Datei> ] [ B<-d> I<Drucker> ] [ B<-e> ] [ B<-i> I<MIME/typ> ] [ B<-"
-"j> I<Auftrags-ID[,N]> ] [ B<-m> I<MIME/typ> ] [ B<-n> I<Kopien> ] [ B<-o> "
-"I<Name=Wert> ] [ B<-p> I<Dateiname.ppd> ] [ B<-t> I<Titel> ] [ B<-u> ] "
-"I<Dateiname>"
+#: cups-files.conf.5:154
+#, no-wrap
+msgid "    PageLog /var/log/cups/%s-page_log\n"
+msgstr "    PageLog /var/log/cups/%s-page_log\n"
 
+#. #PassEnv
 #. type: Plain text
-#: cupsfilter.man:62
-msgid ""
-"B<cupsfilter> is a front-end to the CUPS filter subsystem which allows you "
-"to convert a file to a specific format, just as if you had printed the file "
-"through CUPS. By default, B<cupsfilter> generates a PDF file. The converted "
-"file is sent to the standard output."
-msgstr ""
-"B<cupsfilter> ist eine Oberfläche für das CUPS-Filter-Subsystem, das es "
-"erlaubt, eine Datei in ein spezielles Format umzuwandeln, als ob Sie diese "
-"Datei mittels CUPS gedruckt hätten. Standardmäßig erzeugt B<cupsfilter> eine "
-"PDF-Datei. Die konvertierte Datei wird zur Standardausgabe geschickt."
+#: cups-files.conf.5:158
+msgid "The default is \"/var/log/cups/page_log\"."
+msgstr "Die Vorgabe ist »/var/log/cups/page_log«."
 
 #. type: TP
-#: cupsfilter.man:63
+#: cups-files.conf.5:158
 #, no-wrap
-msgid "B<--list-filters>"
-msgstr "B<--list-filters>"
+msgid "B<PassEnv >I<variable >[ ... I<variable >]"
+msgstr "B<PassEnv >I<Variable >[ … I<Variable >]"
 
+#. #RemoteRoot
 #. type: Plain text
-#: cupsfilter.man:66
-msgid "Do not actually run the filters, just print the filters used to stdout."
+#: cups-files.conf.5:163
+msgid ""
+"Passes the specified environment variable(s) to child processes.  Note: the "
+"standard CUPS filter and backend environment variables cannot be overridden "
+"using this directive."
 msgstr ""
-"Führt die Filter nicht wirklich aus, sondern gibt den verwandten Filter nach "
-"Stdout aus."
+"Übergibt die festgelegten Umgebungsvariable(n) an Kindprozesse. Hinweis: die "
+"Standard-CUPS-Filter und -Backend-Umgebungsvariablen können mit dieser "
+"Direktive nicht außer Kraft gesetzt werden."
 
 #. type: TP
-#: cupsfilter.man:66
+#: cups-files.conf.5:163
 #, no-wrap
-msgid "B<-D>"
-msgstr "B<-D>"
+msgid "B<RemoteRoot >I<username>"
+msgstr "B<RemoteRoot >I<Benutzername>"
 
+#. #RequestRoot
 #. type: Plain text
-#: cupsfilter.man:69
-msgid "Delete the input file after conversion."
-msgstr "Löscht die Eingabedatei nach der Umwandlung."
+#: cups-files.conf.5:168
+msgid ""
+"Specifies the username that is associated with unauthenticated accesses by "
+"clients claiming to be the root user.  The default is \"remroot\"."
+msgstr ""
+"Legt den Benutzernamen, der mit nicht-authentifiziertem Zugang durch "
+"Clients, die vorgeben, der Benutzer »root« zu sein, assoziiert ist, fest. "
+"Die Vorgabe ist »remroot«."
 
 #. type: TP
-#: cupsfilter.man:69
+#: cups-files.conf.5:168
 #, no-wrap
-msgid "B<-U >I<user>"
-msgstr "B<-U >I<Benutzername>"
+msgid "B<RequestRoot >I<directory>"
+msgstr "B<RequestRoot >I<Verzeichnis>"
 
+#. #Sandboxing
 #. type: Plain text
-#: cupsfilter.man:72
+#: cups-files.conf.5:173
 msgid ""
-"Specifies the username passed to the filters. The default is the name of the "
-"current user."
+"Specifies the directory that contains print jobs and other HTTP request "
+"data.  The default is \"/var/spool/cups\"."
 msgstr ""
-"Legt den Benutzernamen, der an die Filter weitergegeben wird, fest. "
-"Standardmäßig ist dies der Name des aktuellen Benutzers."
+"Legt das Verzeichnis, in dem Druckaufträge und andere HTTP-Anfragedaten "
+"enthalten sind, fest. Die Vorgabe ist »/var/spool/cups«."
 
 #. type: TP
-#: cupsfilter.man:72
+#: cups-files.conf.5:173
 #, no-wrap
-msgid "B<-c >I<config-file>"
-msgstr "B<-c >I<Konfig-Datei>"
+msgid "B<Sandboxing relaxed>"
+msgstr "B<Sandboxing relaxed>"
 
 #. type: TP
-#: cupsfilter.man:75
+#: cups-files.conf.5:175
 #, no-wrap
-msgid "B<-d >I<printer>"
-msgstr "B<-d >I<Drucker>"
+msgid "B<Sandboxing strict>"
+msgstr "B<Sandboxing strict>"
 
+#. #ServerBin
 #. type: Plain text
-#: cupsfilter.man:78
-msgid "Uses information from the named printer."
-msgstr "Verwendet Informationen von dem benannten Drucker."
+#: cups-files.conf.5:181
+msgid ""
+"Specifies the level of security sandboxing that is applied to print filters, "
+"backends, and other child processes of the scheduler.  The default is "
+"\"strict\".  This directive is currently only used/supported on macOS."
+msgstr ""
+"Legt die Sicherheitsstufe für die Sandbox fest, die auf Druckfilter, "
+"Backends und andere Kindprozesse des Auftragsplaners angewandt werden soll. "
+"Die Vorgabe ist »strict«. Diese Direktive wird derzeit nur unter macOS "
+"verwandt/unterstützt."
 
 #. type: TP
-#: cupsfilter.man:78 lpstat.man:101
+#: cups-files.conf.5:181
 #, no-wrap
-msgid "B<-e>"
-msgstr "B<-e>"
+msgid "B<ServerBin >I<directory>"
+msgstr "B<ServerBin >I<Verzeichnis>"
 
+#. #ServerKeychain
 #. type: Plain text
-#: cupsfilter.man:81
-msgid "Use every filter from the PPD file."
-msgstr "Verwendet jeden Filter aus der PPD-Datei."
+#: cups-files.conf.5:186
+msgid ""
+"Specifies the directory containing the backends, CGI programs, filters, "
+"helper programs, notifiers, and port monitors.  The default is \"/usr/lib/"
+"cups\" or \"/usr/libexec/cups\" depending on the platform."
+msgstr ""
+"Legt das Verzeichnis, das die Backends, CGI-Programme, Filter, "
+"Helferprogramme, Benachrichtiger und Port-Monitore enthält, fest. Die "
+"Vorgabe ist »/usr/lib/cups« oder »/usr/libexec/cups«, abhängig von der "
+"Plattform."
 
 #. type: TP
-#: cupsfilter.man:81
+#: cups-files.conf.5:186
 #, no-wrap
-msgid "B<-i >I<mime/type>"
-msgstr "B<-i >I<MIME/Typ>"
+msgid "B<ServerKeychain >I<path>"
+msgstr "B<ServerKeychain >I<Pfad>"
 
+#. #ServerRoot
 #. type: Plain text
-#: cupsfilter.man:84
+#: cups-files.conf.5:192
 msgid ""
-"Specifies the source file type. The default file type is guessed using the "
-"filename and contents of the file."
+"Specifies the location of TLS certificates and private keys.  The default is "
+"\"/Library/Keychains/System.keychain\" on macOS and \"/etc/cups/ssl\" on all "
+"other operating systems.  macOS uses its keychain database to store "
+"certificates and keys while other platforms use separate files in the "
+"specified directory, *.crt for PEM-encoded certificates and *.key for PEM-"
+"encoded private keys."
 msgstr ""
-"Legt den Quelldateityp fest. Der Vorgabedateityp wird anhand des Dateinamens "
-"und des Inhalts der Datei geraten."
+"Legt den Ort der TLS-Zertifikate und privaten Schlüssel fest. Die Vorgabe "
+"ist »/Library/Keychains/System.keychain« unter macOS und »/etc/cups/ssl« auf "
+"allen anderen Betriebssystemen. MacOS verwendet die Schlüsselring-Datenbank, "
+"um Zertifikate und Schlüssel zu speichern, während andere Plattformen "
+"einzelne Dateien in dem angegebenen Verzeichnis, *.crt für PEM-kodierte "
+"Zertifikate und *.key für PEM-kodierte private Schlüssel verwenden."
 
 #. type: TP
-#: cupsfilter.man:84
+#: cups-files.conf.5:192
 #, no-wrap
-msgid "B<-j >I<job-id[,N]>"
-msgstr "B<-j >I<Auftrags-ID[,N]>"
+msgid "B<ServerRoot >I<directory>"
+msgstr "B<ServerRoot >I<Verzeichnis>"
 
+#. #SetEnv
 #. type: Plain text
-#: cupsfilter.man:87
+#: cups-files.conf.5:197
 msgid ""
-"Converts document N from the specified job. If N is omitted, document 1 is "
-"converted."
+"Specifies the directory containing the server configuration files.  The "
+"default is \"/etc/cups\"."
 msgstr ""
-"Konvertiert Dokument N aus dem festgelegten Druckauftrag. Falls N "
-"ausgelassen wird, wird Dokument 1 konvertiert."
+"Legt das Verzeichnis, in dem die Serverkonfiguration enthalten ist, fest. "
+"Die Vorgabe ist »/etc/cups«."
 
 #. type: TP
-#: cupsfilter.man:87
+#: cups-files.conf.5:197
 #, no-wrap
-msgid "B<-m >I<mime/type>"
-msgstr "B<-m >I<MIME/Typ>"
+msgid "B<SetEnv >I<variable value>"
+msgstr "B<SetEnv >I<Variable Wert>"
 
+#. #StateDir
 #. type: Plain text
-#: cupsfilter.man:90
+#: cups-files.conf.5:202
 msgid ""
-"Specifies the destination file type. The default file type is application/"
-"pdf. Use printer/foo to convert to the printer format defined by the filters "
-"in the PPD file."
-msgstr ""
-"Legt den Zieldateityp fest. Standardmäßig ist dies application/pdf. "
-"Verwenden Sie Drucker/foo, um zu dem Druckerformat, wie es von den Filtern "
-"in der PPD-Datei definiert ist, zu konvertieren."
+"Set the specified environment variable to be passed to child processes.  "
+"Note: the standard CUPS filter and backend environment variables cannot be "
+"overridden using this directive."
+msgstr ""
+"Setzt die festgelegte Umgebungsvariable, die an Kindprozesse weitergegeben "
+"werden soll. Hinweis: die Standard-CUPS-Filter und -Backend-"
+"Umgebungsvariablen können mit dieser Direktive nicht außer Kraft gesetzt "
+"werden."
 
 #. type: TP
-#: cupsfilter.man:90 lp.man:124
+#: cups-files.conf.5:202
 #, no-wrap
-msgid "B<-n >I<copies>"
-msgstr "B<-n >I<Kopien>"
+msgid "B<StateDir >I<directory>"
+msgstr "B<StateDir >I<Verzeichnis>"
 
+#. #SyncOnClose
 #. type: Plain text
-#: cupsfilter.man:93
-msgid "Specifies the number of copies to generate."
-msgstr "Legt die Anzahl der zu erstellenden Kopien fest."
+#: cups-files.conf.5:207
+msgid ""
+"Specifies the directory to use for PID and local certificate files.  The "
+"default is \"/var/run/cups\" or \"/etc/cups\" depending on the platform."
+msgstr ""
+"Legt das für PID- und lokale Zertifikatdateien zu verwendene Verzeichnis "
+"fest. Die Vorgabe ist »/var/run/cups« oder »/etc/cups«, abhängig von der "
+"Plattform."
 
 #. type: TP
-#: cupsfilter.man:93 cups-lpd.man.in:44
+#: cups-files.conf.5:207
 #, no-wrap
-msgid "B<-o >I<name=value>"
-msgstr "B<-o >I<Name=Wert>"
-
-#. type: Plain text
-#: cupsfilter.man:96
-msgid "Specifies options to pass to the CUPS filters."
-msgstr "Legt die an die CUPS-Filter zu übergebenden Optionen fest."
+msgid "B<SyncOnClose Yes>"
+msgstr "B<SyncOnClose Yes>"
 
 #. type: TP
-#: cupsfilter.man:96
+#: cups-files.conf.5:209
 #, no-wrap
-msgid "B<-p >I<filename.ppd>"
-msgstr "B<-p >I<Dateiname.ppd>"
+msgid "B<SyncOnClose No>"
+msgstr "B<SyncOnClose No>"
 
+#. #SystemGroup
 #. type: Plain text
-#: cupsfilter.man:99
-msgid "Specifies the PPD file to use."
-msgstr "Legt die zu verwendende PPD-Datei fest."
+#: cups-files.conf.5:216
+msgid ""
+"Specifies whether the scheduler calls B<fsync>(2)  after writing "
+"configuration or state files.  The default is \"Yes\"."
+msgstr ""
+"Legt fest, ob der Auftragsplaner nach dem Schreiben der Konfigurations- oder "
+"Zustandsdateien B<fsync>(2) aufruft. Die Vorgabe ist »Yes«."
 
 #. type: TP
-#: cupsfilter.man:99
+#: cups-files.conf.5:216
 #, no-wrap
-msgid "B<-t >I<title>"
-msgstr "B<-t >I<Titel>"
+msgid "B<SystemGroup >I<group-name >[ ... I<group-name> ]"
+msgstr "B<SystemGroup >I<Gruppenname >[ … I<Gruppenname> ]"
 
+#. #TempDir
 #. type: Plain text
-#: cupsfilter.man:102
-msgid "Specifies the document title."
-msgstr "Legt den Dokumententitel fest."
+#: cups-files.conf.5:221
+msgid ""
+"Specifies the group(s) to use for I<@SYSTEM> group authentication.  The "
+"default contains \"admin\", \"lpadmin\", \"root\", \"sys\", and/or \"system"
+"\"."
+msgstr ""
+"Legt die Gruppe(n), die für I<@SYSTEM>-Gruppenauthentifizierung verwendet "
+"werden, fest. Die Vorgabe enthält »admin«, »lpadmin«, »root«, »sys« und/oder "
+"»system«."
 
 #. type: TP
-#: cupsfilter.man:102
+#: cups-files.conf.5:221
 #, no-wrap
-msgid "B<-u>"
-msgstr "B<-u>"
-
-#. type: Plain text
-#: cupsfilter.man:105
-msgid "Delete the PPD file after conversion."
-msgstr "Löscht die PPD-Datei nach der Umwandlung."
-
-#. type: Plain text
-#: cupsfilter.man:108
-msgid "B<cupsfilter> returns a non-zero exit status on any error."
-msgstr ""
-"Im Fehlerfall liefert B<cupsfilter> einen von Null verschiedenen Exit-Status "
-"zurück."
+msgid "B<TempDir >I<directory>"
+msgstr "B<TempDir >I<Verzeichnis>"
 
+#. #User
 #. type: Plain text
-#: cupsfilter.man:113
+#: cups-files.conf.5:226
 msgid ""
-"All of the standard B<cups>(1)  environment variables affect the operation "
-"of B<cupsfilter>."
+"Specifies the directory where short-term temporary files are stored.  The "
+"default is \"/var/spool/cups/tmp\"."
 msgstr ""
-"Alle Standard-B<cups>(1)-Umgebungsvariablen beeinflussen den Ablauf von "
-"B<cupsfilter>."
+"Legt das Verzeichnis, in dem kurzlebige temporäre Dateien gespeichert "
+"werden, fest. Die Vorgabe ist »/var/spool/cups/tmp«."
 
-#. type: Plain text
-#: cupsfilter.man:120
+#. type: TP
+#: cups-files.conf.5:226
 #, no-wrap
+msgid "B<User >I<username>"
+msgstr "B<User >I<Benutzername>"
+
+#. type: Plain text
+#: cups-files.conf.5:230
 msgid ""
-"/etc/cups/cups-files.conf\n"
-"/etc/cups/*.convs\n"
-"/etc/cups/*.types\n"
-"/usr/share/cups/mime/*.convs\n"
-"/usr/share/cups/mime/*.types\n"
+"Specifies the user name or ID that is used when running external programs.  "
+"The default is \"lp\"."
 msgstr ""
-"/etc/cups/cups-files.conf\n"
-"/etc/cups/*.convs\n"
-"/etc/cups/*.types\n"
-"/usr/share/cups/mime/*.convs\n"
-"/usr/share/cups/mime/*.types\n"
+"Legt den Benutzernamen oder die ID, die bei der Ausführung externer "
+"Programme verwandt wird, fest. Die Vorgabe ist »lp«."
 
+#. #FileDevice
 #. type: Plain text
-#: cupsfilter.man:124
+#: cups-files.conf.5:233
 msgid ""
-"Unlike when printing, filters run using the B<cupsfilter> command use the "
-"current user and security session. This may result in different output or "
-"unexpected behavior."
+"The following directives are deprecated and will be removed from a future "
+"version of CUPS:"
 msgstr ""
-"Anders als beim Drucken verwenden Filter, die mit dem Befehl B<cupsfilter> "
-"ausgeführt werden, die aktuelle Benutzer- und Sicherheitssitzung. Dies kann "
-"zu anderer Ausgabe oder unerwartetem Verhalten führen."
+"I<Die nachfolgenden Direktiven sind veraltet und werden in einer zukünftigen "
+"Version von CUPS entfernt werden>:"
 
-#. type: SH
-#: cupsfilter.man:124 cups-lpd.man.in:86 lpadmin.man:203
+#. type: TP
+#: cups-files.conf.5:233
 #, no-wrap
-msgid "EXAMPLE"
-msgstr "BEISPIEL"
+msgid "B<FileDevice Yes>"
+msgstr "B<FileDevice Yes>"
+
+#. type: TP
+#: cups-files.conf.5:235
+#, no-wrap
+msgid "B<FileDevice No>"
+msgstr "B<FileDevice No>"
 
+#. #FontPath
 #. type: Plain text
-#: cupsfilter.man:126
+#: cups-files.conf.5:243
 msgid ""
-"The following command will generate a PDF preview of job 42 for a printer "
-"named \"myprinter\" and save it to a file named \"preview.pdf\":"
+"Specifies whether the file pseudo-device can be used for new printer "
+"queues.  The URI \"file:///dev/null\" is always allowed.  File devices "
+"cannot be used with \"raw\" print queues - a PPD file is required.  The "
+"specified file is overwritten for every print job.  Writing to directories "
+"is not supported."
 msgstr ""
-"Der folgende Befehl erzeugt eine PDF-Vorschau des Auftrags 42 für einen "
-"Drucker namens »meinDrucker« und speichert sie in einer Datei namens "
-"»Vorschau.pdf«:"
+"gibt an, ob die Datei-Pseudo-Geräte für neue Druckerwarteschlangen verwandt "
+"werden können. Die URI »file:///dev/null« ist immer erlaubt. Datei-Geräte "
+"können nicht mit »rohen« Warteschlangen verwandt werden - eine PPD-Datei ist "
+"notwendig. Die angegebene Datei wird für jeden Druckauftrag überschrieben. "
+"Schreiben in Verzeichnisse wird nicht unterstützt."
 
-#. type: Plain text
-#: cupsfilter.man:129
+#. type: TP
+#: cups-files.conf.5:243
 #, no-wrap
-msgid "    cupsfilter -m application/pdf -d myprinter -j 42 E<gt>preview.pdf\n"
-msgstr "    cupsfilter -m application/pdf -d meinDrucker -j 42 E<gt>Vorschau.pdf\n"
+msgid "B<FontPath >I<directory[:...:directoryN]>"
+msgstr "B<FontPath >I<Verzeichnis[:…:VerzeichnisN]>"
 
+#. #LPDConfigFile
 #. type: Plain text
-#: cupsfilter.man:137
+#: cups-files.conf.5:251
 msgid ""
-"B<cups>(1), B<cupsd.conf>(5), B<filter(7),> B<mime.convs>(7), B<mime."
-"types>(7), CUPS Online Help (http://localhost:631/help)"
+"Specifies a colon separated list of directories where fonts can be found.  "
+"On Linux the B<font-config>(1)  mechanism is used instead.  On macOS the "
+"Font Book application manages system-installed fonts."
 msgstr ""
-"B<cups>(1), B<cupsd.conf>(5), B<filter(7),> B<mime.convs>(7), B<mime."
-"types>(7), CUPS-Online-Hilfe (http://localhost:631/help)"
-
-#. type: TH
-#: cups-lpd.man.in:13
-#, no-wrap
-msgid "cups-lpd"
-msgstr "cups-lpd"
+"gibt eine Doppelpunkt-getrennte Liste von Verzeichnissen an, in denen "
+"Schriften gefunden werden können. Unter Linux wird stattdessen der "
+"Mechanismus B<font-config>(1) verwandt. Unter macOS verwaltet die Anwendung "
+"Font Book die systemweit installierten Schriften."
 
-#. type: TH
-#: cups-lpd.man.in:13
+#. type: TP
+#: cups-files.conf.5:251
 #, no-wrap
-msgid "3 June 2014"
-msgstr "3. Juni 2014"
+msgid " B<LPDConfigFile >I<filename>"
+msgstr " B<LPDConfigFile >I<Dateiname>"
 
+#. #Printcap
 #. type: Plain text
-#: cups-lpd.man.in:16
-#, fuzzy
-msgid "cups-lpd - receive print jobs and report printer status to lpd clients"
-msgstr ""
-"cups-lpd - empfängt Druckaufträge und meldet den Druckerstatus an lpd-Clients"
+#: cups-files.conf.5:255
+msgid "Specifies the LPD service configuration file to update."
+msgstr "Gibt die zu aktualisierende LPD-Dienstekonfigurationsdatei an."
 
-#. type: Plain text
-#: cups-lpd.man.in:26
-msgid ""
-"B<cups-lpd> [ B<-h >I<hostname>[B<:>I<port>] ] [ B<-n> ] [ B<-o> "
-"I<option=value> ]"
-msgstr ""
-"B<cups-lpd> [ B<-h >I<Hostname>[B<:>I<Port>] ] [ B<-n> ] [ B<-o> "
-"I<Option=Wert> ]"
+#. type: TP
+#: cups-files.conf.5:255
+#, no-wrap
+msgid "B<Printcap >I<filename>"
+msgstr "B<Printcap >I<Dateiname>"
 
+#. #PrintcapFormat
 #. type: Plain text
-#: cups-lpd.man.in:35
-msgid ""
-"B<cups-lpd> is the CUPS Line Printer Daemon (\"LPD\") mini-server that "
-"supports legacy client systems that use the LPD protocol.  B<cups-lpd> does "
-"not act as a standalone network daemon but instead operates using any of the "
-"Internet \"super-servers\" such as B<inetd>(8), B<launchd>(8), and "
-"B<systemd>(8)."
+#: cups-files.conf.5:259
+msgid "Specifies a file that is filled with a list of local print queues."
 msgstr ""
-"B<cups-lpd> ist der CUPS-Line-Printer-Daemon (»LPD«)-Mini-Server, der alte "
-"Client-Systeme unterstützt, die das LPD-Protokoll benutzen. B<cups-lpd> "
-"agiert nicht als selbstständiger Netzwerk-Daemon, sondern läuft unter einem "
-"der Internet-»Super-Server« wie B<inetd>(8), B<launchd>(8) und B<systemd>(8)."
+"Gibt eine Datei an, die mit einer Liste von lokalen Druckerwarteschlangen "
+"gefüllt werden soll."
 
 #. type: TP
-#: cups-lpd.man.in:36 lp.man:115
+#: cups-files.conf.5:259
 #, no-wrap
-msgid "B<-h >I<hostname>[B<:>I<port>]"
-msgstr "B<-h >I<Hostname>[B<:>I<Port>]"
+msgid "B<PrintcapFormat bsd>"
+msgstr "B<PrintcapFormat bsd>"
 
-#. type: Plain text
-#: cups-lpd.man.in:39
-msgid "Sets the CUPS server (and port) to use."
-msgstr "Setzt den zu benutzenden CUPS-Server (und Port)."
+#. type: TP
+#: cups-files.conf.5:261
+#, no-wrap
+msgid "B<PrintcapFormat plist>"
+msgstr "B<PrintcapFormat plist>"
 
 #. type: TP
-#: cups-lpd.man.in:39
+#: cups-files.conf.5:263
 #, no-wrap
-msgid "B<-n>"
-msgstr "B<-n>"
+msgid "B<PrintcapFormat solaris>"
+msgstr "B<PrintcapFormat solaris>"
 
+#. #SMBConfigFile
 #. type: Plain text
-#: cups-lpd.man.in:44
+#: cups-files.conf.5:270
 msgid ""
-"Disables reverse address lookups; normally B<cups-lpd> will try to discover "
-"the hostname of the client via a reverse DNS lookup."
+"Specifies the format to use for the Printcap file.  \"bsd\" is the "
+"historical LPD printcap file format.  \"plist\" is the Apple plist file "
+"format.  \"solaris\" is the historical Solaris LPD printcap file format."
 msgstr ""
-"Deaktiviert inverse Adressabfragen, normalerweise wird B<cups-lpd> "
-"versuchen, den Rechnernamen eines Clients über inverse DNS-Abfragen zu "
-"ermitteln."
+"Gibt das für die Printcap-Datei zu verwendende Format an. »bsd« ist das "
+"historische LPD-Printcap-Dateiformat. »plist« ist das Apple-Plist-"
+"Dateiformat. »solaris« ist das historische Solaris-LPD-Printcap-Dateiformat."
+
+#. type: TP
+#: cups-files.conf.5:270
+#, no-wrap
+msgid "B<SMBConfigFile >I<filename>"
+msgstr "B<SMBConfigFile >I<Dateiname>"
 
 #. type: Plain text
-#: cups-lpd.man.in:49
-msgid ""
-"Inserts options for all print queues. Most often this is used to disable the "
-"\"l\" filter so that remote print jobs are filtered as needed for printing; "
-"the B<inetd>(8)  example below sets the \"document-format\" option to "
-"\"application/octet-stream\" which forces autodetection of the print file "
-"format."
-msgstr ""
-"Fügt Optionen für alle Druckerwarteschlangen ein. Meistens wird dies zur "
-"Deaktivierung des Filters »l« verwandt, so dass nicht-lokale Druckaufträge "
-"wie für den Druck benötigt gefiltert werden. Das nachfolgende B<inetd>(8)-"
-"Beispiel setzten die Option »document-format« auf »application/octet-"
-"stream«, womit die automatische Erkennung des Druckdateiformats erzwungen "
-"wird."
+#: cups-files.conf.5:273
+msgid "Specifies the SMB service configuration file to update."
+msgstr "Gibt die zu aktualisierende SMB-Dienstekonfigurationsdatei an."
 
 #. type: Plain text
-#: cups-lpd.man.in:53
+#: cups-files.conf.5:280
 msgid ""
-"B<cups-lpd> does not enforce the restricted source port number specified in "
-"RFC 1179, as using restricted ports does not prevent users from submitting "
-"print jobs.  While this behavior is different than standard Berkeley LPD "
-"implementations, it should not affect normal client operations."
+"The scheduler MUST be restarted manually after making changes to the B<cups-"
+"files.conf> file.  On Linux this is typically done using the "
+"B<systemctl>(8)  command, while on macOS the B<launchctl>(8)  command is "
+"used instead."
 msgstr ""
-"B<cups-lpd> erzwingt die in RFC 1179 spezifizierte eingeschränkte "
-"Quellportnummer nicht, da eingeschränkte Ports Benutzer nicht vom Einreichen "
-"von Druckaufträgen abhalten. Obwohl dieses Verhalten sich von "
-"standardmäßigen Berkeley-LPD-Implementierungen unterscheidet, sollte es den "
-"normalen Betrieb von Clients nicht betreffen."
 
 #. type: Plain text
-#: cups-lpd.man.in:55
+#: cups-files.conf.5:290
 msgid ""
-"The output of the status requests follows RFC 2569, Mapping between LPD and "
-"IPP Protocols. Since many LPD implementations stray from this definition, "
-"remote status reporting to LPD clients may be unreliable."
+"B<classes.conf>(5), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), B<mime."
+"convs>(5), B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), "
+"CUPS Online Help (http://localhost:631/help)"
 msgstr ""
-"Die Ausgabe der Statusabfragen folgt RFC 2569 »Mapping between LPD and IPP "
-"Protocols«. Da viele LPD-Implementierungen von dieser Definition abweichen, "
-"könnte die nicht-lokale Statusberichterstattung an LDP-Clients unzuverlässig "
-"sein."
+"B<classes.conf>(5), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), B<mime."
+"convs>(5), B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), "
+"CUPS-Online-Hilfe (http://localhost:631/help)"
 
-#. type: SH
-#: cups-lpd.man.in:55
+#. type: TH
+#: cupsfilter.8:9
 #, no-wrap
-msgid "ERRORS"
-msgstr "FEHLER"
+msgid "cupsfilter"
+msgstr "cupsfilter"
 
 #. type: Plain text
-#: cups-lpd.man.in:57
-msgid "Errors are sent to the system log."
-msgstr "Fehler werden an das Systemprotokolliersystem gesandt."
+#: cupsfilter.8:12
+#, fuzzy
+msgid ""
+"cupsfilter - convert a file to another format using cups filters (deprecated)"
+msgstr ""
+"cupsfilter - konvertiere eine Datei in ein anderes Format mittels CUPS-Filter"
 
 #. type: Plain text
-#: cups-lpd.man.in:62
-#, no-wrap
+#: cupsfilter.8:54
 msgid ""
-"I</etc/inetd.conf>\n"
-"I</etc/xinetd.d/cups-lpd>\n"
-"I</System/Library/LaunchDaemons/org.cups.cups-lpd.plist>\n"
+"B<cupsfilter> [ B<--list-filters> ] [ B<-D> ] [ B<-U> I<user> ] [ B<-c> "
+"I<config-file> ] [ B<-d> I<printer> ] [ B<-e> ] [ B<-i> I<mime/type> ] [ B<-"
+"j> I<job-id[,N]> ] [ B<-m> I<mime/type> ] [ B<-n> I<copies> ] [ B<-o> "
+"I<name=value> ] [ B<-p> I<filename.ppd> ] [ B<-t> I<title> ] [ B<-u> ] "
+"I<filename>"
 msgstr ""
-"I</etc/inetd.conf>\n"
-"I</etc/xinetd.d/cups-lpd>\n"
-"I</System/Library/LaunchDaemons/org.cups.cups-lpd.plist>\n"
-
-#. type: SS
-#: cups-lpd.man.in:64
-#, no-wrap
-msgid "PERFORMANCE"
-msgstr "DURCHSATZ"
+"B<cupsfilter> [ B<--list-filters> ] [ B<-D> ] [ B<-U> I<Benutzer> ] [ B<-c> "
+"I<Konfig-Datei> ] [ B<-d> I<Drucker> ] [ B<-e> ] [ B<-i> I<MIME/typ> ] [ B<-"
+"j> I<Auftrags-ID[,N]> ] [ B<-m> I<MIME/typ> ] [ B<-n> I<Kopien> ] [ B<-o> "
+"I<Name=Wert> ] [ B<-p> I<Dateiname.ppd> ] [ B<-t> I<Titel> ] [ B<-u> ] "
+"I<Dateiname>"
 
 #. type: Plain text
-#: cups-lpd.man.in:69
+#: cupsfilter.8:59
 msgid ""
-"B<cups-lpd> performs well with small numbers of clients and printers.  "
-"However, since a new process is created for each connection and since each "
-"process must query the printing system before each job submission, it does "
-"not scale to larger configurations.  We highly recommend that large "
-"configurations use the native IPP support provided by CUPS instead."
+"B<cupsfilter> is a front-end to the CUPS filter subsystem which allows you "
+"to convert a file to a specific format, just as if you had printed the file "
+"through CUPS. By default, B<cupsfilter> generates a PDF file. The converted "
+"file is sent to the standard output."
 msgstr ""
-"I<cups-lpd> läuft gut mit einer kleinen Anzahl an Clients und Druckern. Da "
-"allerdings für jede Verbindung ein Prozess erstellt wird und jeder Prozess "
-"das Drucksystem vor Einreichen jedes Auftrags abfragen muss, ist es schlecht "
-"an größere Konfigurationen angepasst. Wir empfehlen nachdrücklich, dass "
-"große Konfigurationen die von CUPS direkt bereitgestellte IPP-Unterstützung "
-"verwenden."
+"B<cupsfilter> ist eine Oberfläche für das CUPS-Filter-Subsystem, das es "
+"erlaubt, eine Datei in ein spezielles Format umzuwandeln, als ob Sie diese "
+"Datei mittels CUPS gedruckt hätten. Standardmäßig erzeugt B<cupsfilter> eine "
+"PDF-Datei. Die konvertierte Datei wird zur Standardausgabe geschickt."
 
-#. type: SS
-#: cups-lpd.man.in:69
+#. type: TP
+#: cupsfilter.8:60
 #, no-wrap
-msgid "SECURITY"
-msgstr "SICHERHEIT"
+msgid "B<--list-filters>"
+msgstr "B<--list-filters>"
 
 #. type: Plain text
-#: cups-lpd.man.in:76
-msgid ""
-"B<cups-lpd> currently does not perform any access control based on the "
-"settings in I<cupsd.conf(5)> or in the I<hosts.allow(5)> or I<hosts.deny(5)> "
-"files used by TCP wrappers.  Therefore, running B<cups-lpd> on your server "
-"will allow any computer on your network (and perhaps the entire Internet) to "
-"print to your server."
+#: cupsfilter.8:63
+msgid "Do not actually run the filters, just print the filters used to stdout."
 msgstr ""
-"B<cups-lpd> führt derzeit keine auf den Einstellungen in I<cupsd.conf(5)> "
-"oder in den von TCP-Wrappers verwandten Dateien I<hosts.allow(5)> oder "
-"I<hosts.deny(5)> basierte Zugriffskontrolle durch. Daher wird die Ausführung "
-"von B<cups-lpd> auf Ihrem Server es allen Computern in Ihrem Netz (und "
-"möglicherweise allen im Internet) erlauben, auf Ihrem Server zu drucken."
+"Führt die Filter nicht wirklich aus, sondern gibt den verwandten Filter nach "
+"Stdout aus."
+
+#. type: TP
+#: cupsfilter.8:63
+#, no-wrap
+msgid "B<-D>"
+msgstr "B<-D>"
 
 #. type: Plain text
-#: cups-lpd.man.in:82
-msgid ""
-"While B<xinetd>(8)  has built-in access control support, you should use the "
-"TCP wrappers package with B<inetd>(8)  to limit access to only those "
-"computers that should be able to print through your server."
-msgstr ""
-"Obwohl B<xinetd>(8) über eingebaute Zugriffskontrolle verfügt, sollten Sie "
-"das Paket TCP-Wrappers mit B<inetd>(8) verwenden, um den Zugriff auf solche "
-"Computer zu beschränken, denen es erlaubt sein soll, über Ihren Server zu "
-"drucken."
+#: cupsfilter.8:66
+msgid "Delete the input file after conversion."
+msgstr "Löscht die Eingabedatei nach der Umwandlung."
+
+#. type: TP
+#: cupsfilter.8:66
+#, no-wrap
+msgid "B<-U >I<user>"
+msgstr "B<-U >I<Benutzername>"
 
 #. type: Plain text
-#: cups-lpd.man.in:86
+#: cupsfilter.8:69
 msgid ""
-"B<cups-lpd> is not enabled by the standard CUPS distribution.  Please "
-"consult with your operating system vendor to determine whether it is enabled "
-"by default on your system."
+"Specifies the username passed to the filters. The default is the name of the "
+"current user."
 msgstr ""
-"B<cups-lpd> wird von der Standard-CUPS-Distribution nicht aktiviert. Bitte "
-"fragen Sie beim Betriebssystem-Vertreiber nach, ob es auf Ihrem System "
-"standardmäßig aktiviert ist oder nicht."
+"Legt den Benutzernamen, der an die Filter weitergegeben wird, fest. "
+"Standardmäßig ist dies der Name des aktuellen Benutzers."
+
+#. type: TP
+#: cupsfilter.8:69
+#, no-wrap
+msgid "B<-c >I<config-file>"
+msgstr "B<-c >I<Konfig-Datei>"
+
+#. type: TP
+#: cupsfilter.8:72
+#, no-wrap
+msgid "B<-d >I<printer>"
+msgstr "B<-d >I<Drucker>"
 
 #. type: Plain text
-#: cups-lpd.man.in:92
-msgid ""
-"If you are using B<inetd>(8), add the following line to the I<inetd.conf> "
-"file to enable the B<cups-lpd> mini-server:"
-msgstr ""
-"Falls Sie B<inetd>(8) verwenden, fügen Sie die folgenden Zeilen zu der Datei "
-"I<inetd.conf> hinzu, um den B<cups-lpd>-Miniserver zu aktivieren:"
+#: cupsfilter.8:75
+msgid "Uses information from the named printer."
+msgstr "Verwendet Informationen von dem benannten Drucker."
+
+#. type: TP
+#: cupsfilter.8:75 lpstat.1:97
+#, no-wrap
+msgid "B<-e>"
+msgstr "B<-e>"
 
 #. type: Plain text
-#: cups-lpd.man.in:96
+#: cupsfilter.8:78
+msgid "Use every filter from the PPD file."
+msgstr "Verwendet jeden Filter aus der PPD-Datei."
+
+#. type: TP
+#: cupsfilter.8:78
 #, no-wrap
-msgid ""
-"    printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd \\e\n"
-"        -o document-format=application/octet-stream\n"
-msgstr ""
-"    printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd \\e\n"
-"        -o document-format=application/octet-stream\n"
+msgid "B<-i >I<mime/type>"
+msgstr "B<-i >I<MIME/Typ>"
 
 #. type: Plain text
-#: cups-lpd.man.in:102
+#: cupsfilter.8:81
 msgid ""
-"I<Note:> If you are using Solaris 10 or higher, you must run the "
-"B<inetdconv>(1m)  program to register the changes to the I<inetd.conf> file."
+"Specifies the source file type. The default file type is guessed using the "
+"filename and contents of the file."
 msgstr ""
-"I<Hinweis:> Falls Sie Solaris 10 oder höher betreiben, müssen Sie das "
-"Programm B<inetdconv>(1m) ausführen, um die Änderungen an der Datei I<inetd."
-"conf> zu registrieren."
+"Legt den Quelldateityp fest. Der Vorgabedateityp wird anhand des Dateinamens "
+"und des Inhalts der Datei geraten."
+
+#. type: TP
+#: cupsfilter.8:81
+#, no-wrap
+msgid "B<-j >I<job-id[,N]>"
+msgstr "B<-j >I<Auftrags-ID[,N]>"
 
 #. type: Plain text
-#: cups-lpd.man.in:111
+#: cupsfilter.8:84
 msgid ""
-"CUPS includes configuration files for B<launchd>(8), B<systemd>(8), and "
-"B<xinetd>(8).  Simply enable the B<cups-lpd> service using the corresponding "
-"control program."
+"Converts document N from the specified job. If N is omitted, document 1 is "
+"converted."
 msgstr ""
-"CUPS enthält Konfigurationsdateien für B<launchd>(8), B<systemd>(8) und "
-"B<xinetd>(8). Aktivieren Sie den Dienst B<cups-lpd> einfach mittels des "
-"korrespondierenden Steuerungsprogramms."
+"Konvertiert Dokument N aus dem festgelegten Druckauftrag. Falls N "
+"ausgelassen wird, wird Dokument 1 konvertiert."
+
+#. type: TP
+#: cupsfilter.8:84
+#, no-wrap
+msgid "B<-m >I<mime/type>"
+msgstr "B<-m >I<MIME/Typ>"
 
 #. type: Plain text
-#: cups-lpd.man.in:118
+#: cupsfilter.8:87
 msgid ""
-"B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), CUPS Online Help "
-"(http://localhost:631/help), RFC 2569"
+"Specifies the destination file type. The default file type is application/"
+"pdf. Use printer/foo to convert to the printer format defined by the filters "
+"in the PPD file."
 msgstr ""
-"B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), CUPS-Online-Hilfe "
-"(http://localhost:631/help), RFC 2569"
+"Legt den Zieldateityp fest. Standardmäßig ist dies application/pdf. "
+"Verwenden Sie Drucker/foo, um zu dem Druckerformat, wie es von den Filtern "
+"in der PPD-Datei definiert ist, zu konvertieren."
 
-#. type: TH
-#: cups.man:13
+#. type: TP
+#: cupsfilter.8:87 lp.1:121
 #, no-wrap
-msgid "cups"
-msgstr "cups"
-
-#. type: TH
-#: cups.man:13
-#, fuzzy, no-wrap
-#| msgid "15 April 2014"
-msgid "16 April 2014"
-msgstr "15. April 2014"
+msgid "B<-n >I<copies>"
+msgstr "B<-n >I<Kopien>"
 
 #. type: Plain text
-#: cups.man:16
-msgid "cups - a standards-based, open source printing system"
-msgstr "cups - ein Standard-basiertes, Open-Source-Drucksystem"
+#: cupsfilter.8:90
+msgid "Specifies the number of copies to generate."
+msgstr "Legt die Anzahl der zu erstellenden Kopien fest."
+
+#. type: TP
+#: cupsfilter.8:90 cups-lpd.8:41
+#, no-wrap
+msgid "B<-o >I<name=value>"
+msgstr "B<-o >I<Name=Wert>"
 
 #. type: Plain text
-#: cups.man:19
-msgid ""
-"B<CUPS> is the software you use to print from applications like word "
-"processors, email readers, photo editors, and web browsers. It converts the "
-"page descriptions produced by your application (put a paragraph here, draw a "
-"line there, and so forth) into something your printer can understand and "
-"then sends the information to the printer for printing."
-msgstr ""
-"B<CUPS> ist die Software, die Sie verwenden, um aus Anwendungen wie "
-"Textverarbeitungen, E-Mail-Programmen, Bildbearbeitungen und Web-Browsern zu "
-"drucken. Sie konvertiert die von Ihrer Anwendung erstellte "
-"Seitenbeschreibung (ein Absatz hier hin setzen, eine Linie dort zeichnen und "
-"so weiter) in etwas, das Ihr Drucker versteht und schickt dann die "
-"Informationen zum Drucker für den Ausdruck."
+#: cupsfilter.8:93
+msgid "Specifies options to pass to the CUPS filters."
+msgstr "Legt die an die CUPS-Filter zu übergebenden Optionen fest."
+
+#. type: TP
+#: cupsfilter.8:93
+#, no-wrap
+msgid "B<-p >I<filename.ppd>"
+msgstr "B<-p >I<Dateiname.ppd>"
 
 #. type: Plain text
-#: cups.man:25
-msgid ""
-"Now, since every printer manufacturer does things differently, printing can "
-"be very complicated.  B<CUPS> does its best to hide this from you and your "
-"application so that you can concentrate on printing and less on how to "
-"print. Generally, the only time you need to know anything about your printer "
-"is when you use it for the first time, and even then B<CUPS> can often "
-"figure things out on its own."
-msgstr ""
-"Da jeder Druckerhersteller sein eigenes Vorgehen hat, kann Drucken sehr "
-"kompliziert sein. B<CUPS> tut sein Möglichstes, um dies vor Ihnen und Ihrer "
-"Anwendung zu verstecken, so dass Sie sich auf das Ausdrucken konzentrieren "
-"können und weniger auf die Druck-Einzelheiten. Im Allgemeinen müssen Sie nur "
-"etwas über Ihren Drucker wissen, wenn Sie ihn das erste Mal benutzen, und "
-"selbst dann kann B<CUPS> oft die Details selbst herausfinden."
+#: cupsfilter.8:96
+msgid "Specifies the PPD file to use."
+msgstr "Legt die zu verwendende PPD-Datei fest."
 
-#. type: SS
-#: cups.man:25
+#. type: TP
+#: cupsfilter.8:96
 #, no-wrap
-msgid "HOW DOES IT WORK?"
-msgstr "WIE FUNKTIONIERT ES?"
+msgid "B<-t >I<title>"
+msgstr "B<-t >I<Titel>"
 
 #. type: Plain text
-#: cups.man:29
-msgid ""
-"The first time you print to a printer, B<CUPS> creates a queue to keep track "
-"of the current status of the printer (everything OK, out of paper, etc.) and "
-"any pages you have printed. Most of the time the queue points to a printer "
-"connected directly to your computer via a USB port, however it can also "
-"point to a printer on your network, a printer on the Internet, or multiple "
-"printers depending on the configuration. Regardless of where the queue "
-"points, it will look like any other printer to you and your applications."
-msgstr ""
-"Wenn Sie das erste Mal auf einem Drucker drucken, erstellt B<CUPS> eine "
-"Warteschlange, um den aktuellen Zustand des Druckers (alles i.O., kein "
-"Papier mehr usw.) und aller ausgedruckten Seiten nachzuvollziehen. Meistens "
-"zeigt die Warteschlange auf einen Drucker, der über eine USB-Schnittstelle "
-"direkt an Ihrem Rechner angebunden ist. Sie kann aber auch auf einen Drucker "
-"im Netz zeigen oder einem Drucker im Internet oder mehreren Druckern "
-"abhängig von der Konfiguration. Unabhängig davon, worauf die Warteschlange "
-"zeigt, wird dies für Sie und Ihre Anwendung wie jeder andere Drucker auch "
-"aussehen."
+#: cupsfilter.8:99
+msgid "Specifies the document title."
+msgstr "Legt den Dokumententitel fest."
 
-#. type: Plain text
-#: cups.man:35
-msgid ""
-"Every time you print something, B<CUPS> creates a job which contains the "
-"queue you are sending the print to, the name of the document you are "
-"printing, and the page descriptions. Job are numbered (queue-1, queue-2, and "
-"so forth) so you can monitor the job as it is printed or cancel it if you "
-"see a mistake. When B<CUPS> gets a job for printing, it determines the best "
-"programs (filters, printer drivers, port monitors, and backends) to convert "
-"the pages into a printable format and then runs them to actually print the "
-"job."
-msgstr ""
-"Jedes Mal, wenn Sie etwas drucken, erstellt B<CUPS> einen Auftrag, der die "
-"Warteschlange enthält, an die Sie den Druck senden, den Namen des Dokuments, "
-"das Sie drucken und die Seitenbeschreibung. Die Aufträge sind nummeriert "
-"(queue-1, queue-2 und so weiter), so dass Sie die Aufträge beim Drucken "
-"überwachen können oder sie abbrechen können, falls Sie einen Fehler gemacht "
-"haben. Wenn B<CUPS> einen Druckauftrag bekommt, bestimmt es das beste "
-"Programm (Filter, Druckertreiber, Port-Monitore und Backends), um die Seiten "
-"in ein druckbares Format zu wandeln. Dann führt es dieses Programm aus, um "
-"den Auftrag tatsächlich zu drucken."
+#. type: TP
+#: cupsfilter.8:99
+#, no-wrap
+msgid "B<-u>"
+msgstr "B<-u>"
 
 #. type: Plain text
-#: cups.man:39
-msgid ""
-"When the print job is completely printed, B<CUPS> removes the job from the "
-"queue and moves on to any other jobs you have submitted. You can also be "
-"notified when the job is finished, or if there are any errors during "
-"printing, in several different ways."
-msgstr ""
-"Wenn der Druckauftrag vollständig gedruckt ist, entfernt B<CUPS> den Auftrag "
-"aus der Warteschlange und fährt mit weiteren von Ihnen eingereichten "
-"Aufträgen fort. Sie können auch darüber auf verschiedene Arten informiert "
-"werden, wenn ein Auftrag abgeschlossen ist oder falls es während des "
-"Druckens Fehler gab."
-
-#. type: SS
-#: cups.man:39
-#, no-wrap
-msgid "WHERE DO I BEGIN?"
-msgstr "WO FANGE ICH AN?"
+#: cupsfilter.8:102
+msgid "Delete the PPD file after conversion."
+msgstr "Löscht die PPD-Datei nach der Umwandlung."
 
 #. type: Plain text
-#: cups.man:41
-msgid ""
-"The easiest way to start is by using the web interface to configure your "
-"printer. Go to \"http://localhost:631\" and choose the Administration tab at "
-"the top of the page. Click/press on the Add Printer button and follow the "
-"prompts."
+#: cupsfilter.8:105
+msgid "B<cupsfilter> returns a non-zero exit status on any error."
 msgstr ""
-"Am einfachsten gelingt der Anfang mit der Weboberfläche, um Ihren Drucker zu "
-"konfigurieren. Öffnen Sie »http://localhost:631« und wählen Sie den Reiter "
-"»Administration« am oberen Ende der Seite aus. Klicken/Drücken Sie auf den "
-"Knopf »Drucker Hinzufügen« und folgen Sie den Abfragen."
+"Im Fehlerfall liefert B<cupsfilter> einen von Null verschiedenen Exit-Status "
+"zurück."
 
 #. type: Plain text
-#: cups.man:43
+#: cupsfilter.8:110
 msgid ""
-"When you are asked for a username and password, enter your login username "
-"and password or the \"root\" username and password."
+"All of the standard B<cups>(1)  environment variables affect the operation "
+"of B<cupsfilter>."
 msgstr ""
-"Wenn Sie nach einem Benutzernamen und Passwort gefragt werden, geben Sie "
-"Ihren Benutzernamen und Ihr Passwort oder den Benutzernamen »root« und "
-"dessen Passwort ein."
+"Alle Standard-B<cups>(1)-Umgebungsvariablen beeinflussen den Ablauf von "
+"B<cupsfilter>."
 
 #. type: Plain text
-#: cups.man:45
+#: cupsfilter.8:117
+#, no-wrap
 msgid ""
-"After the printer is added you will be asked to set the default printer "
-"options (paper size, output mode, etc.) for the printer. Make any changes as "
-"needed and then click/press on the Set Default Options button to save them. "
-"Some printers also support auto-configuration - click/press on the Query "
-"Printer for Default Options button to update the options automatically."
+"/etc/cups/cups-files.conf\n"
+"/etc/cups/*.convs\n"
+"/etc/cups/*.types\n"
+"/usr/share/cups/mime/*.convs\n"
+"/usr/share/cups/mime/*.types\n"
 msgstr ""
-"Nachdem der Drucker hinzugefügt ist, werden Sie gebeten, die "
-"Standarddruckoptionen (Papiergröße, Ausgabemodus usw.) zu setzen. Wählen Sie "
-"die benötigten Optionen und klicken/drücken Sie auf »Standardoptionen "
-"setzten«, um sie zu speichern. Einige Drucker unterstützen auch die "
-"automatische Konfiguration - klicken/drücken Sie auf den Knopf »Drucker "
-"abfragen«, um die Optionen automatisch zu aktualisieren."
+"/etc/cups/cups-files.conf\n"
+"/etc/cups/*.convs\n"
+"/etc/cups/*.types\n"
+"/usr/share/cups/mime/*.convs\n"
+"/usr/share/cups/mime/*.types\n"
 
 #. type: Plain text
-#: cups.man:47
+#: cupsfilter.8:121
 msgid ""
-"Once you have added the printer, you can print to it from any application. "
-"You can also choose Print Test Page from the maintenance menu to print a "
-"simple test page and verify that everything is working properly."
+"CUPS printer drivers, filters, and backends are deprecated and will no "
+"longer be supported in a future feature release of CUPS.  Printers that do "
+"not support IPP can be supported using applications such as "
+"B<ippeveprinter>(1)."
 msgstr ""
-"Sobald Sie den Drucker hinzugefügt haben, können Sie auf ihm von jeder "
-"Anwendung drucken. Sie können auch »Testseite drucken« aus dem "
-"Verwaltungsmenü auswählen, um eine einfache Testseite zu drucken und zu "
-"bestätigen, dass alles korrekt funktioniert."
 
 #. type: Plain text
-#: cups.man:55
+#: cupsfilter.8:125
 msgid ""
-"You can also use the B<lpadmin>(8)  and B<lpinfo>(8)  commands to add "
-"printers to B<CUPS>.  Additionally, your operating system may include "
-"graphical user interfaces or automatically create printer queues when you "
-"connect a printer to your computer."
+"Unlike when printing, filters run using the B<cupsfilter> command use the "
+"current user and security session. This may result in different output or "
+"unexpected behavior."
 msgstr ""
-"Sie können auch die Befehle B<lpadmin>(8) und B<lpinfo>(8) verwenden, um "
-"Drucker zu B<CUPS> hinzuzufügen. Zusätzlich könnte Ihr Betriebssystem eine "
-"graphische Benutzeroberfläche enthalten oder Druckerwarteschlangen "
-"automatisch erstellen, wenn Sie einen Drucker zum Computer hinzufügen."
+"Anders als beim Drucken verwenden Filter, die mit dem Befehl B<cupsfilter> "
+"ausgeführt werden, die aktuelle Benutzer- und Sicherheitssitzung. Dies kann "
+"zu anderer Ausgabe oder unerwartetem Verhalten führen."
 
-#. type: SS
-#: cups.man:55
+#. type: SH
+#: cupsfilter.8:125 cups-lpd.8:86 lpadmin.8:217
 #, no-wrap
-msgid "HOW DO I GET HELP?"
-msgstr "WIE ERHALTE ICH HILFE?"
-
-#. type: Plain text
-#: cups.man:63
-msgid ""
-"The B<CUPS> web site (http://www.CUPS.org) provides access to the I<cups> "
-"and I<cups-devel> mailing lists, additional documentation and resources, and "
-"a bug report database. Most vendors also provide online discussion forums to "
-"ask printing questions for your operating system of choice."
-msgstr ""
-"Die Website von B<CUPS> (http://www.CUPS.org) bietet Zugriff auf die "
-"Mailinglisten I<cups> und I<cups-devel>, zusätzliche Dokumentation und "
-"zusätzliche Ressourcen und eine Fehlerdatenbank. Die meisten Anbieter "
-"stellen auch Online-Diskussionsforen bereit, bei denen Sie Druck-bezogene "
-"Fragen für Ihr ausgewähltes Betriebssystem stellen können."
+msgid "EXAMPLE"
+msgstr "BEISPIEL"
 
 #. type: Plain text
-#: cups.man:66
+#: cupsfilter.8:127
 msgid ""
-"B<CUPS> commands use the following environment variables to override the "
-"default locations of files and so forth. For security reasons, these "
-"environment variables are ignored for setuid programs:"
+"The following command will generate a PDF preview of job 42 for a printer "
+"named \"myprinter\" and save it to a file named \"preview.pdf\":"
 msgstr ""
-"Die B<CUPS>-Befehle benutzen die folgenden Umgebungsvariablen, um die "
-"Vorgabeorte von Dateien und ähnlichem außer Kraft zu setzen. Aus "
-"Sicherheitsgründen werden diese Umgebungsvariablen für »setuid«-Programme "
-"ignoriert."
-
-#. type: TP
-#: cups.man:66
-#, no-wrap
-msgid "B<CUPS_ANYROOT>"
-msgstr "B<CUPS_ANYROOT>"
+"Der folgende Befehl erzeugt eine PDF-Vorschau des Auftrags 42 für einen "
+"Drucker namens »meinDrucker« und speichert sie in einer Datei namens "
+"»Vorschau.pdf«:"
 
 #. type: Plain text
-#: cups.man:69
-msgid "Whether to allow any X.509 certificate root (Y or N)."
-msgstr "Ob jede X.509-Zertifikatswurzel erlaubt werden soll (Y oder N)."
-
-#. type: TP
-#: cups.man:69 filter.man:159
+#: cupsfilter.8:130
 #, no-wrap
-msgid "B<CUPS_CACHEDIR>"
-msgstr "B<CUPS_CACHEDIR>"
+msgid "    cupsfilter -m application/pdf -d myprinter -j 42 E<gt>preview.pdf\n"
+msgstr "    cupsfilter -m application/pdf -d meinDrucker -j 42 E<gt>Vorschau.pdf\n"
 
 #. type: Plain text
-#: cups.man:72
-msgid "The directory where semi-persistent cache files can be found."
+#: cupsfilter.8:138
+msgid ""
+"B<cups>(1), B<cupsd.conf>(5), B<filter(7),> B<mime.convs>(7), B<mime."
+"types>(7), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
-"Das Verzeichnis in dem halb-beständige Zwischenspeicherdateien gefunden "
-"werden können."
+"B<cups>(1), B<cupsd.conf>(5), B<filter(7),> B<mime.convs>(7), B<mime."
+"types>(7), CUPS-Online-Hilfe (http://localhost:631/help)"
 
-#. type: TP
-#: cups.man:72 filter.man:162
+#. type: TH
+#: cups-lpd.8:10
 #, no-wrap
-msgid "B<CUPS_DATADIR>"
-msgstr "B<CUPS_DATADIR>"
+msgid "cups-lpd"
+msgstr "cups-lpd"
 
 #. type: Plain text
-#: cups.man:75 filter.man:165
-msgid "The directory where data files can be found."
-msgstr "Das Verzeichnis, in dem Datendateien gefunden werden können."
-
-#. type: TP
-#: cups.man:75
-#, no-wrap
-msgid "B<CUPS_ENCRYPTION>"
-msgstr "B<CUPS_ENCRYPTION>"
+#: cups-lpd.8:13
+#, fuzzy
+msgid ""
+"cups-lpd - receive print jobs and report printer status to lpd clients "
+"(deprecated)"
+msgstr ""
+"cups-lpd - empfängt Druckaufträge und meldet den Druckerstatus an lpd-Clients"
 
 #. type: Plain text
-#: cups.man:78
-msgid "The default level of encryption (Always, IfRequested, Never, Required)."
+#: cups-lpd.8:23
+msgid ""
+"B<cups-lpd> [ B<-h >I<hostname>[B<:>I<port>] ] [ B<-n> ] [ B<-o> "
+"I<option=value> ]"
 msgstr ""
-"Den Standardgrad an Verschlüsselung (Always, IfRequested, Never, Required)."
-
-#. type: TP
-#: cups.man:78
-#, no-wrap
-msgid "B<CUPS_EXPIREDCERTS>"
-msgstr "B<CUPS_EXPIREDCERTS>"
+"B<cups-lpd> [ B<-h >I<Hostname>[B<:>I<Port>] ] [ B<-n> ] [ B<-o> "
+"I<Option=Wert> ]"
 
 #. type: Plain text
-#: cups.man:81
-msgid "Whether to allow expired X.509 certificates (Y or N)."
-msgstr "Ob abgelaufene X.509-Zertifikate erlaubt werden sollen (Y oder N)."
+#: cups-lpd.8:32
+msgid ""
+"B<cups-lpd> is the CUPS Line Printer Daemon (\"LPD\") mini-server that "
+"supports legacy client systems that use the LPD protocol.  B<cups-lpd> does "
+"not act as a standalone network daemon but instead operates using any of the "
+"Internet \"super-servers\" such as B<inetd>(8), B<launchd>(8), and "
+"B<systemd>(8)."
+msgstr ""
+"B<cups-lpd> ist der CUPS-Line-Printer-Daemon (»LPD«)-Mini-Server, der alte "
+"Client-Systeme unterstützt, die das LPD-Protokoll benutzen. B<cups-lpd> "
+"agiert nicht als selbstständiger Netzwerk-Daemon, sondern läuft unter einem "
+"der Internet-»Super-Server« wie B<inetd>(8), B<launchd>(8) und B<systemd>(8)."
 
 #. type: TP
-#: cups.man:81
+#: cups-lpd.8:33 lp.1:112
 #, no-wrap
-msgid "B<CUPS_GSSSERVICENAME>"
-msgstr "B<CUPS_GSSSERVICENAME>"
+msgid "B<-h >I<hostname>[B<:>I<port>]"
+msgstr "B<-h >I<Hostname>[B<:>I<Port>]"
 
 #. type: Plain text
-#: cups.man:84
-msgid "The Kerberos service name used for authentication."
-msgstr "Der für die Authentifizierung verwandte Kerberos-Dienstename."
+#: cups-lpd.8:36
+msgid "Sets the CUPS server (and port) to use."
+msgstr "Setzt den zu benutzenden CUPS-Server (und Port)."
 
 #. type: TP
-#: cups.man:84
+#: cups-lpd.8:36
 #, no-wrap
-msgid "B<CUPS_SERVER>"
-msgstr "B<CUPS_SERVER>"
+msgid "B<-n>"
+msgstr "B<-n>"
 
 #. type: Plain text
-#: cups.man:87
+#: cups-lpd.8:41
 msgid ""
-"The hostname/IP address and port number of the CUPS scheduler (hostname:port "
-"or ipaddress:port)."
+"Disables reverse address lookups; normally B<cups-lpd> will try to discover "
+"the hostname of the client via a reverse DNS lookup."
 msgstr ""
-"Der Hostname/die IP-Adresse und Portnummer des CUPS-Auftragsplaners "
-"(Hostname:Port oder IP-Adresse:Port)."
-
-#. type: TP
-#: cups.man:87
-#, no-wrap
-msgid "B<CUPS_SERVERBIN>"
-msgstr "B<CUPS_SERVERBIN>"
+"Deaktiviert inverse Adressabfragen, normalerweise wird B<cups-lpd> "
+"versuchen, den Rechnernamen eines Clients über inverse DNS-Abfragen zu "
+"ermitteln."
 
 #. type: Plain text
-#: cups.man:90
+#: cups-lpd.8:46
 msgid ""
-"The directory where server helper programs, filters, backend, etc. can be "
-"found."
+"Inserts options for all print queues. Most often this is used to disable the "
+"\"l\" filter so that remote print jobs are filtered as needed for printing; "
+"the B<inetd>(8)  example below sets the \"document-format\" option to "
+"\"application/octet-stream\" which forces autodetection of the print file "
+"format."
 msgstr ""
-"Das Verzeichnis, in dem die Hilfsprogramme des Servers, Filter, Backend usw. "
-"gefunden werden können."
-
-#. type: TP
-#: cups.man:90 filter.man:172
-#, no-wrap
-msgid "B<CUPS_SERVERROOT>"
-msgstr "B<CUPS_SERVERROOT>"
-
-#. type: Plain text
-#: cups.man:93 filter.man:175
-msgid "The root directory of the server."
-msgstr "Das Wurzelverzeichnis des Servers."
-
-#. type: TP
-#: cups.man:93
-#, no-wrap
-msgid "B<CUPS_STATEDIR>"
-msgstr "B<CUPS_STATEDIR>"
-
-#. type: Plain text
-#: cups.man:96
-msgid "The directory where state files can be found."
-msgstr "Das Verzeichnis, in dem Zustandsdateien gefunden werden können."
-
-#. type: TP
-#: cups.man:96
-#, no-wrap
-msgid "B<CUPS_USER>"
-msgstr "B<CUPS_USER>"
+"Fügt Optionen für alle Druckerwarteschlangen ein. Meistens wird dies zur "
+"Deaktivierung des Filters »l« verwandt, so dass nicht-lokale Druckaufträge "
+"wie für den Druck benötigt gefiltert werden. Das nachfolgende B<inetd>(8)-"
+"Beispiel setzten die Option »document-format« auf »application/octet-"
+"stream«, womit die automatische Erkennung des Druckdateiformats erzwungen "
+"wird."
 
 #. type: Plain text
-#: cups.man:99
-msgid "Specifies the name of the user for print requests."
-msgstr "Legt den Benutzernamen für Druckanfragen fest."
-
-#. type: TP
-#: cups.man:99
-#, no-wrap
-msgid "B<HOME>"
-msgstr "B<HOME>"
+#: cups-lpd.8:50
+msgid ""
+"B<cups-lpd> does not enforce the restricted source port number specified in "
+"RFC 1179, as using restricted ports does not prevent users from submitting "
+"print jobs.  While this behavior is different than standard Berkeley LPD "
+"implementations, it should not affect normal client operations."
+msgstr ""
+"B<cups-lpd> erzwingt die in RFC 1179 spezifizierte eingeschränkte "
+"Quellportnummer nicht, da eingeschränkte Ports Benutzer nicht vom Einreichen "
+"von Druckaufträgen abhalten. Obwohl dieses Verhalten sich von "
+"standardmäßigen Berkeley-LPD-Implementierungen unterscheidet, sollte es den "
+"normalen Betrieb von Clients nicht betreffen."
 
 #. type: Plain text
-#: cups.man:102
-msgid "Specifies the home directory of the current user."
-msgstr "Legt das Home-Verzeichnis des aktuellen Benutzers fest."
+#: cups-lpd.8:52
+msgid ""
+"The output of the status requests follows RFC 2569, Mapping between LPD and "
+"IPP Protocols. Since many LPD implementations stray from this definition, "
+"remote status reporting to LPD clients may be unreliable."
+msgstr ""
+"Die Ausgabe der Statusabfragen folgt RFC 2569 »Mapping between LPD and IPP "
+"Protocols«. Da viele LPD-Implementierungen von dieser Definition abweichen, "
+"könnte die nicht-lokale Statusberichterstattung an LDP-Clients unzuverlässig "
+"sein."
 
-#. type: TP
-#: cups.man:102
+#. type: SH
+#: cups-lpd.8:52
 #, no-wrap
-msgid "B<IPP_PORT>"
-msgstr "B<IPP_PORT>"
+msgid "ERRORS"
+msgstr "FEHLER"
 
 #. type: Plain text
-#: cups.man:105
-msgid "Specifies the default port number for IPP requests."
-msgstr "Legt die Standard-Port-Nummer für IPP-Anfragen fest."
-
-#. type: TP
-#: cups.man:105
-#, no-wrap
-msgid "B<LOCALEDIR>"
-msgstr "B<LOCALEDIR>"
+#: cups-lpd.8:54
+msgid "Errors are sent to the system log."
+msgstr "Fehler werden an das Systemprotokolliersystem gesandt."
 
 #. type: Plain text
-#: cups.man:108
-msgid "Specifies the location of localization files."
-msgstr "Legt den Ort der Lokalisierungsdateien fest."
-
-#. type: TP
-#: cups.man:108
+#: cups-lpd.8:59
 #, no-wrap
-msgid "B<LPDEST>"
-msgstr "B<LPDEST>"
+msgid ""
+"I</etc/inetd.conf>\n"
+"I</etc/xinetd.d/cups-lpd>\n"
+"I</System/Library/LaunchDaemons/org.cups.cups-lpd.plist>\n"
+msgstr ""
+"I</etc/inetd.conf>\n"
+"I</etc/xinetd.d/cups-lpd>\n"
+"I</System/Library/LaunchDaemons/org.cups.cups-lpd.plist>\n"
 
 #. type: Plain text
-#: cups.man:111
-msgid "Specifies the default print queue (System V standard)."
-msgstr "Legt die Standard-Druckwarteschlange (System-V-Standard) fest."
+#: cups-lpd.8:64
+#, fuzzy
+msgid ""
+"The B<cups-lpd> program is deprecated and will no longer be supported in a "
+"future feature release of CUPS."
+msgstr ""
+"I<Dieses Programm ist veraltet und wird in einer zukünftigen "
+"Veröffentlichung von CUPS entfernt werden.>"
 
-#. type: TP
-#: cups.man:111 filter.man:187
+#. type: SS
+#: cups-lpd.8:64
 #, no-wrap
-msgid "B<PRINTER>"
-msgstr "B<PRINTER>"
+msgid "PERFORMANCE"
+msgstr "DURCHSATZ"
 
 #. type: Plain text
-#: cups.man:114
-msgid "Specifies the default print queue (Berkeley standard)."
-msgstr "Legt die Standard-Druckwarteschlange (Berkeley-Standard) fest."
+#: cups-lpd.8:69
+msgid ""
+"B<cups-lpd> performs well with small numbers of clients and printers.  "
+"However, since a new process is created for each connection and since each "
+"process must query the printing system before each job submission, it does "
+"not scale to larger configurations.  We highly recommend that large "
+"configurations use the native IPP support provided by CUPS instead."
+msgstr ""
+"I<cups-lpd> läuft gut mit einer kleinen Anzahl an Clients und Druckern. Da "
+"allerdings für jede Verbindung ein Prozess erstellt wird und jeder Prozess "
+"das Drucksystem vor Einreichen jedes Auftrags abfragen muss, ist es schlecht "
+"an größere Konfigurationen angepasst. Wir empfehlen nachdrücklich, dass "
+"große Konfigurationen die von CUPS direkt bereitgestellte IPP-Unterstützung "
+"verwenden."
 
-#. type: TP
-#: cups.man:114
+#. type: SS
+#: cups-lpd.8:69
 #, no-wrap
-msgid "B<TMPDIR>"
-msgstr "B<TMPDIR>"
+msgid "SECURITY"
+msgstr "SICHERHEIT"
 
 #. type: Plain text
-#: cups.man:117
-msgid "Specifies the location of temporary files."
-msgstr "Legt den Ort von temporären Dateien fest."
+#: cups-lpd.8:76
+msgid ""
+"B<cups-lpd> currently does not perform any access control based on the "
+"settings in I<cupsd.conf(5)> or in the I<hosts.allow(5)> or I<hosts.deny(5)> "
+"files used by TCP wrappers.  Therefore, running B<cups-lpd> on your server "
+"will allow any computer on your network (and perhaps the entire Internet) to "
+"print to your server."
+msgstr ""
+"B<cups-lpd> führt derzeit keine auf den Einstellungen in I<cupsd.conf(5)> "
+"oder in den von TCP-Wrappers verwandten Dateien I<hosts.allow(5)> oder "
+"I<hosts.deny(5)> basierte Zugriffskontrolle durch. Daher wird die Ausführung "
+"von B<cups-lpd> auf Ihrem Server es allen Computern in Ihrem Netz (und "
+"möglicherweise allen im Internet) erlauben, auf Ihrem Server zu drucken."
 
 #. type: Plain text
-#: cups.man:121
-#, no-wrap
+#: cups-lpd.8:82
 msgid ""
-"I<~/.cups/client.conf>\n"
-"I<~/.cups/lpoptions>\n"
+"While B<xinetd>(8)  has built-in access control support, you should use the "
+"TCP wrappers package with B<inetd>(8)  to limit access to only those "
+"computers that should be able to print through your server."
 msgstr ""
-"I<~/.cups/client.conf>\n"
-"I<~/.cups/lpoptions>\n"
+"Obwohl B<xinetd>(8) über eingebaute Zugriffskontrolle verfügt, sollten Sie "
+"das Paket TCP-Wrappers mit B<inetd>(8) verwenden, um den Zugriff auf solche "
+"Computer zu beschränken, denen es erlaubt sein soll, über Ihren Server zu "
+"drucken."
 
 #. type: Plain text
-#: cups.man:125
+#: cups-lpd.8:86
 msgid ""
-"B<CUPS> conforms to the Internet Printing Protocol version 2.1 and "
-"implements the Berkeley and System V UNIX print commands."
+"B<cups-lpd> is not enabled by the standard CUPS distribution.  Please "
+"consult with your operating system vendor to determine whether it is enabled "
+"by default on your system."
 msgstr ""
-"B<CUPS> ist zum »Internet Printing Protocol« Version 2.1 konform und "
-"implementiert die Berkeley- und System-V-UNIX-Druckbefehle."
+"B<cups-lpd> wird von der Standard-CUPS-Distribution nicht aktiviert. Bitte "
+"fragen Sie beim Betriebssystem-Vertreiber nach, ob es auf Ihrem System "
+"standardmäßig aktiviert ist oder nicht."
 
 #. type: Plain text
-#: cups.man:141
+#: cups-lpd.8:92
 msgid ""
-"B<cancel>(1), B<client.conf>(7), B<cupsctl>(8), B<cupsd>(8), B<lp>(1), "
-"B<lpadmin>(8), B<lpinfo>(8), B<lpoptions>(1), B<lpr>(1), B<lprm>(1), "
-"B<lpq>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help), CUPS "
-"Web Site (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup "
-"(http://www.pwg.org/ipp)"
+"If you are using B<inetd>(8), add the following line to the I<inetd.conf> "
+"file to enable the B<cups-lpd> mini-server:"
 msgstr ""
-"B<cancel>(1), B<client.conf>(7), B<cupsctl>(8), B<cupsd>(8), B<lp>(1), "
-"B<lpadmin>(8), B<lpinfo>(8), B<lpoptions>(1), B<lpr>(1), B<lprm>(1), "
-"B<lpq>(1), B<lpstat>(1), CUPS-Online-Hilfe (http://localhost:631/help), CUPS-"
-"Website (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup "
-"(http://www.pwg.org/ipp)"
-
-#. type: TH
-#: cups-snmp.conf.man:13
-#, no-wrap
-msgid "snmp.conf"
-msgstr "snmp.conf"
+"Falls Sie B<inetd>(8) verwenden, fügen Sie die folgenden Zeilen zu der Datei "
+"I<inetd.conf> hinzu, um den B<cups-lpd>-Miniserver zu aktivieren:"
 
 #. type: Plain text
-#: cups-snmp.conf.man:16
-#, fuzzy
-msgid "snmp.conf - snmp configuration file for cups"
-msgstr "snmp.conf - SNMP-Konfigurationsdatei für CUPS"
+#: cups-lpd.8:96
+#, no-wrap
+msgid ""
+"    printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd \\e\n"
+"        -o document-format=application/octet-stream\n"
+msgstr ""
+"    printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd \\e\n"
+"        -o document-format=application/octet-stream\n"
 
 #. type: Plain text
-#: cups-snmp.conf.man:21
+#: cups-lpd.8:102
 msgid ""
-"The B<snmp.conf> file configures how the standard CUPS network backends "
-"(http, https, ipp, ipps, lpd, snmp, and socket) access printer information "
-"using SNMPv1 and is normally located in the I</etc/cups> directory.  Each "
-"line in the file can be a configuration directive, a blank line, or a "
-"comment. Comment lines start with the # character."
+"I<Note:> If you are using Solaris 10 or higher, you must run the "
+"B<inetdconv>(1m)  program to register the changes to the I<inetd.conf> file."
 msgstr ""
-"Die Datei B<snmp.conf> konfiguriert, wie die Standard-CUPS-Netz-Backends "
-"(http, https, ipp, ipps, lpd, snmp und socket) auf Druckerinformationen "
-"mittels SNMPv1 zugreifen. Sie befindet sich normalerweise im Verzeichnis I</"
-"etc/cups>. Jede Zeile in der Datei kann eine Konfigurationsdirektive, eine "
-"Leerzeile oder ein Kommentar sein. Kommentarzeilen beginnen mit dem Zeichen "
-"»#«."
+"I<Hinweis:> Falls Sie Solaris 10 oder höher betreiben, müssen Sie das "
+"Programm B<inetdconv>(1m) ausführen, um die Änderungen an der Datei I<inetd."
+"conf> zu registrieren."
 
 #. type: Plain text
-#: cups-snmp.conf.man:24
+#: cups-lpd.8:111
 msgid ""
-"The Community and DebugLevel directives are used by all backends. The "
-"remainder apply only to the SNMP backend - B<cups-snmp>(8)."
+"CUPS includes configuration files for B<launchd>(8), B<systemd>(8), and "
+"B<xinetd>(8).  Simply enable the B<cups-lpd> service using the corresponding "
+"control program."
 msgstr ""
-"Die Direktiven Community und DebugLevel werden von allen Backends verwandt. "
-"Die restlichen gelten nur für das SNMP-Backend - B<cups-snmp>(8)."
+"CUPS enthält Konfigurationsdateien für B<launchd>(8), B<systemd>(8) und "
+"B<xinetd>(8). Aktivieren Sie den Dienst B<cups-lpd> einfach mittels des "
+"korrespondierenden Steuerungsprogramms."
 
 #. type: Plain text
-#: cups-snmp.conf.man:26
-msgid "The following directives are understood by the CUPS network backends:"
+#: cups-lpd.8:118
+msgid ""
+"B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), CUPS Online Help "
+"(http://localhost:631/help), RFC 2569"
 msgstr ""
-"Die nachfolgenden Direktiven werden von dem CUPS-Netz-Backend verstanden:"
+"B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), CUPS-Online-Hilfe "
+"(http://localhost:631/help), RFC 2569"
 
-#. type: TP
-#: cups-snmp.conf.man:26
+#. type: TH
+#: cups-snmp.8:9
 #, no-wrap
-msgid "B<Address @IF(>I<name>B<)>"
-msgstr "B<Address @IF(>I<Name>B<)>"
+msgid "cups-snmp"
+msgstr "cups-snmp"
 
-#. type: TP
-#: cups-snmp.conf.man:28
-#, no-wrap
-msgid "B<Address @LOCAL>"
-msgstr "B<Address @LOCAL>"
+#. type: Plain text
+#: cups-snmp.8:12
+#, fuzzy
+msgid "snmp - cups snmp backend (deprecated)"
+msgstr "snmp - CUPS-SNMP-Backend"
 
-#. type: TP
-#: cups-snmp.conf.man:30
-#, no-wrap
-msgid "B<Address >I<address>"
-msgstr "B<Address >I<Adresse>"
+#. type: Plain text
+#: cups-snmp.8:15
+msgid "B</usr/lib/cups/backend/snmp> I<ip-address-or-hostname>"
+msgstr "B</usr/lib/cups/backend/snmp> I<IP-Adresse-oder-Rechnername>"
 
 #. type: Plain text
-#: cups-snmp.conf.man:34
-msgid ""
-"Sends SNMP broadcast queries (for discovery) to the specified address(es).  "
-"There is no default for the broadcast address."
-msgstr ""
-"Sendet SNMP-Broadcast-Anfragen (zur Ermittlung) an die angegebene(n) "
-"Adresse(n). Es gibt keine Vorgabe für die Broadcast-Adresse."
+#: cups-snmp.8:18
+msgid "B</usr/libexec/cups/backend/snmp> I<ip-address-or-hostname>"
+msgstr "B</usr/libexec/cups/backend/snmp> I<IP-Adresse-oder-Rechnername>"
 
-#. type: TP
-#: cups-snmp.conf.man:34
-#, no-wrap
-msgid "B<Community >I<name>"
-msgstr "B<Community >I<Name>"
+#. type: Plain text
+#: cups-snmp.8:23
+msgid "B<lpinfo> B<-v> B<--include-schemes> snmp"
+msgstr "B<lpinfo> B<-v> B<--include-schemes> snmp"
 
 #. type: Plain text
-#: cups-snmp.conf.man:39
+#: cups-snmp.8:27
 #, fuzzy
 msgid ""
-"Specifies the community name to use.  Only a single community name may be "
-"specified.  The default community name is \"public\"."
-msgstr ""
-"Legt den zu verwendenden Gemeinschaftsnamen fest. Es darf nur ein einziger "
-"Gemeinschaftsname angegeben werden. Die Vorgabegemeinschaft ist »public«."
-
-#. type: TP
-#: cups-snmp.conf.man:39
-#, no-wrap
-msgid "B<DebugLevel >I<number>"
-msgstr "B<DebugLevel >I<Nummer>"
-
-#. type: Plain text
-#: cups-snmp.conf.man:44
-msgid ""
-"Specifies the logging level from 0 (none) to 3 (everything).  Typically only "
-"used for debugging (thus the name).  The default debug level is 0."
-msgstr ""
-"Legt die Debug-Stufe von 0 (nichts) bis 3 (alles) fest. Wird typischerweise "
-"nur für die Fehlersuche (Debugging, daher der Name) verwandt. Die Standard-"
-"Debug-Stufe ist 0."
-
-#. type: TP
-#: cups-snmp.conf.man:44
-#, no-wrap
-msgid "B<DeviceURI \">I<regular expression>B<\" >I<device-uri >[... I<device-uri>]"
-msgstr "B<DeviceURI \">I<regulärer Ausdruck>B<\" >I<Geräte-URI >[… I<Geräte-URI>]"
-
-#. type: Plain text
-#: cups-snmp.conf.man:49
-msgid ""
-"Specifies one or more device URIs that should be used for a given make and "
-"model string.  The regular expression is used to match the detected make and "
-"model, and the device URI strings must be of the form \"scheme://%s[:port]/"
-"[path]\", where \"%s\" represents the detected address or hostname.  There "
-"are no default device URI matching rules."
-msgstr ""
-"Legt eine oder mehrere Geräte-URIs, die für eine angegebene Marken- und "
-"Modellzeichenkette verwandt werden soll, fest. Der reguläre Ausdruck wird "
-"verwandt, um passend erkannte Marke und das Modell zu finden. Die Geräte-URI-"
-"Zeichenketten müssen von der Form »Schema://%s[:Port]/[Pfad]« sein, wobei "
-"»%s« die erkannte Adresse oder den Rechnernamen darstellt. Es gibt keine auf "
-"Geräte-URIs passende Standardregeln."
-
-#. type: TP
-#: cups-snmp.conf.man:49
-#, no-wrap
-msgid "B<HostNameLookups on>"
-msgstr "B<HostNameLookups on>"
-
-#. type: TP
-#: cups-snmp.conf.man:51
-#, no-wrap
-msgid "B<HostNameLookups off>"
-msgstr "B<HostNameLookups off>"
-
-#. type: Plain text
-#: cups-snmp.conf.man:55
-msgid ""
-"Specifies whether the addresses of printers should be converted to hostnames "
-"or left as numeric IP addresses.  The default is \"off\"."
-msgstr ""
-"Legt fest, ob die Druckeradressen in Rechnernamen konvertiert werden oder "
-"als numerische IP-Adressen verbleiben sollen. Der Vorgabewert ist »off«."
-
-#. type: TP
-#: cups-snmp.conf.man:55
-#, no-wrap
-msgid "B<MaxRunTime >I<seconds>"
-msgstr "B<MaxRunTime >I<Sekunden>"
-
-#. type: Plain text
-#: cups-snmp.conf.man:60
-msgid ""
-"Specifies the maximum number of seconds that the SNMP backend will scan the "
-"network for printers.  The default is 120 seconds (2 minutes)."
-msgstr ""
-"Legt die maximale Zeit in Sekunden, für die das SNMP-Backend das Netz nach "
-"Druckern durchsuchen wird, fest. Die Vorgabe ist 120 Sekunden (2 Minuten)."
-
-#. type: Plain text
-#: cups-snmp.conf.man:63
-msgid "B<cups-snmp>(8), CUPS Online Help (http://localhost:631/help)"
-msgstr "B<cups-snmp>(8), CUPS-Online-Hilfe (http://localhost:631/help)"
-
-#. type: TH
-#: cups-snmp.man.in:12
-#, no-wrap
-msgid "cups-snmp"
-msgstr "cups-snmp"
-
-#. type: Plain text
-#: cups-snmp.man.in:15
-#, fuzzy
-msgid "snmp - cups snmp backend"
-msgstr "snmp - CUPS-SNMP-Backend"
-
-#. type: Plain text
-#: cups-snmp.man.in:18
-msgid "B</usr/lib/cups/backend/snmp> I<ip-address-or-hostname>"
-msgstr "B</usr/lib/cups/backend/snmp> I<IP-Adresse-oder-Rechnername>"
-
-#. type: Plain text
-#: cups-snmp.man.in:21
-msgid "B</usr/libexec/cups/backend/snmp> I<ip-address-or-hostname>"
-msgstr "B</usr/libexec/cups/backend/snmp> I<IP-Adresse-oder-Rechnername>"
-
-#. type: Plain text
-#: cups-snmp.man.in:26
-msgid "B<lpinfo> B<-v> B<--include-schemes> snmp"
-msgstr "B<lpinfo> B<-v> B<--include-schemes> snmp"
-
-#. type: Plain text
-#: cups-snmp.man.in:30
-#, fuzzy
-msgid ""
-"The CUPS SNMP backend provides legacy discovery and identification of "
-"network printers using SNMPv1.  When used for discovery through the "
-"scheduler, the backend will list all printers that respond to a broadcast "
-"SNMPv1 query with the \"public\" community name.  Additional queries are "
-"then sent to printers that respond in order to determine the correct device "
-"URI, make and model, and other information needed for printing."
+"The B<DEPRECATED> CUPS SNMP backend provides legacy discovery and "
+"identification of network printers using SNMPv1.  When used for discovery "
+"through the scheduler, the backend will list all printers that respond to a "
+"broadcast SNMPv1 query with the \"public\" community name.  Additional "
+"queries are then sent to printers that respond in order to determine the "
+"correct device URI, make and model, and other information needed for "
+"printing."
 msgstr ""
 "Das CUPS-SNMP-Backend stellt eine alte Erkennungs- und "
 "Identifikationsmethode für Netzdrucker mittels SNMPv1 bereit. Wenn dies zur "
@@ -8254,7 +7904,7 @@ msgstr ""
 "Marke und das Modell und weitere druckrelevante Informationen zu bestimmen."
 
 #. type: Plain text
-#: cups-snmp.man.in:33
+#: cups-snmp.8:30
 msgid ""
 "In the first form, the SNMP backend is run directly by the user to look up "
 "the device URI and other information when you have an IP address or "
@@ -8268,7 +7918,7 @@ msgstr ""
 "Benutzer nichts außer der Adresse bereitgestellt hat."
 
 #. type: Plain text
-#: cups-snmp.man.in:40
+#: cups-snmp.8:37
 msgid ""
 "In the second form, the SNMP backend is run indirectly using the "
 "B<lpinfo>(8)  command.  The output provides all printers detected via SNMP "
@@ -8281,7 +7931,7 @@ msgstr ""
 "Standardmäßig sind keine Broadcast-Adressen konfiguriert.>"
 
 #. type: Plain text
-#: cups-snmp.man.in:43
+#: cups-snmp.8:40
 msgid ""
 "The DebugLevel value can be overridden using the CUPS_DEBUG_LEVEL "
 "environment variable.  The MaxRunTime value can be overridden using the "
@@ -8292,7 +7942,7 @@ msgstr ""
 "CUPS_MAX_RUN_TIME außer Kraft gesetzt werden."
 
 #. type: Plain text
-#: cups-snmp.man.in:47
+#: cups-snmp.8:44
 msgid ""
 "The SNMP backend reads the I</etc/cups/snmp.conf> configuration file, if "
 "present, to set the default broadcast address, community name, and logging "
@@ -8303,7 +7953,17 @@ msgstr ""
 "Gemeinschaftsnamen und die Protokollierstufe zu setzen."
 
 #. type: Plain text
-#: cups-snmp.man.in:49
+#: cups-snmp.8:47
+#, fuzzy
+msgid ""
+"The CUPS SNMP backend is deprecated and will no longer be supported in a "
+"future version of CUPS."
+msgstr ""
+"I<Dieses Programm ist veraltet und wird in einer zukünftigen "
+"Veröffentlichung von CUPS entfernt werden.>"
+
+#. type: Plain text
+#: cups-snmp.8:49
 msgid ""
 "The CUPS SNMP backend uses the information from the Host, Printer, and Port "
 "Monitor MIBs along with some vendor private MIBs and intelligent port probes "
@@ -8315,7 +7975,7 @@ msgstr ""
 "das Modell für jeden Drucker zu ermitteln."
 
 #. type: Plain text
-#: cups-snmp.man.in:55
+#: cups-snmp.8:55
 msgid ""
 "B<backend>(7), B<cups-snmp.conf>(5), B<cupsd>(8), B<lpinfo>(8), CUPS Online "
 "Help (http://localhost:631/help)"
@@ -8324,93 +7984,192 @@ msgstr ""
 "Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: cupstestdsc.man:13
+#: cups-snmp.conf.5:10
 #, no-wrap
-msgid "cupstestdsc"
-msgstr "cupstestdsc"
+msgid "snmp.conf"
+msgstr "snmp.conf"
+
+#. type: Plain text
+#: cups-snmp.conf.5:13
+#, fuzzy
+msgid "snmp.conf - snmp configuration file for cups (deprecated)"
+msgstr "snmp.conf - SNMP-Konfigurationsdatei für CUPS"
 
 #. type: Plain text
-#: cupstestdsc.man:16
-msgid "cupstestdsc - test conformance of postscript files (deprecated)"
-msgstr "cupstestdsc - überprüft Konformität von PostScript-Dateien (veraltet)"
+#: cups-snmp.conf.5:18
+msgid ""
+"The B<snmp.conf> file configures how the standard CUPS network backends "
+"(http, https, ipp, ipps, lpd, snmp, and socket) access printer information "
+"using SNMPv1 and is normally located in the I</etc/cups> directory.  Each "
+"line in the file can be a configuration directive, a blank line, or a "
+"comment. Comment lines start with the # character."
+msgstr ""
+"Die Datei B<snmp.conf> konfiguriert, wie die Standard-CUPS-Netz-Backends "
+"(http, https, ipp, ipps, lpd, snmp und socket) auf Druckerinformationen "
+"mittels SNMPv1 zugreifen. Sie befindet sich normalerweise im Verzeichnis I</"
+"etc/cups>. Jede Zeile in der Datei kann eine Konfigurationsdirektive, eine "
+"Leerzeile oder ein Kommentar sein. Kommentarzeilen beginnen mit dem Zeichen "
+"»#«."
 
 #. type: Plain text
-#: cupstestdsc.man:25
-msgid "B<cupstestdsc> [ B<-h> ] I<filename.ps> [ ...  I<filenameN.ps> ]"
-msgstr "B<cupstestdsc> [ B<-h> ] I<Dateiname.ps> [ …  I<DateinameN.ps> ]"
+#: cups-snmp.conf.5:21
+msgid ""
+"The Community and DebugLevel directives are used by all backends. The "
+"remainder apply only to the SNMP backend - B<cups-snmp>(8)."
+msgstr ""
+"Die Direktiven Community und DebugLevel werden von allen Backends verwandt. "
+"Die restlichen gelten nur für das SNMP-Backend - B<cups-snmp>(8)."
 
 #. type: Plain text
-#: cupstestdsc.man:31
-msgid "B<cupstestdsc> [ B<-h> ] B<->"
-msgstr "B<cupstestdsc> [ B<-h> ] B<->"
+#: cups-snmp.conf.5:23
+msgid "The following directives are understood by the CUPS network backends:"
+msgstr ""
+"Die nachfolgenden Direktiven werden von dem CUPS-Netz-Backend verstanden:"
+
+#. type: TP
+#: cups-snmp.conf.5:23
+#, no-wrap
+msgid "B<Address @IF(>I<name>B<)>"
+msgstr "B<Address @IF(>I<Name>B<)>"
+
+#. type: TP
+#: cups-snmp.conf.5:25
+#, no-wrap
+msgid "B<Address @LOCAL>"
+msgstr "B<Address @LOCAL>"
+
+#. type: TP
+#: cups-snmp.conf.5:27
+#, no-wrap
+msgid "B<Address >I<address>"
+msgstr "B<Address >I<Adresse>"
 
 #. type: Plain text
-#: cupstestdsc.man:35
+#: cups-snmp.conf.5:31
 msgid ""
-"B<cupstestdsc> tests the conformance of PostScript files to the Adobe "
-"PostScript Language Document Structuring Conventions Specification version "
-"3.0.  The results of testing and any other output are sent to the standard "
-"output.  The second form of the command reads PostScript from the standard "
-"input."
+"Sends SNMP broadcast queries (for discovery) to the specified address(es).  "
+"There is no default for the broadcast address."
 msgstr ""
-"B<cupstestdsc> überprüft die Konformität von PostScript-Dateien zu der Adobe "
-"PostScript Language Document Structuring Conventions Specification Version "
-"3.0. Das Ergebnis des Tests und alle anderen Ausgaben werden an die "
-"Standardausgabe gesandt. Die zweite Form des Befehls liest PostScript von "
-"der Standardeingabe."
+"Sendet SNMP-Broadcast-Anfragen (zur Ermittlung) an die angegebene(n) "
+"Adresse(n). Es gibt keine Vorgabe für die Broadcast-Adresse."
+
+#. type: TP
+#: cups-snmp.conf.5:31
+#, no-wrap
+msgid "B<Community >I<name>"
+msgstr "B<Community >I<Name>"
 
 #. type: Plain text
-#: cupstestdsc.man:37
+#: cups-snmp.conf.5:37
 #, fuzzy
 msgid ""
-"I<This program is deprecated and will be removed in a future release of CUPS."
-">"
+"Specifies the community name to use.  Only a single community name may be "
+"specified.  The default community name is \"public\".  If no name is "
+"specified, all SNMP functions are disabled."
 msgstr ""
-"I<Dieses Programm ist veraltet und wird in einer zukünftigen "
-"Veröffentlichung von CUPS entfernt werden.>"
+"Legt den zu verwendenden Gemeinschaftsnamen fest. Es darf nur ein einziger "
+"Gemeinschaftsname angegeben werden. Die Vorgabegemeinschaft ist »public«."
+
+#. type: TP
+#: cups-snmp.conf.5:37
+#, no-wrap
+msgid "B<DebugLevel >I<number>"
+msgstr "B<DebugLevel >I<Nummer>"
+
+#. type: Plain text
+#: cups-snmp.conf.5:42
+msgid ""
+"Specifies the logging level from 0 (none) to 3 (everything).  Typically only "
+"used for debugging (thus the name).  The default debug level is 0."
+msgstr ""
+"Legt die Debug-Stufe von 0 (nichts) bis 3 (alles) fest. Wird typischerweise "
+"nur für die Fehlersuche (Debugging, daher der Name) verwandt. Die Standard-"
+"Debug-Stufe ist 0."
+
+#. type: TP
+#: cups-snmp.conf.5:42
+#, no-wrap
+msgid "B<DeviceURI \">I<regular expression>B<\" >I<device-uri >[... I<device-uri>]"
+msgstr "B<DeviceURI \">I<regulärer Ausdruck>B<\" >I<Geräte-URI >[… I<Geräte-URI>]"
+
+#. type: Plain text
+#: cups-snmp.conf.5:47
+msgid ""
+"Specifies one or more device URIs that should be used for a given make and "
+"model string.  The regular expression is used to match the detected make and "
+"model, and the device URI strings must be of the form \"scheme://%s[:port]/"
+"[path]\", where \"%s\" represents the detected address or hostname.  There "
+"are no default device URI matching rules."
+msgstr ""
+"Legt eine oder mehrere Geräte-URIs, die für eine angegebene Marken- und "
+"Modellzeichenkette verwandt werden soll, fest. Der reguläre Ausdruck wird "
+"verwandt, um passend erkannte Marke und das Modell zu finden. Die Geräte-URI-"
+"Zeichenketten müssen von der Form »Schema://%s[:Port]/[Pfad]« sein, wobei "
+"»%s« die erkannte Adresse oder den Rechnernamen darstellt. Es gibt keine auf "
+"Geräte-URIs passende Standardregeln."
+
+#. type: TP
+#: cups-snmp.conf.5:47
+#, no-wrap
+msgid "B<HostNameLookups on>"
+msgstr "B<HostNameLookups on>"
+
+#. type: TP
+#: cups-snmp.conf.5:49
+#, no-wrap
+msgid "B<HostNameLookups off>"
+msgstr "B<HostNameLookups off>"
+
+#. type: Plain text
+#: cups-snmp.conf.5:53
+msgid ""
+"Specifies whether the addresses of printers should be converted to hostnames "
+"or left as numeric IP addresses.  The default is \"off\"."
+msgstr ""
+"Legt fest, ob die Druckeradressen in Rechnernamen konvertiert werden oder "
+"als numerische IP-Adressen verbleiben sollen. Der Vorgabewert ist »off«."
+
+#. type: TP
+#: cups-snmp.conf.5:53
+#, no-wrap
+msgid "B<MaxRunTime >I<seconds>"
+msgstr "B<MaxRunTime >I<Sekunden>"
 
 #. type: Plain text
-#: cupstestdsc.man:41
+#: cups-snmp.conf.5:58
 msgid ""
-"B<cupstestdsc> only validates the DSC comments in a PostScript file and does "
-"not attempt to validate the PostScript code itself.  Developers must ensure "
-"that the PostScript they generate follows the rules defined by Adobe.  "
-"Specifically, all pages must be independent of each other, code outside page "
-"descriptions may not affect the graphics state (current font, color, "
-"transform matrix, etc.), and device-specific commands such as setpagedevice "
-"should not be used."
+"Specifies the maximum number of seconds that the SNMP backend will scan the "
+"network for printers.  The default is 120 seconds (2 minutes)."
 msgstr ""
-"B<cupstestdsc> validiert nur die DSC-Kommentare in einer PostScript-Datei "
-"und versucht nicht, den PostScript-Code selbst zu validieren. Entwickler "
-"müssen sicherstellen, dass das von ihnen generierte PostScript den von Adobe "
-"definierten Regeln folgt. Insbesondere müssen alle Seiten voneinander "
-"unabhängig sein, Code außerhalb der Seitenbeschreibung sollte nicht den "
-"Graphikzustand betreffen (derzeit Schrift, Farbe, Transformationsmatrix "
-"usw.) und Geräte-spezifische Befehle wie setpagedevice sollten nicht "
-"verwandt werden."
+"Legt die maximale Zeit in Sekunden, für die das SNMP-Backend das Netz nach "
+"Druckern durchsuchen wird, fest. Die Vorgabe ist 120 Sekunden (2 Minuten)."
 
 #. type: Plain text
-#: cupstestdsc.man:45
+#: cups-snmp.conf.5:62
 msgid ""
-"CUPS Online Help (http://localhost:631/help), Adobe PostScript Language "
-"Document Structuring Conventions Specification, Version 3.0."
+"CUPS backends are deprecated and will no longer be supported in a future "
+"feature release of CUPS.  Printers that do not support IPP can be supported "
+"using applications such as B<ippeveprinter>(1)."
 msgstr ""
-"CUPS-Online-Hilfe (http://localhost:631/help), Adobe PostScript Language "
-"Document Structuring Conventions Specification, Version 3.0."
+
+#. type: Plain text
+#: cups-snmp.conf.5:65
+msgid "B<cups-snmp>(8), CUPS Online Help (http://localhost:631/help)"
+msgstr "B<cups-snmp>(8), CUPS-Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: cupstestppd.man:13
+#: cupstestppd.1:10
 #, no-wrap
 msgid "cupstestppd"
 msgstr "cupstestppd"
 
 #. type: Plain text
-#: cupstestppd.man:16
+#: cupstestppd.1:13
 msgid "cupstestppd - test conformance of ppd files"
 msgstr "cupstestppd - überprüft Konformität von PPD-Dateien"
 
 #. type: Plain text
-#: cupstestppd.man:38
+#: cupstestppd.1:35
 msgid ""
 "B<cupstestppd> [ B<-I> I<category> ] [ B<-R> I<rootdir> ] [ B<-W> "
 "I<category> ] [ B<-q> ] [ B<-r> ] [ B<-v>[B<v>] ] I<filename.ppd[.gz]> "
@@ -8421,7 +8180,7 @@ msgstr ""
 "[ …  I<Dateiname.ppd[.gz]> ]"
 
 #. type: Plain text
-#: cupstestppd.man:54
+#: cupstestppd.1:51
 msgid ""
 "B<cupstestppd> [ B<-R> I<rootdir> ] [ B<-W> I<category> ] [ B<-q> ] [ B<-"
 "r> ] [ B<-v>[B<v>] ] B<->"
@@ -8430,7 +8189,7 @@ msgstr ""
 "r> ] [ B<-v>[B<v>] ] B<->"
 
 #. type: Plain text
-#: cupstestppd.man:58
+#: cupstestppd.1:55
 msgid ""
 "B<cupstestppd> tests the conformance of PPD files to the Adobe PostScript "
 "Printer Description file format specification version 4.3.  It can also be "
@@ -8444,7 +8203,7 @@ msgstr ""
 "anderen Ausgaben werden an die Standardausgabe gesandt."
 
 #. type: Plain text
-#: cupstestppd.man:61
+#: cupstestppd.1:58
 msgid ""
 "The first form of B<cupstestppd> tests one or more PPD files on the command-"
 "line.  The second form tests the PPD file provided on the standard input."
@@ -8454,51 +8213,51 @@ msgstr ""
 "übergebene PPD-Datei."
 
 #. type: Plain text
-#: cupstestppd.man:63
+#: cupstestppd.1:60
 msgid "B<cupstestppd> supports the following options:"
 msgstr "B<cupstestppd> unterstützt die folgenden Optionen:"
 
 #. type: TP
-#: cupstestppd.man:63
+#: cupstestppd.1:60
 #, no-wrap
 msgid "B<-I filename>"
 msgstr "B<-I filename>"
 
 #. type: Plain text
-#: cupstestppd.man:66
+#: cupstestppd.1:63
 msgid "Ignores all PCFileName warnings."
 msgstr "Ignoriert alle PCFileName-Warnungen."
 
 #. type: TP
-#: cupstestppd.man:66
+#: cupstestppd.1:63
 #, no-wrap
 msgid "B<-I filters>"
 msgstr "B<-I filters>"
 
 #. type: Plain text
-#: cupstestppd.man:69
+#: cupstestppd.1:66
 msgid "Ignores all filter errors."
 msgstr "Ignoriert alle Filter-Fehler."
 
 #. type: TP
-#: cupstestppd.man:69
+#: cupstestppd.1:66
 #, no-wrap
 msgid "B<-I profiles>"
 msgstr "B<-I profiles>"
 
 #. type: Plain text
-#: cupstestppd.man:72
+#: cupstestppd.1:69
 msgid "Ignores all profile errors."
 msgstr "Ignoriert alle Profile-Fehler."
 
 #. type: TP
-#: cupstestppd.man:72
+#: cupstestppd.1:69
 #, no-wrap
 msgid "B<-R >I<rootdir>"
 msgstr "B<-R> I<Wurzelverz>"
 
 #. type: Plain text
-#: cupstestppd.man:75
+#: cupstestppd.1:72
 msgid ""
 "Specifies an alternate root directory for the filter, pre-filter, and other "
 "support file checks."
@@ -8507,24 +8266,24 @@ msgstr ""
 "andere unterstützte Dateiüberprüfungen fest."
 
 #. type: TP
-#: cupstestppd.man:75
+#: cupstestppd.1:72
 #, no-wrap
 msgid "B<-W constraints>"
 msgstr "B<-W constraints>"
 
 #. type: Plain text
-#: cupstestppd.man:78
+#: cupstestppd.1:75
 msgid "Report all UIConstraint errors as warnings."
 msgstr "Berichtet alle UIConstraint-Fehler als Warnungen."
 
 #. type: TP
-#: cupstestppd.man:78
+#: cupstestppd.1:75
 #, no-wrap
 msgid "B<-W defaults>"
 msgstr "B<-W defaults>"
 
 #. type: Plain text
-#: cupstestppd.man:81
+#: cupstestppd.1:78
 msgid ""
 "Except for size-related options, report all default option errors as "
 "warnings."
@@ -8533,90 +8292,90 @@ msgstr ""
 "Warnungen."
 
 #. type: TP
-#: cupstestppd.man:81
+#: cupstestppd.1:78
 #, no-wrap
 msgid "B<-W filters>"
 msgstr "B<-W filters>"
 
 #. type: Plain text
-#: cupstestppd.man:84
+#: cupstestppd.1:81
 msgid "Report all filter errors as warnings."
 msgstr "Berichtet alle Filterfehler als Warnungen."
 
 #. type: TP
-#: cupstestppd.man:84
+#: cupstestppd.1:81
 #, no-wrap
 msgid "B<-W profiles>"
 msgstr "B<-W profiles>"
 
 #. type: Plain text
-#: cupstestppd.man:87
+#: cupstestppd.1:84
 msgid "Report all profile errors as warnings."
 msgstr "Berichtet alle Profilfehler als Warnungen."
 
 #. type: TP
-#: cupstestppd.man:87
+#: cupstestppd.1:84
 #, no-wrap
 msgid "B<-W sizes>"
 msgstr "B<-W sizes>"
 
 #. type: Plain text
-#: cupstestppd.man:90
+#: cupstestppd.1:87
 msgid "Report all media size errors as warnings."
 msgstr "Berichtet alle Mediengrößenfehler als Warnungen."
 
 #. type: TP
-#: cupstestppd.man:90
+#: cupstestppd.1:87
 #, no-wrap
 msgid "B<-W translations>"
 msgstr "B<-W translations>"
 
 #. type: Plain text
-#: cupstestppd.man:93
+#: cupstestppd.1:90
 msgid "Report all translation errors as warnings."
 msgstr "Berichtet alle Übersetzungsfehler als Warnungen."
 
 #. type: TP
-#: cupstestppd.man:93
+#: cupstestppd.1:90
 #, no-wrap
 msgid "B<-W all>"
 msgstr "B<-W all>"
 
 #. type: Plain text
-#: cupstestppd.man:96
+#: cupstestppd.1:93
 msgid "Report all of the previous errors as warnings."
 msgstr "Berichtet alle vorhergehenden Fehler als Warnungen."
 
 #. type: TP
-#: cupstestppd.man:96
+#: cupstestppd.1:93
 #, no-wrap
 msgid "B<-W none>"
 msgstr "B<-W none>"
 
 #. type: Plain text
-#: cupstestppd.man:99
+#: cupstestppd.1:96
 msgid "Report all of the previous errors as errors."
 msgstr "Berichtet alle bisherigen Fehler als Fehler"
 
 #. type: TP
-#: cupstestppd.man:99 ippfind.man:110 ipptool.man:176 lpr.man:109
+#: cupstestppd.1:96 ippfind.1:107 ipptool.1:181 lpr.1:106
 #, no-wrap
 msgid "B<-q>"
 msgstr "B<-q>"
 
 #. type: Plain text
-#: cupstestppd.man:102
+#: cupstestppd.1:99
 msgid "Specifies that no information should be displayed."
 msgstr "Legt fest, dass keine Information angezeigt werden soll."
 
 #. type: TP
-#: cupstestppd.man:102 ippfind.man:115 lpr.man:112 lpstat.man:118
+#: cupstestppd.1:99 ippfind.1:112 lpr.1:109 lpstat.1:114
 #, no-wrap
 msgid "B<-r>"
 msgstr "B<-r>"
 
 #. type: Plain text
-#: cupstestppd.man:105
+#: cupstestppd.1:102
 msgid ""
 "Relaxes the PPD conformance requirements so that common whitespace, control "
 "character, and formatting problems are not treated as hard errors."
@@ -8625,8 +8384,14 @@ msgstr ""
 "Steuerzeichen und Formatierungsprobleme nicht als schwere Fehler behandelt "
 "werden."
 
+#. type: TP
+#: cupstestppd.1:102 ipptool.1:187 ppdc.1:76
+#, no-wrap
+msgid "B<-v>"
+msgstr "B<-v>"
+
 #. type: Plain text
-#: cupstestppd.man:108
+#: cupstestppd.1:105
 msgid ""
 "Specifies that detailed conformance testing results should be displayed "
 "rather than the concise PASS/FAIL/ERROR status."
@@ -8635,13 +8400,13 @@ msgstr ""
 "»PASS/FAIL/ERROR« Status angezeigt werden sollen."
 
 #. type: TP
-#: cupstestppd.man:108
+#: cupstestppd.1:105
 #, no-wrap
 msgid "B<-vv>"
 msgstr "B<-vv>"
 
 #. type: Plain text
-#: cupstestppd.man:111
+#: cupstestppd.1:108
 msgid ""
 "Specifies that all information in the PPD file should be displayed in "
 "addition to the detailed conformance testing results."
@@ -8650,14 +8415,14 @@ msgstr ""
 "detaillierten Konformitätstestergebnissen angezeigt werden sollen."
 
 #. type: Plain text
-#: cupstestppd.man:113
+#: cupstestppd.1:110
 msgid "The I<-q>, I<-v>, and I<-vv> options are mutually exclusive."
 msgstr ""
 "Die Optionen I<-q>, I<-v> und I<-vv> schließen sich gegenseitig paarweise "
 "aus."
 
 #. type: Plain text
-#: cupstestppd.man:116
+#: cupstestppd.1:113
 msgid ""
 "B<cupstestppd> returns zero on success and non-zero on error.  The error "
 "codes are as follows:"
@@ -8666,52 +8431,52 @@ msgstr ""
 "Fehlercodes lauten wie folgt:"
 
 #. type: TP
-#: cupstestppd.man:116
+#: cupstestppd.1:113
 #, no-wrap
 msgid "1"
 msgstr "1"
 
 #. type: Plain text
-#: cupstestppd.man:119
+#: cupstestppd.1:116
 msgid "Bad command-line arguments or missing PPD filename."
 msgstr "Fehlerhafte Befehlszeilenargumente oder fehlender PPD-Dateiname."
 
 #. type: TP
-#: cupstestppd.man:119
+#: cupstestppd.1:116
 #, no-wrap
 msgid "2"
 msgstr "2"
 
 #. type: Plain text
-#: cupstestppd.man:122
+#: cupstestppd.1:119
 msgid "Unable to open or read PPD file."
 msgstr "PPD-Datei kann nicht geöffnet oder gelesen werden."
 
 #. type: TP
-#: cupstestppd.man:122
+#: cupstestppd.1:119
 #, no-wrap
 msgid "3"
 msgstr "3"
 
 #. type: Plain text
-#: cupstestppd.man:125
+#: cupstestppd.1:122
 msgid "The PPD file contains format errors that cannot be skipped."
 msgstr ""
 "Die PPD-Datei enthält Formatfehler, die nicht übersprungen werden können."
 
 #. type: TP
-#: cupstestppd.man:125
+#: cupstestppd.1:122
 #, no-wrap
 msgid "4"
 msgstr "4"
 
 #. type: Plain text
-#: cupstestppd.man:128
+#: cupstestppd.1:125
 msgid "The PPD file does not conform to the Adobe PPD specification."
 msgstr "Die PPD-Datei folgt nicht der Adobe PPD-Spezifikation."
 
 #. type: Plain text
-#: cupstestppd.man:130
+#: cupstestppd.1:127
 msgid ""
 "The following command will test all PPD files under the current directory "
 "and print the names of each file that does not conform:"
@@ -8721,13 +8486,13 @@ msgstr ""
 "Spezifikation folgen:"
 
 #. type: Plain text
-#: cupstestppd.man:133
+#: cupstestppd.1:130
 #, no-wrap
 msgid "    find . -name \\e*.ppd \\e! -exec cupstestppd -q '{}' \\e; -print\n"
 msgstr "    find . -name \\e*.ppd \\e! -exec cupstestppd -q '{}' \\e; -print\n"
 
 #. type: Plain text
-#: cupstestppd.man:136
+#: cupstestppd.1:133
 msgid ""
 "The next command tests all PPD files under the current directory and print "
 "detailed conformance testing results for the files that do not conform:"
@@ -8737,7 +8502,7 @@ msgstr ""
 "Dateien aus, die keine Konformität aufweisen."
 
 #. type: Plain text
-#: cupstestppd.man:140
+#: cupstestppd.1:137
 #, no-wrap
 msgid ""
 "    find . -name \\e*.ppd \\e! -exec cupstestppd -q '{}' \\e; \\e\n"
@@ -8747,7 +8512,16 @@ msgstr ""
 "        -exec cupstestppd -v '{}' \\e;\n"
 
 #. type: Plain text
-#: cupstestppd.man:145
+#: cupstestppd.1:142 ppdc.1:94 ppdcfile.5:153 ppdhtml.1:39 ppdi.1:46
+#: ppdmerge.1:39 ppdpo.1:46
+msgid ""
+"PPD files are deprecated and will no longer be supported in a future feature "
+"release of CUPS.  Printers that do not support IPP can be supported using "
+"applications such as B<ippeveprinter>(1)."
+msgstr ""
+
+#. type: Plain text
+#: cupstestppd.1:146
 msgid ""
 "B<lpadmin>(8), CUPS Online Help (http://localhost:631/help), Adobe "
 "PostScript Printer Description File Format Specification, Version 4.3."
@@ -8756,24 +8530,18 @@ msgstr ""
 "PostScript Printer Description File Format Specification, Version 4.3."
 
 #. type: TH
-#: filter.man:13
+#: filter.7:10
 #, no-wrap
 msgid "filter"
 msgstr "filter"
 
-#. type: TH
-#: filter.man:13
-#, no-wrap
-msgid "19 October 2015"
-msgstr "19. Oktober 2015"
-
 #. type: Plain text
-#: filter.man:16
+#: filter.7:13
 msgid "filter - cups file conversion filter interface"
 msgstr "filter - CUPS-Datei-Umwandlungsfilter-Schnittstelle"
 
 #. type: Plain text
-#: filter.man:26
+#: filter.7:23
 msgid ""
 "B<filter> I<job> I<user> I<title> I<num-copies> I<options> [ I<filename> ]"
 msgstr ""
@@ -8781,7 +8549,7 @@ msgstr ""
 "[ I<Dateiname> ]"
 
 #. type: Plain text
-#: filter.man:32
+#: filter.7:29
 #, no-wrap
 msgid ""
 "B<ssize_t cupsBackChannelRead>(B<char *>I<buffer>, B<size_t >I<bytes>,\n"
@@ -8791,7 +8559,7 @@ msgstr ""
 "                            B<double >I<timeout>);\n"
 
 #. type: Plain text
-#: filter.man:36
+#: filter.7:33
 #, no-wrap
 msgid ""
 "B<cups_sc_status_t cupsSideChannelDoRequest>(B<cups_sc_command_t >I<command>,\n"
@@ -8803,13 +8571,13 @@ msgstr ""
 "                                          B<double >I<timeout>);\n"
 
 #. type: Plain text
-#: filter.man:38
+#: filter.7:35
 #, no-wrap
 msgid "B<#include E<lt>cups/ppd.hE<gt>>\n"
 msgstr "B<#include E<lt>cups/ppd.hE<gt>>\n"
 
 #. type: Plain text
-#: filter.man:41
+#: filter.7:38
 #, no-wrap
 msgid ""
 "B<const char *cupsGetOption>(B<const char *>I<name>, B<int >I<num_options>,\n"
@@ -8819,7 +8587,7 @@ msgstr ""
 "                 B<cups_option_t *>I<options>);\n"
 
 #. type: Plain text
-#: filter.man:44
+#: filter.7:41
 #, no-wrap
 msgid ""
 "B<int cupsMarkOptions>(B<ppd_file_t *>I<ppd>, B<int >I<num_options>,\n"
@@ -8829,7 +8597,7 @@ msgstr ""
 "                    B<cups_option_t *>I<options>);\n"
 
 #. type: Plain text
-#: filter.man:47
+#: filter.7:44
 #, no-wrap
 msgid ""
 "B<int cupsParseOptions>(B<const char *>I<arg>, B<int >I<num_options>,\n"
@@ -8839,25 +8607,25 @@ msgstr ""
 "                     B<cups_option_t **>I<options>);\n"
 
 #. type: Plain text
-#: filter.man:49
+#: filter.7:46
 #, no-wrap
 msgid "B<ppd_choice_t *ppdFindMarkedChoice>(B<ppd_file_t *>I<ppd>, B<const char *>I<keyword>);\n"
 msgstr "B<ppd_choice_t *ppdFindMarkedChoice>(B<ppd_file_t *>I<ppd>, B<const char *>I<keyword>);\n"
 
 #. type: Plain text
-#: filter.man:51
+#: filter.7:48
 #, no-wrap
 msgid "B<void ppdMarkDefaults>(B<ppd_file_t *>I<ppd>);\n"
 msgstr "B<void ppdMarkDefaults>(B<ppd_file_t *>I<ppd>);\n"
 
 #. type: Plain text
-#: filter.man:53
+#: filter.7:50
 #, no-wrap
 msgid "B<ppd_file_t *ppdOpenFile>(B<const char *>I<filename>);\n"
 msgstr "B<ppd_file_t *ppdOpenFile>(B<const char *>I<filename>);\n"
 
 #. type: Plain text
-#: filter.man:57
+#: filter.7:54
 msgid ""
 "The CUPS filter interface provides a standard method for adding support for "
 "new document types or printers to CUPS.  Each filter is capable of "
@@ -8873,7 +8641,7 @@ msgstr ""
 "Format wandelt."
 
 #. type: Plain text
-#: filter.man:61
+#: filter.7:58
 msgid ""
 "Filters B<MUST> be capable of reading from a filename on the command-line or "
 "from the standard input, copying the standard input to a temporary file as "
@@ -8889,7 +8657,7 @@ msgstr ""
 "Diensten zu kommunizieren."
 
 #. type: Plain text
-#: filter.man:63
+#: filter.7:60
 msgid ""
 "The command name (I<argv[0]>) is set to the name of the destination printer "
 "but is also available in the B<PRINTER>I< environment variable.>"
@@ -8898,7 +8666,7 @@ msgstr ""
 "ist aber auch über die I<Umgebungsvariable> B<PRINTER> verfügbar."
 
 #. type: Plain text
-#: filter.man:70
+#: filter.7:67
 msgid ""
 "Options are passed in I<argv[5]> and are encoded from the corresponding IPP "
 "attributes used when the job was submitted. Use the B<cupsParseOptions>()  "
@@ -8916,7 +8684,7 @@ msgstr ""
 "halten."
 
 #. type: Plain text
-#: filter.man:79
+#: filter.7:76
 msgid ""
 "Options passed on the command-line typically do not include the default "
 "choices the printer's PPD file. Use the B<ppdMarkDefaults>()  and "
@@ -8936,7 +8704,7 @@ msgstr ""
 "Wert der PPD-Option B<Duplex> zu ermitteln:"
 
 #. type: Plain text
-#: filter.man:84
+#: filter.7:81
 #, no-wrap
 msgid ""
 "    ppd_file_t *ppd = ppdOpenFile(getenv(\"PPD\"));\n"
@@ -8948,7 +8716,7 @@ msgstr ""
 "    int num_options = cupsParseOptions(argv[5], 0, &options);\n"
 
 #. type: Plain text
-#: filter.man:87
+#: filter.7:84
 #, no-wrap
 msgid ""
 "    ppdMarkDefaults(ppd);\n"
@@ -8958,13 +8726,13 @@ msgstr ""
 "    cupsMarkOptions(ppd, num_options, options);\n"
 
 #. type: Plain text
-#: filter.man:89
+#: filter.7:86
 #, no-wrap
 msgid "    ppd_choice_t *choice = ppdFindMarkedChoice(ppd, \"Duplex\");\n"
 msgstr "    ppd_choice_t *choice = ppdFindMarkedChoice(ppd, \"Duplex\");\n"
 
 #. type: Plain text
-#: filter.man:93
+#: filter.7:90
 msgid ""
 "Raster filters should use option choices set through the raster page header, "
 "as those reflect the options in effect for a given page.  Options specified "
@@ -8978,13 +8746,13 @@ msgstr ""
 "seitenweiser Basis überschrieben werden können, fest."
 
 #. type: SH
-#: filter.man:93
+#: filter.7:90
 #, no-wrap
 msgid "LOG MESSAGES"
 msgstr "PROTOKOLLNACHRICHTEN"
 
 #. type: Plain text
-#: filter.man:96
+#: filter.7:93
 msgid ""
 "Messages sent to the standard error are generally stored in the printer's "
 "\"printer-state-message\" attribute and the current B<ErrorLog> file.  Each "
@@ -8996,13 +8764,13 @@ msgstr ""
 "Standard-Präfix:"
 
 #. type: TP
-#: filter.man:96
+#: filter.7:93
 #, no-wrap
 msgid "B<ALERT: >I<message>"
 msgstr "B<ALERT: >I<Nachricht>"
 
 #. type: Plain text
-#: filter.man:99
+#: filter.7:96
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"alert\" log level."
@@ -9011,13 +8779,13 @@ msgstr ""
 "zum aktuellen B<ErrorLog> unter Verwendung der Protokollstufe »alert« hinzu."
 
 #. type: TP
-#: filter.man:99
+#: filter.7:96
 #, no-wrap
 msgid "B<ATTR: >I<attribute=value >[ I<... attribute=value>]"
 msgstr "B<ATTR: >I<Attribut=Wert >[ I<… Attribut=Wert>]"
 
 #. type: Plain text
-#: filter.man:105
+#: filter.7:102
 msgid ""
 "Sets the named job or printer attribute(s). The following job attributes can "
 "be set: \"job-media-progress\". The following printer attributes can be set: "
@@ -9033,13 +8801,13 @@ msgstr ""
 "description«."
 
 #. type: TP
-#: filter.man:105
+#: filter.7:102
 #, no-wrap
 msgid "B<CRIT: >I<message>"
 msgstr "B<CRIT: >I<Nachricht>"
 
 #. type: Plain text
-#: filter.man:108
+#: filter.7:105
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"critical\" log level."
@@ -9049,13 +8817,13 @@ msgstr ""
 "hinzu."
 
 #. type: TP
-#: filter.man:108
+#: filter.7:105
 #, no-wrap
 msgid "B<DEBUG: >I<message>"
 msgstr "B<DEBUG: >I<Nachricht>"
 
 #. type: Plain text
-#: filter.man:112
+#: filter.7:109
 msgid ""
 "Adds the specified message to the current B<ErrorLog> using the \"debug\" "
 "log level.  B<DEBUG> messages are never stored in the \"printer-state-message"
@@ -9066,13 +8834,13 @@ msgstr ""
 "»printer-state-message« gespeichert."
 
 #. type: TP
-#: filter.man:112
+#: filter.7:109
 #, no-wrap
 msgid "B<DEBUG2: >I<message>"
 msgstr "B<DEBUG2: >I<Nachricht>"
 
 #. type: Plain text
-#: filter.man:117
+#: filter.7:114
 msgid ""
 "Adds the specified message to the current B<ErrorLog> using the \"debug2\" "
 "log level.  B<DEBUG2> messages are never stored in the \"printer-state-"
@@ -9083,13 +8851,13 @@ msgstr ""
 "»printer-state-message« gespeichert."
 
 #. type: TP
-#: filter.man:117
+#: filter.7:114
 #, no-wrap
 msgid "B<EMERG: >I<message>"
 msgstr "B<EMERG: >I<Nachricht>"
 
 #. type: Plain text
-#: filter.man:120
+#: filter.7:117
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"emergency\" log level."
@@ -9099,13 +8867,13 @@ msgstr ""
 "hinzu."
 
 #. type: TP
-#: filter.man:120
+#: filter.7:117
 #, no-wrap
 msgid "B<ERROR:>I< message>"
 msgstr "B<ERROR:>I< Nachricht>"
 
 #. type: Plain text
-#: filter.man:123
+#: filter.7:120
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"error\" log level."
@@ -9114,13 +8882,13 @@ msgstr ""
 "zum aktuellen B<ErrorLog> unter Verwendung der Protokollstufe »error« hinzu."
 
 #. type: TP
-#: filter.man:123
+#: filter.7:120
 #, no-wrap
 msgid "B<INFO:>I< message>"
 msgstr "B<INFO:>I< Nachricht>"
 
 #. type: Plain text
-#: filter.man:126
+#: filter.7:123
 msgid ""
 "Sets the \"printer-state-message\" attribute. If the current B<LogLevel> is "
 "set to \"debug2\", also adds the specified message to the current "
@@ -9131,13 +8899,13 @@ msgstr ""
 "aktuellen B<ErrorLog> unter Benutzung der »info«-Protokollstufe hinzugefügt."
 
 #. type: TP
-#: filter.man:126
+#: filter.7:123
 #, no-wrap
 msgid "B<NOTICE:>I< message>"
 msgstr "B<NOTICE:>I< Nachricht>"
 
 #. type: Plain text
-#: filter.man:129
+#: filter.7:126
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"notice\" log level."
@@ -9146,19 +8914,19 @@ msgstr ""
 "zum aktuellen B<ErrorLog> unter Verwendung der Protokollstufe »notice« hinzu."
 
 #. type: TP
-#: filter.man:129
+#: filter.7:126
 #, no-wrap
 msgid "B<PAGE:>I< page-number #-copies>"
 msgstr "B<PAGE:>I< Seitenzahl #-Kopien>"
 
 #. type: TP
-#: filter.man:131
+#: filter.7:128
 #, no-wrap
 msgid "B<PAGE:>I< total #-pages>"
 msgstr "B<PAGE:>I< Gesamt #-Seiten>"
 
 #. type: Plain text
-#: filter.man:134
+#: filter.7:131
 msgid ""
 "Adds an entry to the current B<PageLog>. The first form adds I<#-copies> to "
 "the \"job-media-sheets-completed\" attribute. The second form sets the \"job-"
@@ -9169,13 +8937,13 @@ msgstr ""
 "setzt das Attribut »job-media-sheets-completed« auf I<#-Seiten>."
 
 #. type: TP
-#: filter.man:134
+#: filter.7:131
 #, no-wrap
 msgid "B<PPD:>I< Keyword=Value> [ I<... KeywordN=Value> ]"
 msgstr "B<PPD:>I< Schlüsselwort=Wert> [ I<… SchlüsselwortN=Wert> ]"
 
 #. type: Plain text
-#: filter.man:137
+#: filter.7:134
 msgid ""
 "Sets the named keywords in the printer's PPD file. This is typically used to "
 "update default option keywords such as B<DefaultPageSize> and the various "
@@ -9187,25 +8955,25 @@ msgstr ""
 "Datei, zu aktualisieren."
 
 #. type: TP
-#: filter.man:137
+#: filter.7:134
 #, no-wrap
 msgid "B<STATE:>I< printer-state-reason >[ I<... printer-state-reason> ]"
 msgstr "B<STATE:>I< Drucker-Zustand-Grund >[ I<… Drucker-Zustand-Grund> ]"
 
 #. type: TP
-#: filter.man:139
+#: filter.7:136
 #, no-wrap
 msgid "B<STATE: +>I< printer-state-reason >[ I<... printer-state-reason> ]"
 msgstr "B<STATE: +>I< Drucker-Zustand-Grund >[ I<… Drucker-Zustand-Grund> ]"
 
 #. type: TP
-#: filter.man:141
+#: filter.7:138
 #, no-wrap
 msgid "B<STATE: ->I< printer-state-reason >[ I<... printer-state-reason> ]"
 msgstr "B<STATE: ->I< Drucker-Zustand-Grund >[ I<… Drucker-Zustand-Grund> ]"
 
 #. type: Plain text
-#: filter.man:144
+#: filter.7:141
 msgid ""
 "Sets, adds, or removes \"printer-state-reason\" keywords for the current "
 "queue. Typically this is used to indicate media, ink, and toner conditions "
@@ -9216,13 +8984,13 @@ msgstr ""
 "Medien-, Tinten- und Toner-Bedingungen auf einem Drucker anzuzeigen."
 
 #. type: TP
-#: filter.man:144
+#: filter.7:141
 #, no-wrap
 msgid "B<WARNING:>I< message>"
 msgstr "B<WARNING:>I< Nachricht>"
 
 #. type: Plain text
-#: filter.man:147
+#: filter.7:144
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"warning\" log level."
@@ -9232,13 +9000,13 @@ msgstr ""
 "hinzu."
 
 #. type: SH
-#: filter.man:147
+#: filter.7:144
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr "UMGEBUNGSVARIABLEN"
 
 #. type: Plain text
-#: filter.man:150
+#: filter.7:147
 msgid ""
 "The following environment variables are defined by the CUPS server when "
 "executing the filter:"
@@ -9247,24 +9015,24 @@ msgstr ""
 "Filtern gesetzt:"
 
 #. type: TP
-#: filter.man:150
+#: filter.7:147
 #, no-wrap
 msgid "B<CHARSET>"
 msgstr "B<CHARSET>"
 
 #. type: Plain text
-#: filter.man:153
+#: filter.7:150
 msgid "The default text character set, typically \"utf-8\"."
 msgstr "Der Standard-Textzeichensatz, typischerweise »utf-8«."
 
 #. type: TP
-#: filter.man:153
+#: filter.7:150
 #, no-wrap
 msgid "B<CLASS>"
 msgstr "B<CLASS>"
 
 #. type: Plain text
-#: filter.man:156
+#: filter.7:153
 msgid ""
 "When a job is submitted to a printer class, contains the name of the "
 "destination printer class. Otherwise this environment variable will not be "
@@ -9275,13 +9043,13 @@ msgstr ""
 "nicht gesetzt."
 
 #. type: TP
-#: filter.man:156
+#: filter.7:153
 #, no-wrap
 msgid "B<CONTENT_TYPE>"
 msgstr "B<CONTENT_TYPE>"
 
 #. type: Plain text
-#: filter.man:159
+#: filter.7:156
 msgid ""
 "The MIME media type associated with the submitted job file, for example "
 "\"application/postscript\"."
@@ -9290,7 +9058,7 @@ msgstr ""
 "»application/postscript«)."
 
 #. type: Plain text
-#: filter.man:162
+#: filter.7:159
 msgid ""
 "The directory where semi-persistent cache files can be found and stored."
 msgstr ""
@@ -9298,13 +9066,13 @@ msgstr ""
 "gespeichert werden."
 
 #. type: TP
-#: filter.man:165
+#: filter.7:162
 #, no-wrap
 msgid "B<CUPS_FILETYPE>"
 msgstr "B<CUPS_FILETYPE>"
 
 #. type: Plain text
-#: filter.man:169
+#: filter.7:166
 msgid ""
 "The type of file being printed: \"job-sheet\" for a banner page and "
 "\"document\" for a regular print file."
@@ -9313,13 +9081,13 @@ msgstr ""
 "»document« für eine reguläre Druckdatei."
 
 #. type: TP
-#: filter.man:169
+#: filter.7:166
 #, no-wrap
 msgid "B<CUPS_MAX_MESSAGE>"
 msgstr "B<CUPS_MAX_MESSAGE>"
 
 #. type: Plain text
-#: filter.man:172
+#: filter.7:169
 msgid ""
 "The maximum size of a message sent to I<stderr>, including any leading "
 "prefix and the trailing newline."
@@ -9328,13 +9096,13 @@ msgstr ""
 "Präfixe und den abschließenden Zeilenumbruch."
 
 #. type: TP
-#: filter.man:175
+#: filter.7:172
 #, no-wrap
 msgid "B<FINAL_CONTENT_TYPE>"
 msgstr "B<FINAL_CONTENT_TYPE>"
 
 #. type: Plain text
-#: filter.man:178
+#: filter.7:175
 msgid ""
 "The MIME media type associated with the output destined for the printer, for "
 "example \"application/vnd.cups-postscript\"."
@@ -9343,24 +9111,24 @@ msgstr ""
 "B. application/vnd.cups-postscript)."
 
 #. type: TP
-#: filter.man:178
+#: filter.7:175
 #, no-wrap
 msgid "B<LANG>"
 msgstr "B<LANG>"
 
 #. type: Plain text
-#: filter.man:181
+#: filter.7:178
 msgid "The default language locale (typically C or en)."
 msgstr "Die Standardsprach-Standorteinstellung (normalerweise C oder en)."
 
 #. type: TP
-#: filter.man:181
+#: filter.7:178
 #, no-wrap
 msgid "B<PATH>"
 msgstr "B<PATH>"
 
 #. type: Plain text
-#: filter.man:184
+#: filter.7:181
 msgid ""
 "The standard execution path for external programs that may be run by the "
 "filter."
@@ -9369,13 +9137,13 @@ msgstr ""
 "ausgeführt werden dürfen."
 
 #. type: TP
-#: filter.man:184
+#: filter.7:181
 #, no-wrap
 msgid "B<PPD>"
 msgstr "B<PPD>"
 
 #. type: Plain text
-#: filter.man:187
+#: filter.7:184
 msgid ""
 "The full pathname of the PostScript Printer Description (PPD) file for this "
 "printer."
@@ -9384,31 +9152,31 @@ msgstr ""
 "diesen Drucker."
 
 #. type: Plain text
-#: filter.man:190
+#: filter.7:187
 msgid "The name of the printer."
 msgstr "Der Name des Druckers."
 
 #. type: TP
-#: filter.man:190
+#: filter.7:187
 #, no-wrap
 msgid "B<RIP_CACHE>"
 msgstr "B<RIP_CACHE>"
 
 #. type: Plain text
-#: filter.man:193
+#: filter.7:190
 msgid ""
 "The recommended amount of memory to use for Raster Image Processors (RIPs)."
 msgstr ""
 "Die empfohlene Speichermenge zum Einsatz für Raster Image Processors (RIPs)."
 
 #. type: TP
-#: filter.man:193
+#: filter.7:190
 #, no-wrap
 msgid "B<SOFTWARE>"
 msgstr "B<SOFTWARE>"
 
 #. type: Plain text
-#: filter.man:196
+#: filter.7:193
 msgid ""
 "The name and version number of the server (typically CUPS/I<major.minor>)."
 msgstr ""
@@ -9416,24 +9184,24 @@ msgstr ""
 "Neben>)."
 
 #. type: TP
-#: filter.man:196
+#: filter.7:193
 #, no-wrap
 msgid "B<TZ>"
 msgstr "B<TZ>"
 
 #. type: Plain text
-#: filter.man:199
+#: filter.7:196
 msgid "The timezone of the server."
 msgstr "Die Zeitzone des Servers."
 
 #. type: TP
-#: filter.man:199
+#: filter.7:196
 #, no-wrap
 msgid "B<USER>"
 msgstr "B<USER>"
 
 #. type: Plain text
-#: filter.man:202
+#: filter.7:199
 msgid ""
 "The user executing the filter, typically \"lp\" or \"root\"; consult the "
 "I<cups-files.conf> file for the current setting."
@@ -9442,7 +9210,7 @@ msgstr ""
 "schauen Sie in die Datei I<cups-files.conf> für die aktuellen Einstellungen."
 
 #. type: Plain text
-#: filter.man:204
+#: filter.7:201
 msgid ""
 "While the filter interface is compatible with System V interface scripts, "
 "CUPS does not support System V interface scripts."
@@ -9451,7 +9219,7 @@ msgstr ""
 "kompatibel ist, unterstützt CUPS nicht die System-V-Schnittstellenskripte."
 
 #. type: Plain text
-#: filter.man:211
+#: filter.7:212
 msgid ""
 "CUPS filters are not meant to be run directly by the user.  Aside from the "
 "legacy System V interface issues (I<argv[0]> is the printer name), CUPS "
@@ -9473,7 +9241,7 @@ msgstr ""
 "die von Ihnen benötigten Umwandlungen auszuführen."
 
 #. type: Plain text
-#: filter.man:217
+#: filter.7:218
 msgid ""
 "B<backend>(7), B<cups>(1), B<cups-files.conf>(5), B<cupsd>(8), "
 "B<cupsfilter>(8),"
@@ -9482,5127 +9250,5363 @@ msgstr ""
 "B<cupsfilter>(8),"
 
 #. type: TH
-#: ippfind.man:12
+#: ippevepcl.7:9
 #, no-wrap
-msgid "ippfind"
-msgstr "ippfind"
+msgid "ippevepcl/ps"
+msgstr ""
 
 #. type: TH
-#: ippfind.man:12
-#, no-wrap
-msgid "14 February 2018"
-msgstr "14. Februar 2018"
+#: ippevepcl.7:9
+#, fuzzy, no-wrap
+msgid "24 April 2019"
+msgstr "24. April 2018"
 
 #. type: Plain text
-#: ippfind.man:15
-msgid "ippfind - find internet printing protocol printers"
-msgstr "ippfind - Internet-Printing-Protocol-Drucker finden"
+#: ippevepcl.7:12
+msgid "ippevepcl/ps - pcl and postscript print commands for ippeveprinter"
+msgstr ""
+
+#. type: Plain text
+#: ippevepcl.7:17
+#, fuzzy
+msgid "B<ippevepcl> [ I<filename> ]"
+msgstr "B<PageLog >[ I<Dateiname> ]"
+
+#. type: Plain text
+#: ippevepcl.7:22
+#, fuzzy
+msgid "B<ippeveps> [ I<filename> ]"
+msgstr "B<PageLog >[ I<Dateiname> ]"
 
 #. type: Plain text
-#: ippfind.man:22
+#: ippevepcl.7:31
 msgid ""
-"B<ippfind> [ I<options> ] I<regtype>[B<,>I<subtype>][B<.>I<domain>B<.>] ... "
-"[ I<expression> ... ]"
+"B<ippevepcl> and B<ippeveps> are print commands for B<ippeveprinter>(1).  As "
+"with all print commands, these commands read either the filename specified "
+"on the command-line or from the standard input.  Output is sent to the "
+"standard output.  Status and progress messages are sent to the standard "
+"error."
 msgstr ""
-"B<ippfind> [ I<Optionen> ] I<Regtyp>[B<,>I<Untertyp>][B<.>I<Domain>B<.>] … "
-"[ I<Ausdruck> … ]"
 
 #. type: Plain text
-#: ippfind.man:29
+#: ippevepcl.7:34
 msgid ""
-"B<ippfind> [ I<options> ] I<name>[B<.>I<regtype>[B<.>I<domain>B<.>]] ... "
-"[ I<expression> ... ]"
+"B<ippevepcl> prints to B&W HP PCL laser printers and supports printing of HP "
+"PCL (application/vnd.hp-pcl), PWG Raster (image/pwg-raster), and Apple "
+"Raster (image/urf) print files."
 msgstr ""
-"B<ippfind> [ I<Optionen> ] I<Name>[B<.>I<Regtyp>[B<.>I<Domain>B<.>]] … "
-"[ I<Ausdruck> … ]"
 
 #. type: Plain text
-#: ippfind.man:32
-msgid "B<ippfind> B<--help>"
-msgstr "B<ippfind> B<--help>"
+#: ippevepcl.7:39
+msgid ""
+"B<ippeveps> print to Adobe PostScript printers and supports printing of PDF "
+"(application/pdf), PostScript (application/postscript), JPEG (image/jpeg), "
+"PWG Raster (image/pwg-raster), and Apple Raster (image/urf) print files.  "
+"Printer-specific commands are read from a supplied PPD file.  If no PPD file "
+"is specified, generic commands suitable for any Level 2 or Level 3 "
+"PostScript printer are used instead to specify duplex printing and media "
+"size."
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:35
-msgid "B<ippfind> B<--version>"
-msgstr "B<ippfind> B<--version>"
+#: ippevepcl.7:41
+msgid "These programs return 1 on error and 0 on success."
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:38
+#: ippevepcl.7:45
 msgid ""
-"B<ippfind> finds services registered with a DNS server or available through "
-"local devices.  Its primary purpose is to find IPP printers and show their "
-"URIs, show their current status, or run commands."
+"These program inherit the environment provided by the B<ippeveprinter> "
+"program."
 msgstr ""
-"B<ippfind> findet Dienste, die bei einem DNS-Server registriert oder über "
-"lokale Geräte verfügbar sind. Sein Hauptzweck ist das Auffinden von IPP-"
-"Druckern und Anzeigen ihrer URIs, der Anzeige ihres aktuellen Status oder "
-"dem Ausführen von Befehlen."
 
-#. type: SS
-#: ippfind.man:38
-#, no-wrap
-msgid "REGISTRATION TYPES"
-msgstr "REGISTRIERUNGSTYPEN"
+#. type: Plain text
+#: ippevepcl.7:47
+#, fuzzy
+msgid "B<ippeveprinter>(8)"
+msgstr "B<-p >[I<Drucker>]"
 
 #. type: Plain text
-#: ippfind.man:40
-msgid "B<ippfind> supports the following registration types:"
-msgstr "B<ippfind> unterstützt die folgenden Registrierungstypen:"
+#: ippevepcl.7:48
+#, fuzzy
+msgid "Copyright \\[co] 2019 by Apple Inc."
+msgstr "Copyright \\[co] 2007-2019 by Apple Inc."
 
-#. type: TP
-#: ippfind.man:40
-#, no-wrap
-msgid "_http._tcp"
-msgstr "_http._tcp"
+#. type: TH
+#: ippeveprinter.1:9
+#, fuzzy, no-wrap
+msgid "ippeveprinter"
+msgstr "/printers"
+
+#. type: TH
+#: ippeveprinter.1:9
+#, fuzzy, no-wrap
+msgid "17 May 2019"
+msgstr "2. Mai 2019"
 
 #. type: Plain text
-#: ippfind.man:43
-msgid "HyperText Transport Protocol (HTTP, RFC 2616)"
-msgstr "HyperText Transport Protocol (HTTP, RFC 2616)"
+#: ippeveprinter.1:12
+msgid "ippeveprinter - an ipp everywhere printer application for cups"
+msgstr ""
 
-#. type: TP
-#: ippfind.man:43
-#, no-wrap
-msgid "_https._tcp"
-msgstr "_https._tcp"
+#. type: Plain text
+#: ippeveprinter.1:79
+#, fuzzy
+msgid ""
+"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] "
+"[ B<-2> ] [ B<-D> I<device-uri> ] [ B<-F> I<output-type/subtype> ] [ B<-K> "
+"I<keypath> ] [ B<-M> I<manufacturer> ] [ B<-P> I<filename.ppd> ] [ B<-V> "
+"I<ipp-version> ] [ B<-a> I<filename.conf> ] [ B<-c> I<command> ] [ B<-d> "
+"I<spool-directory> ] [ B<-f> I<type/subtype[,...]> ] [ B<-i> I<iconfile."
+"png> ] [ B<-k> ] [ B<-l> I<location> ] [ B<-m> I<model> ] [ B<-n> "
+"I<hostname> ] [ B<-p> I<port> ] [ B<-r> I<subtype[,subtype]> ] [ B<-s> "
+"I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
+msgstr ""
+"B<ippserver> [ B<-2> ] [ B<-M> I<Hersteller> ] [ B<-P> ] [ B<-c> I<Befehl> ] "
+"[ B<-d> I<Spool-Verzeichnis> ] [ B<-f> I<Typ/Untertyp[,… ]> [ B<-h> ] [ B<-"
+"i> I<icondatei.png> ] [ B<-k> ] [ B<-l> I<Ort> ] [ B<-m> I<Modell> ] [ B<-n> "
+"I<Rechnername> ] [ B<-p> I<Port> ] [ B<-r> I<Untertyp> ] [ B<-s> "
+"I<Geschwindigkeit[,Farbgeschwindigkeit]> ] [ B<-v[vvv]> ] I<Dienstename>"
 
 #. type: Plain text
-#: ippfind.man:46
-msgid "Secure HyperText Transport Protocol (HTTPS, RFC 2818)"
-msgstr "Secure HyperText Transport Protocol (HTTPS, RFC 2818)"
+#: ippeveprinter.1:82
+#, fuzzy
+msgid ""
+"B<ippeveprinter> is a simple Internet Printing Protocol (IPP) server "
+"conforming to the IPP Everywhere (PWG 5100.14) specification. It can be used "
+"to test client software or act as a very basic print server that runs a "
+"command for every job that is printed."
+msgstr ""
+"B<ippserver> ist ein einfacher Internet Printing Protocol (IPP)-Server, der "
+"der Spezifikation »IPP Everywhere (PWG 5100.14)« folgt. Er kann zum Testen "
+"von Client-Software dienen oder als sehr rudimentärer Server, der für jeden "
+"Druckauftrag einen Befehl ausführt, verwandt werden."
 
-#. type: TP
-#: ippfind.man:46
-#, no-wrap
-msgid "_ipp._tcp"
-msgstr "_ipp._tcp"
+#. type: Plain text
+#: ippeveprinter.1:85
+#, fuzzy
+msgid "The following options are recognized by B<ippeveprinter:>"
+msgstr "Die folgenden Optionen werden von I<ippserver> erkannt:"
 
 #. type: Plain text
-#: ippfind.man:49
-msgid "Internet Printing Protocol (IPP, RFC 2911)"
-msgstr "Internet Printing Protocol (IPP, RFC 2911)"
+#: ippeveprinter.1:88
+#, fuzzy
+msgid "Show program usage."
+msgstr "Zeigt die Programm-Verwendung."
 
 #. type: TP
-#: ippfind.man:49
+#: ippeveprinter.1:88
 #, no-wrap
-msgid "_ipps._tcp"
-msgstr "_ipps._tcp"
+msgid "B<--no-web-forms>"
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:52
-msgid "Secure Internet Printing Protocol (IPPS, draft)"
-msgstr "Secure Internet Printing Protocol (IPPS, draft)"
+#: ippeveprinter.1:91
+msgid ""
+"Disable the web interface forms used to update the media and supply levels."
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:94
+#, fuzzy
+msgid "Show the CUPS version."
+msgstr "Zeigt, ob der CUPS-Server läuft."
 
 #. type: TP
-#: ippfind.man:52
+#: ippeveprinter.1:94
 #, no-wrap
-msgid "_printer._tcp"
-msgstr "_printer._tcp"
+msgid "B<-2>"
+msgstr "B<-2>"
 
 #. type: Plain text
-#: ippfind.man:55
-msgid "Line Printer Daemon (LPD, RFC 1179)"
-msgstr "Line Printer Daemon (LPD, RFC 1179)"
+#: ippeveprinter.1:97
+msgid "Report support for two-sided (duplex) printing."
+msgstr "Meldet die Unterstützung für zweiseitigen (Duplex-)Druck."
 
-#. type: SS
-#: ippfind.man:55
-#, no-wrap
-msgid "EXPRESSIONS"
-msgstr "AUSDRÜCKE"
+#. type: TP
+#: ippeveprinter.1:97
+#, fuzzy, no-wrap
+msgid "B<-D >I<device-uri>"
+msgstr "B<-v \">I<Geräte-URI>B<\">"
 
 #. type: Plain text
-#: ippfind.man:64
+#: ippeveprinter.1:104
 msgid ""
-"B<ippfind> supports expressions much like the B<find>(1)  utility.  However, "
-"unlike B<find>(1), B<ippfind> uses POSIX regular expressions instead of "
-"shell filename matching patterns.  If I<--exec>, I<-l>, I<--ls>, I<-p>, I<--"
-"print>, I<--print-name>, I<-q>, I<--quiet>, I<-s>, or I<-x> is not "
-"specified, B<ippfind> adds I<--print> to print the service URI of anything "
-"it finds.  The following expressions are supported:"
+"Set the device URI for print output.  The URI can be a filename, directory, "
+"or a network socket URI of the form \"socket://ADDRESS[:PORT]\" (where the "
+"default port number is 9100).  When specifying a directory, B<ippeveprinter> "
+"will create an output file using the job ID and name."
 msgstr ""
-"B<ippfind> unterstützt ähnlich wie das Hilfswerkzeug B<find>(1) reguläre "
-"Ausdrücke. Anders als B<find>(1) verwendet B<ippfind> allerdings POSIX-"
-"reguläre-Ausdrücke statt die Dateinamen-Platzhalter-Muster der Shell. Falls "
-"I<--exec>, I<-l>, I<--ls>, I<-p>, I<--print>, I<--print-name>, I<-q>, I<--"
-"quiet>, I<-s> oder I<-x> nicht angegeben ist wird B<ippfind> I<--print> "
-"hinzufügen, um die Dienste-URIs aller Treffer auszugeben. Die folgenden "
-"Ausdrücke werden unterstützt:"
 
 #. type: TP
-#: ippfind.man:64
-#, no-wrap
-msgid "B<-d >I<regex>"
-msgstr "B<-d >I<RegAus>"
+#: ippeveprinter.1:104
+#, fuzzy, no-wrap
+msgid "B<-F >I<output-type/subtype[,...]>"
+msgstr "B<-f >I<Typ/Untertyp[,…]>"
+
+#. type: Plain text
+#: ippeveprinter.1:108
+msgid ""
+"Specifies the output MIME media type.  The default is \"application/"
+"postscript\" when the B<-P> option is specified."
+msgstr ""
 
 #. type: TP
-#: ippfind.man:66
+#: ippeveprinter.1:108
 #, no-wrap
-msgid "B<--domain >I<regex>"
-msgstr "B<--domain >I<RegAus>"
+msgid "B<-M >I<manufacturer>"
+msgstr "B<-M >I<Hersteller>"
 
 #. type: Plain text
-#: ippfind.man:69
-msgid "True if the domain matches the given regular expression."
-msgstr "Wahr, falls die Domain auf den übergebenen regulären Ausdruck passt."
+#: ippeveprinter.1:112
+#, fuzzy
+msgid "Set the manufacturer of the printer.  The default is \"Example\"."
+msgstr "Setzt den Hersteller des Druckers. Die Vorgabe ist »Test«."
 
 #. type: TP
-#: ippfind.man:69
-#, no-wrap
-msgid "B<--false>"
-msgstr "B<--false>"
+#: ippeveprinter.1:112
+#, fuzzy, no-wrap
+msgid "B<-P >I<filename.ppd>"
+msgstr "B<-p >I<Dateiname.ppd>"
 
 #. type: Plain text
-#: ippfind.man:72
-msgid "Always false."
-msgstr "Immer unwahr."
+#: ippeveprinter.1:118
+msgid ""
+"Load printer attributes from the specified PPD file.  This option is "
+"typically used in conjunction with the B<ippeveps>(7)  printer command (\"-c "
+"ippeveps\")."
+msgstr ""
 
 #. type: TP
-#: ippfind.man:72
-#, no-wrap
-msgid "B<-h >I<regex>"
-msgstr "B<-h >I<RegAus>"
+#: ippeveprinter.1:118
+#, fuzzy, no-wrap
+msgid "B<-V 1.1>"
+msgstr "B<VERSION 1.1>"
 
 #. type: TP
-#: ippfind.man:74
-#, no-wrap
-msgid "B<--host >I<regex>"
-msgstr "B<--host >I<RegAus>"
+#: ippeveprinter.1:120
+#, fuzzy, no-wrap
+msgid "B<-V 2.0>"
+msgstr "B<VERSION 2.0>"
 
 #. type: Plain text
-#: ippfind.man:77
-msgid "True is the hostname matches the given regular expression."
-msgstr ""
-"Wahr, falls der Rechnername auf den übergebenen regulären Ausdruck passt."
+#: ippeveprinter.1:124
+#, fuzzy
+msgid "Specifies the maximum IPP version to report.  2.0 is the default."
+msgstr "Legt die für diesen Test zu verwendende IPP-Versionsnummer fest."
 
 #. type: TP
-#: ippfind.man:79
+#: ippeveprinter.1:124
 #, no-wrap
-msgid "B<--ls>"
-msgstr "B<--ls>"
+msgid "B<-c >I<command>"
+msgstr "B<-c >I<Befehl>"
 
 #. type: Plain text
-#: ippfind.man:83
+#: ippeveprinter.1:136
 msgid ""
-"Lists attributes returned by Get-Printer-Attributes for IPP printers and "
-"traditional I<find> \"-ls\" output for HTTP URLs.  The result is true if the "
-"URI is accessible, false otherwise."
+"Run the specified command for each document that is printed.  If \"command\" "
+"is not an absolute path (\"/path/to/command\"), B<ippeveprinter> looks for "
+"the command in the \"command\" subdirectory of the CUPS binary directory, "
+"typically /usr/lib/cups/command or /usr/libexec/cups/command.  The B<cups-"
+"config>(1)  command can be used to discover the correct binary directory "
+"(\"cups-config --serverbin\").  In addition, the CUPS_SERVERBIN environment "
+"variable can be used to override the default location of this directory - "
+"see the B<cups>(1)  man page for more details."
 msgstr ""
-"Listet Attribute auf, die von Get-Printer-Attributes für IPP-Drucker und von "
-"traditionellen »I<find> \"-ls\"«-Ausgaben für HTTP-URLs zurückgeliefert "
-"werden. Das Ergebnis ist wahr, falls auf die URI zugegriffen werden kann, "
-"andernfalls unwahr."
 
 #. type: TP
-#: ippfind.man:83
+#: ippeveprinter.1:136
 #, no-wrap
-msgid "B<--local>"
-msgstr "B<--local>"
+msgid "B<-d >I<spool-directory>"
+msgstr "B<-d >I<Spool-Verzeichnis>"
 
 #. type: Plain text
-#: ippfind.man:86
-msgid "True if the service is local to this computer."
-msgstr "Wahr, falls der Dienst an diesem Computer lokal ist."
-
-#. type: TP
-#: ippfind.man:86
-#, no-wrap
-msgid "B<-N >I<name>"
-msgstr "B<-N >I<Name>"
+#: ippeveprinter.1:140
+msgid ""
+"Specifies the directory that will hold the print files.  The default is a "
+"directory under the user's current temporary directory."
+msgstr ""
+"Legt das Verzeichnis, in denen die Druckaufträge gehalten werden, fest. Die "
+"Vorgabe ist ein Verzeichnis unter dem aktuellen temporären Verzeichnis des "
+"Benutzers."
 
 #. type: TP
-#: ippfind.man:88
+#: ippeveprinter.1:140
 #, no-wrap
-msgid "B<--literal-name >I<name>"
-msgstr "B<--literal-name >I<Name>"
+msgid "B<-f >I<type/subtype[,...]>"
+msgstr "B<-f >I<Typ/Untertyp[,…]>"
 
 #. type: Plain text
-#: ippfind.man:91
-msgid "True if the service instance name matches the given name."
+#: ippeveprinter.1:144
+#, fuzzy
+msgid ""
+"Specifies a list of MIME media types that the server will accept.  The "
+"default depends on the type of printer created."
 msgstr ""
-"Wahr, falls der Name der Instanz des Dienstes auf den angegebenen Namenpasst."
-
-#. type: TP
-#: ippfind.man:91
-#, no-wrap
-msgid "B<-n >I<regex>"
-msgstr "B<-n >I<RegAus>"
+"Legt eine Liste von MIME-Medientypen fest, die der Server akzeptiert. Die "
+"Vorgabe ist »application/pdf,image/jpeg,image/pwg-raster«."
 
 #. type: TP
-#: ippfind.man:93
+#: ippeveprinter.1:144
 #, no-wrap
-msgid "B<--name >I<regex>"
-msgstr "B<--name >I<RegAus>"
+msgid "B<-i >I<iconfile.png>"
+msgstr "B<-i >I<icondatei.png>"
 
 #. type: Plain text
-#: ippfind.man:96
-msgid "True if the service instance name matches the given regular expression."
+#: ippeveprinter.1:149
+#, fuzzy
+msgid ""
+"Specifies the printer icon file for the server.  The file must be a PNG "
+"format image.  The default is an internally-provided PNG image."
 msgstr ""
-"Wahr, falls die Instanz des Dienstes auf den angegebenen regulären Ausdruck "
-"passt."
+"Legt die Drucker-Icon-Datei für den Server fest. Die Vorgabe ist »printer."
+"png«."
 
 #. type: TP
-#: ippfind.man:96
+#: ippeveprinter.1:149
 #, no-wrap
-msgid "B<--path >I<regex>"
-msgstr "B<--path >I<RegAus>"
+msgid "B<-k>"
+msgstr "B<-k>"
 
 #. type: Plain text
-#: ippfind.man:99
-msgid "True if the URI resource path matches the given regular expression."
-msgstr ""
-"Wahr, falls der URI-Ressourcenpfad auf den angegebenen regulären Ausdruck "
-"passt."
-
-#. type: TP
-#: ippfind.man:99
-#, no-wrap
-msgid "B<-P >I<number>[B<->I<number>]"
-msgstr "B<-P >I<Nummer>[B<->I<Nummer>]"
+#: ippeveprinter.1:152
+msgid ""
+"Keeps the print documents in the spool directory rather than deleting them."
+msgstr "Belässt die Druckdokumente im Spool-Verzeichnis, statt sie zu löschen."
 
 #. type: TP
-#: ippfind.man:101
+#: ippeveprinter.1:152
 #, no-wrap
-msgid "B<--port >I<number>[B<->I<number>]"
-msgstr "B<--port >I<Nummer>[B<->I<Nummer>]"
+msgid "B<-l >I<location>"
+msgstr "B<-l >I<Ort>"
 
 #. type: Plain text
-#: ippfind.man:104
-msgid "True if the port matches the given number or range."
-msgstr "Wahr, falls der Port auf die angegebene Nummer oder den Bereich passt."
+#: ippeveprinter.1:156
+msgid ""
+"Specifies the human-readable location string that is reported by the "
+"server.  The default is the empty string."
+msgstr ""
+"Legt die menschenlesbare Ortszeichenkette fest, die vom Server berichtet "
+"wird. Die Vorgabe ist die leere Zeichenkette."
 
 #. type: TP
-#: ippfind.man:104 lpr.man:105
+#: ippeveprinter.1:156 lpadmin.8:79
 #, no-wrap
-msgid "B<-p>"
-msgstr "B<-p>"
+msgid "B<-m >I<model>"
+msgstr "B<-m >I<Modell>"
+
+#. type: Plain text
+#: ippeveprinter.1:160
+msgid "Specifies the model name of the printer.  The default is \"Printer\"."
+msgstr "Legt den Modellnamen des Druckers fest. Die Vorgabe ist »Printer«."
 
 #. type: TP
-#: ippfind.man:106
+#: ippeveprinter.1:160
 #, no-wrap
-msgid "B<--print>"
-msgstr "B<--print>"
+msgid "B<-n >I<hostname>"
+msgstr "B<-n >I<Rechnername>"
 
 #. type: Plain text
-#: ippfind.man:110
+#: ippeveprinter.1:166
 msgid ""
-"Prints the URI if the result of previous expressions is true.  The result is "
-"always true."
+"Specifies the hostname that is reported by the server.  The default is the "
+"name returned by the B<hostname>(1)  command."
 msgstr ""
-"Gibt die URI aus, falls das Ergebnis der vorherigen Ausdrücke wahr ist. Das "
-"Ergebnis ist immer wahr."
+"Legt den Rechnernamen, der vom Server gemeldet wird, fest. Die Vorgabe ist "
+"der durch den Befehl B<hostname>(1) zurückgelieferte Name."
 
 #. type: TP
-#: ippfind.man:112
+#: ippeveprinter.1:166
 #, no-wrap
-msgid "B<--quiet>"
-msgstr "B<--quiet>"
+msgid "B<-p >I<port>"
+msgstr "B<-p >I<Port>"
 
 #. type: Plain text
-#: ippfind.man:115
-msgid "Quiet mode - just returns the exit codes below."
-msgstr "Stiller Modus - liefert nur die unten aufgeführten Exit-Codes zurück."
+#: ippeveprinter.1:170
+msgid ""
+"Specifies the port number to listen on.  The default is a user-specific "
+"number from 8000 to 8999."
+msgstr ""
+"Legt den Port fest, bei dem auf Anfragen gewartet werden soll. Die Vorgabe "
+"ist eine benutzerspezifische Nummer zwischen 8000 und 8999."
 
 #. type: TP
-#: ippfind.man:117
-#, no-wrap
-msgid "B<--remote>"
-msgstr "B<--remote>"
+#: ippeveprinter.1:170
+#, fuzzy, no-wrap
+msgid "B<-r >I<subtype[,subtype]>"
+msgstr "B<-r >I<Untertyp>"
 
 #. type: Plain text
-#: ippfind.man:120
-msgid "True if the service is not local to this computer."
-msgstr "Wahr, falls der Dienst nicht lokal am Computer ist."
-
-#. type: TP
-#: ippfind.man:120 lp.man:135 lpstat.man:121
-#, no-wrap
-msgid "B<-s>"
-msgstr "B<-s>"
+#: ippeveprinter.1:175
+#, fuzzy
+msgid ""
+"Specifies the DNS-SD subtype(s) to advertise.  Separate multiple subtypes "
+"with a comma.  The default is \"_print\"."
+msgstr ""
+"Legt den/die Bonjour-Untertyp(en) fest, die bekanntgegeben werden sollen. "
+"Mehrere Untertypen werden mit Kommata getrennt. Die Vorgabe ist »_print«."
 
 #. type: TP
-#: ippfind.man:122
+#: ippeveprinter.1:175
 #, no-wrap
-msgid "B<--print-name>"
-msgstr "B<--print-name>"
+msgid "B<-s >I<speed[,color-speed]>"
+msgstr "B<-s >I<Geschwindigkeit[,Farb-Geschwindigkeit]>"
 
 #. type: Plain text
-#: ippfind.man:126
+#: ippeveprinter.1:180
 msgid ""
-"Prints the service instance name if the result of previous expressions is "
-"true.  The result is always true."
+"Specifies the printer speed in pages per minute.  If two numbers are "
+"specified and the second number is greater than zero, the server will report "
+"support for color printing.  The default is \"10,0\"."
 msgstr ""
-"Gibt den Namen der Diensteinstanz aus, falls das Ergebnis des vorherigen "
-"Ausdrucks wahr ist. Das Ergebnis ist immer wahr."
+"Legt die Druckergeschwindigkeit in Seiten pro Minute fest. Falls zwei "
+"Nummern angegeben werden und die zweite Nummer größer als 0 ist, wird der "
+"Server angeben, dass er Farbdruck unterstützt. Die Vorgabe ist »10,0«."
 
 #. type: TP
-#: ippfind.man:126
+#: ippeveprinter.1:180
 #, no-wrap
-msgid "B<--true>"
-msgstr "B<--true>"
+msgid "B<-v[vvv]>"
+msgstr "B<-v[vvv]>"
 
 #. type: Plain text
-#: ippfind.man:129
-msgid "Always true."
-msgstr "Immer wahr."
-
-#. type: TP
-#: ippfind.man:129
-#, no-wrap
-msgid "B<-t >I<key>"
-msgstr "B<-t >I<Schlüssel>"
-
-#. type: TP
-#: ippfind.man:131
-#, no-wrap
-msgid "B<--txt >I<key>"
-msgstr "B<--txt >I<Schlüssel>"
+#: ippeveprinter.1:183
+#, fuzzy
+msgid "Be (very) verbose when logging activity to standard error."
+msgstr ""
+"Das Protokollieren der Aktivitäten auf die Standardausgabe erfolgt (sehr) "
+"ausführlich."
 
 #. type: Plain text
-#: ippfind.man:134
-msgid "True if the TXT record contains the named key."
-msgstr "Wahr, falls der TXT-Datensatz den benannten Schlüssel enthält."
-
-#. type: TP
-#: ippfind.man:134
-#, no-wrap
-msgid "B<--txt->I<key regex>"
-msgstr "B<--txt->I<key RegAus>"
+#: ippeveprinter.1:190
+#, fuzzy
+msgid ""
+"The B<ippeveprinter> program returns 1 if it is unable to process the "
+"command-line arguments or register the IPP service.  Otherwise "
+"B<ippeveprinter> will run continuously until terminated."
+msgstr ""
+"Das Programm B<ippserver> liefert 1 zurück, falls es nicht in der Lage ist, "
+"die Befehlszeilenargumente zu verarbeiten oder den IPP-Dienst zu "
+"registrieren. Andernfalls läuft B<ippserver> dauerhaft, bis er beendet wird."
 
 #. type: Plain text
-#: ippfind.man:137
+#: ippeveprinter.1:194
+#, fuzzy
 msgid ""
-"True if the TXT record contains the named key and matches the given regular "
-"expression."
+"The B<ippeveprinter> program is unique to CUPS and conforms to the IPP "
+"Everywhere (PWG 5100.14) specification."
 msgstr ""
-"Wahr, falls der TXT-Datensatz den benannten Schlüssel enthält und auf den "
-"angegebenen regulären Ausdruck passt."
+"Das Programm B<ippserver> ist eine Besonderheit von CUPS und konform zu der "
+"Spezifikation »IPP Everywhere (PWG 5100.14)«."
 
-#. type: TP
-#: ippfind.man:137
-#, no-wrap
-msgid "B<-u >I<regex>"
-msgstr "B<-u >I<RegAus>"
+#. type: Plain text
+#: ippeveprinter.1:198
+#, fuzzy
+msgid ""
+"B<ippeveprinter> adds environment variables starting with \"IPP_\" for all "
+"IPP Job attributes in the print request.  For example, when executing a "
+"command for an IPP Job containing the \"media\" Job Template attribute, the "
+"\"IPP_MEDIA\" environment variable will be set to the value of that "
+"attribute."
+msgstr ""
+"B<ippserver> fügt für alle IPP-Auftragsattribute in der Druckwarteschlange "
+"Umgebungsvariablen hinzu, die mit »IPP_« beginnen. Wird beispielsweise ein "
+"Befehl für einen IPP-Auftrag ausgeführt, der das Attribut »media« des »Job "
+"Template« enthält, wird die Umgebungsvariable »IPP_MEDIA« auf den Wert des "
+"Attributes gesetzt."
 
-#. type: TP
-#: ippfind.man:139
-#, no-wrap
-msgid "B<--uri >I<regex>"
-msgstr "B<--uri >I<RegAus>"
+#. type: Plain text
+#: ippeveprinter.1:201
+msgid ""
+"In addition, all IPP \"xxx-default\" and \"pwg-xxx\" Printer Description "
+"attributes are added to the environment.  For example, the "
+"\"IPP_MEDIA_DEFAULT\" environment variable will be set to the default value "
+"for the \"media\" Job Template attribute."
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:142
-msgid "True if the URI matches the given regular expression."
-msgstr "Wahr, falls die URI auf den angegebenen regulären Ausdruck passt."
+#: ippeveprinter.1:205
+#, fuzzy
+msgid ""
+"Enumerated values are converted to their keyword equivalents.  For example, "
+"a \"print-quality\" Job Template attribute with a enum value of 3 will "
+"become the \"IPP_PRINT_QUALITY\" environment variable with a value of \"draft"
+"\".  This string conversion only happens for standard Job Template "
+"attributes, currently \"finishings\", \"orientation-requested\", and \"print-"
+"quality\"."
+msgstr ""
+"Aufgezählte Werte werden in ihre Schlüsselwort-Äquivalente umgewandelt. "
+"Beispielsweise wird ein Auftrags-Attribut »print-quality« mit dem "
+"aufgezählten Wert 3 die Umgebungsvariablen »IPP_PRINT_QUALITY« mit dem Wert "
+"»draft« werden."
 
-#. type: TP
-#: ippfind.man:142
-#, no-wrap
-msgid "B<-x >I<utility >[ I<argument >... ] B<;>"
-msgstr "B<-x >I<Hilfsprogramm >[ I<Argument >… ] B<;>"
+#. type: Plain text
+#: ippeveprinter.1:207
+msgid ""
+"Finally, the \"CONTENT_TYPE\" environment variable contains the MIME media "
+"type of the document being printed, the \"DEVICE_URI\" environment variable "
+"contains the device URI as specified with the \"-D\" option, the "
+"\"OUTPUT_FORMAT\" environment variable contains the output MIME media type, "
+"and the \"PPD\" environment variable contains the PPD filename as specified "
+"with the \"-P\" option."
+msgstr ""
 
-#. type: TP
-#: ippfind.man:144
-#, no-wrap
-msgid "B<--exec >I<utility >[ I<argument >... ] B<;>"
-msgstr "B<--exec >I<Hilfsprogramm >[ I<Argument >… ] B<;>"
+#. type: SH
+#: ippeveprinter.1:207
+#, fuzzy, no-wrap
+msgid "COMMAND OUTPUT"
+msgstr "BEFEHLE"
 
 #. type: Plain text
-#: ippfind.man:148
+#: ippeveprinter.1:209
 msgid ""
-"Executes the specified program if the current result is true.  \"{foo}\" "
-"arguments are replaced with the corresponding value - see SUBSTITUTIONS "
-"below."
+"Unless they communicate directly with a printer, print commands send printer-"
+"ready data to the standard output."
 msgstr ""
-"Führt das angegebene Programm aus, falls das aktuelle Ergebnis wahr ist. "
-"»{foo}«-Argumente werden durch den entsprechenden Wert ersetzt -- siehe "
-"ERSETZUNGEN weiter unten."
 
 #. type: Plain text
-#: ippfind.man:150
-msgid "Expressions may also contain modifiers:"
-msgstr "Ausdrücke können auch Modifikatoren enthalten:"
+#: ippeveprinter.1:213
+msgid ""
+"Print commands can send messages back to B<ippeveprinter> on the standard "
+"error with one of the following prefixes:"
+msgstr ""
 
 #. type: TP
-#: ippfind.man:150
-#, no-wrap
-msgid "B<( >I<expression >B<)>"
-msgstr "B<( >I<Ausdruck >B<)>"
+#: ippeveprinter.1:213
+#, fuzzy, no-wrap
+msgid "B<ATTR: >I<attribute=value[ attribute=value]>"
+msgstr "B<ATTR: >I<Attribut=Wert >[ I<… Attribut=Wert>]"
 
 #. type: Plain text
-#: ippfind.man:153
-msgid "Group the result of expressions."
-msgstr "Gruppiert die Ergebnisse von Ausdrücken."
-
-#. type: TP
-#: ippfind.man:153
-#, no-wrap
-msgid "B<! >I<expression>"
-msgstr "B<! >I<Ausdruck>"
+#: ippeveprinter.1:217
+msgid ""
+"Sets the named attribute(s) to the given values.  Currently only the \"job-"
+"impressions\" and \"job-impressions-completed\" Job Status attributes and "
+"the \"marker-xxx\", \"printer-alert\", \"printer-alert-description\", "
+"\"printer-supply\", and \"printer-supply-description\" Printer Status "
+"attributes can be set."
+msgstr ""
 
 #. type: TP
-#: ippfind.man:155
-#, no-wrap
-msgid "B<--not >I<expression>"
-msgstr "B<--not >I<Ausdruck>"
+#: ippeveprinter.1:217
+#, fuzzy, no-wrap
+msgid "B<DEBUG: >I<Debugging message>"
+msgstr "B<DEBUG: >I<Nachricht>"
 
 #. type: Plain text
-#: ippfind.man:158
-msgid "Unary NOT of the expression."
-msgstr "Unäres NICHT des Ausdrucks."
-
-#. type: TP
-#: ippfind.man:158
-#, no-wrap
-msgid "I<expression expression>"
-msgstr "I<Ausdruck Ausdruck>"
+#: ippeveprinter.1:220
+msgid "Logs a debugging message if at least two -v's have been specified."
+msgstr ""
 
 #. type: TP
-#: ippfind.man:160
-#, no-wrap
-msgid "I<expression >B<--and >I<expression>"
-msgstr "I<Ausdruck >B<--and >I<Ausdruck>"
+#: ippeveprinter.1:220
+#, fuzzy, no-wrap
+msgid "B<ERROR: >I<Error message>"
+msgstr "B<ERROR:>I< Nachricht>"
 
 #. type: Plain text
-#: ippfind.man:163
-msgid "Logical AND of expressions."
-msgstr "Logisches UND von Ausdrücken."
+#: ippeveprinter.1:223
+msgid ""
+"Logs an error message and copies the message to the \"job-state-message\" "
+"attribute."
+msgstr ""
 
 #. type: TP
-#: ippfind.man:163
-#, no-wrap
-msgid "I<expression >B<--or >I<expression>"
-msgstr "I<Ausdruck >B<--or >I<Ausdruck>"
+#: ippeveprinter.1:223
+#, fuzzy, no-wrap
+msgid "B<INFO: >I<Informational message>"
+msgstr "B<INFO:>I< Nachricht>"
 
 #. type: Plain text
-#: ippfind.man:166
-msgid "Logical OR of expressions."
-msgstr "Logisches ODER von Ausdrücken."
+#: ippeveprinter.1:226
+msgid ""
+"Logs an informational/progress message if -v has been specified and copies "
+"the message to the \"job-state-message\" attribute unless an error has been "
+"reported."
+msgstr ""
 
-#. type: SS
-#: ippfind.man:166
+#. type: TP
+#: ippeveprinter.1:226
 #, no-wrap
-msgid "SUBSTITUTIONS"
-msgstr "ERSETZUNGEN"
+msgid "B<STATE: >I<keyword[,keyword,...]>"
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:168
-msgid "The substitutions for \"{foo}\" in I<-e> and I<--exec> are:"
-msgstr "Die Ersetzungen für »{foo}« in I<-e> und I<--exec> sind:"
+#: ippeveprinter.1:229
+msgid ""
+"Sets the printer's \"printer-state-reasons\" attribute to the listed "
+"keywords."
+msgstr ""
 
 #. type: TP
-#: ippfind.man:168
+#: ippeveprinter.1:229
 #, no-wrap
-msgid "B<{service_domain}>"
-msgstr "B<{service_domain}>"
+msgid "B<STATE: ->I<keyword[,keyword,...]>"
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:171 ippfind.man:224
-msgid "Domain name, e.g., \"example.com.\", \"local.\", etc."
-msgstr "Domain-Name, z.B. »example.com.«, »local.«, usw."
+#: ippeveprinter.1:232
+msgid ""
+"Removes the listed keywords from the printer's \"printer-state-reasons\" "
+"attribute."
+msgstr ""
 
 #. type: TP
-#: ippfind.man:171
+#: ippeveprinter.1:232
 #, no-wrap
-msgid "B<{service_hostname}>"
-msgstr "B<{service_hostname}>"
+msgid "B<STATE: +>I<keyword[,keyword,...]>"
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:174 ippfind.man:227
+#: ippeveprinter.1:235
 msgid ""
-"Fully-qualified domain name, e.g., \"printer.example.com.\", \"printer.local."
-"\", etc."
+"Adds the listed keywords to the printer's \"printer-state-reasons\" "
+"attribute."
 msgstr ""
-"Vollqualifizierter Domain-Name, z.B. »printer.example.com.«, »printer."
-"local.«, usw."
-
-#. type: TP
-#: ippfind.man:174
-#, no-wrap
-msgid "B<{service_name}>"
-msgstr "B<{service_name}>"
 
 #. type: Plain text
-#: ippfind.man:177 ippfind.man:230
-msgid "Service instance name, e.g., \"My Fine Printer\"."
-msgstr "Dienste-Instanzenname, z.B. »Mein Guter Drucker«."
+#: ippeveprinter.1:239
+#, fuzzy
+msgid "Run B<ippeveprinter> with a service name of My Cool Printer:"
+msgstr "B<ippserver> mit dem Dienstnamen »Mein Toller Drucker« ausführen:"
 
-#. type: TP
-#: ippfind.man:177
-#, no-wrap
-msgid "B<{service_port}>"
-msgstr "B<{service_port}>"
+#. type: Plain text
+#: ippeveprinter.1:242
+#, fuzzy, no-wrap
+msgid "    ippeveprinter \"My Cool Printer\"\n"
+msgstr "    ippserver \"Mein Toller Drucker\"\n"
 
 #. type: Plain text
-#: ippfind.man:180 ippfind.man:233
-msgid "Port number for server, typically 631 for IPP and 80 for HTTP."
-msgstr "Port-Nummer für Server, typischerweise 631 für IPP und 80 für HTTP."
+#: ippeveprinter.1:247
+msgid "Run the B<file>(1)  command whenever a job is sent to the server:"
+msgstr ""
+"Den Befehl B<file>(1) immer ausführen, wenn ein Auftrag an den Server "
+"gesendet wird:"
 
-#. type: TP
-#: ippfind.man:180
-#, no-wrap
-msgid "B<{service_regtype}>"
-msgstr "B<{service_regtype}>"
+#. type: Plain text
+#: ippeveprinter.1:250
+#, fuzzy, no-wrap
+msgid "    ippeveprinter -c /usr/bin/file \"My Cool Printer\"\n"
+msgstr "    ippserver -c file \"Mein Toller Drucker\"\n"
 
 #. type: Plain text
-#: ippfind.man:183 ippfind.man:236
-msgid "DNS-SD registration type, e.g., \"_ipp._tcp\", \"_http._tcp\", etc."
-msgstr "DNS-SD-Registrierungstyp, z.B. »_ipp._tcp«, »_http._tcp« usw."
+#: ippeveprinter.1:255
+#, fuzzy
+msgid ""
+"B<ippevepcl>(7), B<ippeveps>(7), PWG Internet Printing Protocol Workgroup "
+"(http://www.pwg.org/ipp)"
+msgstr "PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)"
 
-#. type: TP
-#: ippfind.man:183
+#. type: TH
+#: ippfind.1:9
 #, no-wrap
-msgid "B<{service_scheme}>"
-msgstr "B<{service_scheme}>"
+msgid "ippfind"
+msgstr "ippfind"
+
+#. type: TH
+#: ippfind.1:9
+#, no-wrap
+msgid "ippsample"
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:186 ippfind.man:239
-msgid "URI scheme for DNS-SD registration type, e.g., \"ipp\", \"http\", etc."
-msgstr "URI-Schema für DNS-SD-Registrationstypen, z.B: »ipp«, »http« usw."
-
-#. type: TP
-#: ippfind.man:186
-#, no-wrap
-msgid "B<{}>"
-msgstr "B<{}>"
-
-#. type: TP
-#: ippfind.man:188
-#, no-wrap
-msgid "B<{service_uri}>"
-msgstr "B<{service_uri}>"
+#: ippfind.1:12
+msgid "ippfind - find internet printing protocol printers"
+msgstr "ippfind - Internet-Printing-Protocol-Drucker finden"
 
 #. type: Plain text
-#: ippfind.man:191 ippfind.man:242
+#: ippfind.1:19
 msgid ""
-"URI for service, e.g., \"ipp://printer.local./ipp/print\", \"http://printer."
-"local./\", etc."
+"B<ippfind> [ I<options> ] I<regtype>[B<,>I<subtype>][B<.>I<domain>B<.>] ... "
+"[ I<expression> ... ]"
 msgstr ""
-"URI für Dienste, z.B. »ipp://printer.local./ipp/print«, »http://printer."
-"local./« usw."
+"B<ippfind> [ I<Optionen> ] I<Regtyp>[B<,>I<Untertyp>][B<.>I<Domain>B<.>] … "
+"[ I<Ausdruck> … ]"
 
-#. type: TP
-#: ippfind.man:191
-#, no-wrap
-msgid "B<{txt_>I<key>B<}>"
-msgstr "B<{txt_>I<Schlüssel>B<}>"
+#. type: Plain text
+#: ippfind.1:26
+msgid ""
+"B<ippfind> [ I<options> ] I<name>[B<.>I<regtype>[B<.>I<domain>B<.>]] ... "
+"[ I<expression> ... ]"
+msgstr ""
+"B<ippfind> [ I<Optionen> ] I<Name>[B<.>I<Regtyp>[B<.>I<Domain>B<.>]] … "
+"[ I<Ausdruck> … ]"
 
 #. type: Plain text
-#: ippfind.man:194
-msgid "Value of TXT record I<key> (lowercase)."
-msgstr "Wert des TXT-Datensatz-I<Schlüssel>s (klein geschrieben)"
+#: ippfind.1:29
+msgid "B<ippfind> B<--help>"
+msgstr "B<ippfind> B<--help>"
 
 #. type: Plain text
-#: ippfind.man:196
-msgid "B<ippfind> supports the following options:"
-msgstr "I<ippfind> unterstützt die folgenden Optionen:"
+#: ippfind.1:32
+msgid "B<ippfind> B<--version>"
+msgstr "B<ippfind> B<--version>"
 
 #. type: Plain text
-#: ippfind.man:199
-msgid "Show program help."
-msgstr "Zeigt die Programmhilfe."
+#: ippfind.1:35
+msgid ""
+"B<ippfind> finds services registered with a DNS server or available through "
+"local devices.  Its primary purpose is to find IPP printers and show their "
+"URIs, show their current status, or run commands."
+msgstr ""
+"B<ippfind> findet Dienste, die bei einem DNS-Server registriert oder über "
+"lokale Geräte verfügbar sind. Sein Hauptzweck ist das Auffinden von IPP-"
+"Druckern und Anzeigen ihrer URIs, der Anzeige ihres aktuellen Status oder "
+"dem Ausführen von Befehlen."
+
+#. type: SS
+#: ippfind.1:35
+#, no-wrap
+msgid "REGISTRATION TYPES"
+msgstr "REGISTRIERUNGSTYPEN"
 
 #. type: Plain text
-#: ippfind.man:202
-msgid "Show program version."
-msgstr "Zeigt die Programmversion."
+#: ippfind.1:37
+msgid "B<ippfind> supports the following registration types:"
+msgstr "B<ippfind> unterstützt die folgenden Registrierungstypen:"
 
 #. type: TP
-#: ippfind.man:202 ipptool.man:106
+#: ippfind.1:37
 #, no-wrap
-msgid "B<-4>"
-msgstr "B<-4>"
+msgid "_http._tcp"
+msgstr "_http._tcp"
 
 #. type: Plain text
-#: ippfind.man:205
-msgid "Use IPv4 when listing."
-msgstr "IPv4 beim Warten auf Anfragen verwenden."
+#: ippfind.1:40
+msgid "HyperText Transport Protocol (HTTP, RFC 2616)"
+msgstr "HyperText Transport Protocol (HTTP, RFC 2616)"
 
 #. type: TP
-#: ippfind.man:205 ipptool.man:111
+#: ippfind.1:40
 #, no-wrap
-msgid "B<-6>"
-msgstr "B<-6>"
+msgid "_https._tcp"
+msgstr "_https._tcp"
 
 #. type: Plain text
-#: ippfind.man:208
-msgid "Use IPv6 when listing."
-msgstr "IPv6 beim Warten auf Anfragen verwenden."
+#: ippfind.1:43
+msgid "Secure HyperText Transport Protocol (HTTPS, RFC 2818)"
+msgstr "Secure HyperText Transport Protocol (HTTPS, RFC 2818)"
 
 #. type: TP
-#: ippfind.man:208
+#: ippfind.1:43
 #, no-wrap
-msgid "B<-T >I<seconds>"
-msgstr "B<-T >I<Sekunden>"
+msgid "_ipp._tcp"
+msgstr "_ipp._tcp"
 
 #. type: Plain text
-#: ippfind.man:213
-msgid ""
-"Specify find timeout in seconds.  If 1 or less, B<ippfind> stops as soon as "
-"it thinks it has found everything.  The default timeout is 1 second."
-msgstr ""
-"Legt die Zeitüberschreitung beim Suchen fest (in Sekunden). Falls 1 oder "
-"weniger wird B<ippfind> aufhören, sobald es glaubt, alles gefunden zu haben. "
-"Die Vorgabezeitüberschreitung ist eine Sekunde."
+#: ippfind.1:46
+msgid "Internet Printing Protocol (IPP, RFC 2911)"
+msgstr "Internet Printing Protocol (IPP, RFC 2911)"
 
 #. type: TP
-#: ippfind.man:213
+#: ippfind.1:46
 #, no-wrap
-msgid "B<-V >I<version>"
-msgstr "B<-V >I<Version>"
+msgid "_ipps._tcp"
+msgstr "_ipps._tcp"
 
 #. type: Plain text
-#: ippfind.man:217
-msgid ""
-"Specifies the IPP version when listing.  Supported values are \"1.1\", "
-"\"2.0\", \"2.1\", and \"2.2\"."
-msgstr ""
-"Legt die IPP-Version beim Warten auf Anfragen fest. Unterstützte Werte sind "
-"»1.1«, »2.0«, »2.1« und »2.2«."
+#: ippfind.1:49
+msgid "Secure Internet Printing Protocol (IPPS, draft)"
+msgstr "Secure Internet Printing Protocol (IPPS, draft)"
+
+#. type: TP
+#: ippfind.1:49
+#, no-wrap
+msgid "_printer._tcp"
+msgstr "_printer._tcp"
 
 #. type: Plain text
-#: ippfind.man:219
-msgid ""
-"B<ippfind> returns 0 if the result for all processed expressions is true, 1 "
-"if the result of any processed expression is false, 2 if browsing or any "
-"query or resolution failed, 3 if an undefined option or invalid expression "
-"was specified, and 4 if it ran out of memory."
-msgstr ""
-"B<ippfind> liefert 0 zurück, falls das Ergebnis für alle verarbeiteten "
-"Ausdrücke wahr ist, 1, falls das Ergebnis irgendeines Ausdruckes falsch ist, "
-"2, falls das Browsen oder irgendeine Abfrage oder Auflösung fehlschlug, 3, "
-"falls eine nicht definierte Option oder ein ungültiger Ausdruck angegeben "
-"wurde oder 4, falls nicht genug Speicher vorhanden war."
+#: ippfind.1:52
+msgid "Line Printer Daemon (LPD, RFC 1179)"
+msgstr "Line Printer Daemon (LPD, RFC 1179)"
+
+#. type: SS
+#: ippfind.1:52
+#, no-wrap
+msgid "EXPRESSIONS"
+msgstr "AUSDRÜCKE"
 
 #. type: Plain text
-#: ippfind.man:221
+#: ippfind.1:61
 msgid ""
-"When executing a program, B<ippfind> sets the following environment "
-"variables for the matching service registration:"
+"B<ippfind> supports expressions much like the B<find>(1)  utility.  However, "
+"unlike B<find>(1), B<ippfind> uses POSIX regular expressions instead of "
+"shell filename matching patterns.  If I<--exec>, I<-l>, I<--ls>, I<-p>, I<--"
+"print>, I<--print-name>, I<-q>, I<--quiet>, I<-s>, or I<-x> is not "
+"specified, B<ippfind> adds I<--print> to print the service URI of anything "
+"it finds.  The following expressions are supported:"
 msgstr ""
-"Beim Ausführen eines Programms setzt B<ippfind> die folgenden "
-"Umgebungsvariablen für die passende Diensteregistrierung:"
-
-#. type: TP
-#: ippfind.man:221
-#, no-wrap
-msgid "B<IPPFIND_SERVICE_DOMAIN>"
-msgstr "B<IPPFIND_SERVICE_DOMAIN>"
+"B<ippfind> unterstützt ähnlich wie das Hilfswerkzeug B<find>(1) reguläre "
+"Ausdrücke. Anders als B<find>(1) verwendet B<ippfind> allerdings POSIX-"
+"reguläre-Ausdrücke statt die Dateinamen-Platzhalter-Muster der Shell. Falls "
+"I<--exec>, I<-l>, I<--ls>, I<-p>, I<--print>, I<--print-name>, I<-q>, I<--"
+"quiet>, I<-s> oder I<-x> nicht angegeben ist wird B<ippfind> I<--print> "
+"hinzufügen, um die Dienste-URIs aller Treffer auszugeben. Die folgenden "
+"Ausdrücke werden unterstützt:"
 
 #. type: TP
-#: ippfind.man:224
+#: ippfind.1:61
 #, no-wrap
-msgid "B<IPPFIND_SERVICE_HOSTNAME>"
-msgstr "B<IPPFIND_SERVICE_HOSTNAME>"
+msgid "B<-d >I<regex>"
+msgstr "B<-d >I<RegAus>"
 
 #. type: TP
-#: ippfind.man:227
+#: ippfind.1:63
 #, no-wrap
-msgid "B<IPPFIND_SERVICE_NAME>"
-msgstr "B<IPPFIND_SERVICE_NAME>"
+msgid "B<--domain >I<regex>"
+msgstr "B<--domain >I<RegAus>"
 
-#. type: TP
-#: ippfind.man:230
-#, no-wrap
-msgid "B<IPPFIND_SERVICE_PORT>"
-msgstr "B<IPPFIND_SERVICE_PORT>"
+#. type: Plain text
+#: ippfind.1:66
+msgid "True if the domain matches the given regular expression."
+msgstr "Wahr, falls die Domain auf den übergebenen regulären Ausdruck passt."
 
 #. type: TP
-#: ippfind.man:233
+#: ippfind.1:66
 #, no-wrap
-msgid "B<IPPFIND_SERVICE_REGTYPE>"
-msgstr "B<IPPFIND_SERVICE_REGTYPE>"
+msgid "B<--false>"
+msgstr "B<--false>"
 
-#. type: TP
-#: ippfind.man:236
-#, no-wrap
-msgid "B<IPPFIND_SERVICE_SCHEME>"
-msgstr "B<IPPFIND_SERVICE_SCHEME>"
+#. type: Plain text
+#: ippfind.1:69
+msgid "Always false."
+msgstr "Immer unwahr."
 
 #. type: TP
-#: ippfind.man:239
+#: ippfind.1:69
 #, no-wrap
-msgid "B<IPPFIND_SERVICE_URI>"
-msgstr "B<IPPFIND_SERVICE_URI>"
+msgid "B<-h >I<regex>"
+msgstr "B<-h >I<RegAus>"
 
 #. type: TP
-#: ippfind.man:242
+#: ippfind.1:71
 #, no-wrap
-msgid "B<IPPFIND_TXT_>I<KEY>"
-msgstr "B<IPPFIND_TXT_>I<SCHLÜSSEL>"
-
-#. type: Plain text
-#: ippfind.man:245
-msgid "Values of TXT record I<KEY> (uppercase)."
-msgstr "Wert des TXT-Datensatz-I<SCHLÜSSEL>s (groß geschrieben)"
+msgid "B<--host >I<regex>"
+msgstr "B<--host >I<RegAus>"
 
 #. type: Plain text
-#: ippfind.man:247
-msgid "To show the status of all registered IPP printers on your network, run:"
+#: ippfind.1:74
+msgid "True is the hostname matches the given regular expression."
 msgstr ""
-"Um den Status aller registrierten IPP-Drucker in Ihrem Netz anzuzeigen, "
-"führen Sie folgendes aus:"
+"Wahr, falls der Rechnername auf den übergebenen regulären Ausdruck passt."
 
-#. type: Plain text
-#: ippfind.man:250
+#. type: TP
+#: ippfind.1:76
 #, no-wrap
-msgid "    ippfind --ls\n"
-msgstr "    ippfind --ls\n"
+msgid "B<--ls>"
+msgstr "B<--ls>"
 
 #. type: Plain text
-#: ippfind.man:253
+#: ippfind.1:80
 msgid ""
-"Similarly, to send a PostScript test page to every PostScript printer, run:"
+"Lists attributes returned by Get-Printer-Attributes for IPP printers and "
+"traditional I<find> \"-ls\" output for HTTP URLs.  The result is true if the "
+"URI is accessible, false otherwise."
 msgstr ""
-"Um eine PostScript-Testseite an jeden PostScript-Drucker zu senden, führen "
-"Sie aus:"
+"Listet Attribute auf, die von Get-Printer-Attributes für IPP-Drucker und von "
+"traditionellen »I<find> \"-ls\"«-Ausgaben für HTTP-URLs zurückgeliefert "
+"werden. Das Ergebnis ist wahr, falls auf die URI zugegriffen werden kann, "
+"andernfalls unwahr."
 
-#. type: Plain text
-#: ippfind.man:257
+#. type: TP
+#: ippfind.1:80
 #, no-wrap
-msgid ""
-"    ippfind --txt-pdl application/postscript --exec ipptool\n"
-"      -f onepage-letter.ps '{}' print-job.test \\e;\n"
-msgstr ""
-"    ippfind --txt-pdl application/postscript --exec ipptool\n"
-"      -f onepage-letter.ps '{}' print-job.test \\e;\n"
+msgid "B<--local>"
+msgstr "B<--local>"
 
 #. type: Plain text
-#: ippfind.man:260
-msgid "B<ipptool>(1)"
-msgstr "B<ipptool>(1)"
+#: ippfind.1:83
+msgid "True if the service is local to this computer."
+msgstr "Wahr, falls der Dienst an diesem Computer lokal ist."
+
+#. type: TP
+#: ippfind.1:83
+#, no-wrap
+msgid "B<-N >I<name>"
+msgstr "B<-N >I<Name>"
+
+#. type: TP
+#: ippfind.1:85
+#, no-wrap
+msgid "B<--literal-name >I<name>"
+msgstr "B<--literal-name >I<Name>"
 
 #. type: Plain text
-#: ippfind.man:261
-#, fuzzy
-msgid "Copyright \\[co] 2013-2018 by Apple Inc."
-msgstr "Copyright \\[co] 2013-2018 by Apple Inc."
+#: ippfind.1:88
+msgid "True if the service instance name matches the given name."
+msgstr ""
+"Wahr, falls der Name der Instanz des Dienstes auf den angegebenen Namenpasst."
 
-#. type: TH
-#: ../test/ippserver.man:12
+#. type: TP
+#: ippfind.1:88
 #, no-wrap
-msgid "ippserver"
-msgstr "ippserver"
+msgid "B<-n >I<regex>"
+msgstr "B<-n >I<RegAus>"
 
-#. type: TH
-#: ../test/ippserver.man:12
+#. type: TP
+#: ippfind.1:90
 #, no-wrap
-msgid "28 August 2014"
-msgstr "28. August 2014"
+msgid "B<--name >I<regex>"
+msgstr "B<--name >I<RegAus>"
 
 #. type: Plain text
-#: ../test/ippserver.man:15
-msgid "ippserver - a simple internet printing protocol server"
-msgstr "ippserver - ein einfacher Internet-Printing-Protocol-Server"
+#: ippfind.1:93
+msgid "True if the service instance name matches the given regular expression."
+msgstr ""
+"Wahr, falls die Instanz des Dienstes auf den angegebenen regulären Ausdruck "
+"passt."
+
+#. type: TP
+#: ippfind.1:93
+#, no-wrap
+msgid "B<--path >I<regex>"
+msgstr "B<--path >I<RegAus>"
 
 #. type: Plain text
-#: ../test/ippserver.man:62
-#, fuzzy
-msgid ""
-"B<ippserver> [ B<-2> ] [ B<-M> I<manufacturer> ] [ B<-P> ] [ B<-c> "
-"I<command> ] [ B<-d> I<spool-directory> ] [ B<-f> I<type/subtype[,...]> ] "
-"[ B<-h> ] [ B<-i> I<iconfile.png> ] [ B<-k> ] [ B<-l> I<location> ] [ B<-m> "
-"I<model> ] [ B<-n> I<hostname> ] [ B<-p> I<port> ] [ B<-r> I<subtype> ] [ B<-"
-"s> I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
+#: ippfind.1:96
+msgid "True if the URI resource path matches the given regular expression."
 msgstr ""
-"B<ippserver> [ B<-2> ] [ B<-M> I<Hersteller> ] [ B<-P> ] [ B<-c> I<Befehl> ] "
-"[ B<-d> I<Spool-Verzeichnis> ] [ B<-f> I<Typ/Untertyp[,… ]> [ B<-h> ] [ B<-"
-"i> I<icondatei.png> ] [ B<-k> ] [ B<-l> I<Ort> ] [ B<-m> I<Modell> ] [ B<-n> "
-"I<Rechnername> ] [ B<-p> I<Port> ] [ B<-r> I<Untertyp> ] [ B<-s> "
-"I<Geschwindigkeit[,Farbgeschwindigkeit]> ] [ B<-v[vvv]> ] I<Dienstename>"
+"Wahr, falls der URI-Ressourcenpfad auf den angegebenen regulären Ausdruck "
+"passt."
+
+#. type: TP
+#: ippfind.1:96
+#, no-wrap
+msgid "B<-P >I<number>[B<->I<number>]"
+msgstr "B<-P >I<Nummer>[B<->I<Nummer>]"
+
+#. type: TP
+#: ippfind.1:98
+#, no-wrap
+msgid "B<--port >I<number>[B<->I<number>]"
+msgstr "B<--port >I<Nummer>[B<->I<Nummer>]"
 
 #. type: Plain text
-#: ../test/ippserver.man:65
-#, fuzzy
+#: ippfind.1:101
+msgid "True if the port matches the given number or range."
+msgstr "Wahr, falls der Port auf die angegebene Nummer oder den Bereich passt."
+
+#. type: TP
+#: ippfind.1:101 lpr.1:102
+#, no-wrap
+msgid "B<-p>"
+msgstr "B<-p>"
+
+#. type: TP
+#: ippfind.1:103
+#, no-wrap
+msgid "B<--print>"
+msgstr "B<--print>"
+
+#. type: Plain text
+#: ippfind.1:107
 msgid ""
-"B<ippserver> is a simple Internet Printing Protocol (IPP) server conforming "
-"to the IPP Everywhere (PWG 5100.14) specification. It can be used to test "
-"client software or act as a very basic print server that runs a command for "
-"every job that is printed."
+"Prints the URI if the result of previous expressions is true.  The result is "
+"always true."
 msgstr ""
-"B<ippserver> ist ein einfacher Internet Printing Protocol (IPP)-Server, der "
-"der Spezifikation »IPP Everywhere (PWG 5100.14)« folgt. Er kann zum Testen "
-"von Client-Software dienen oder als sehr rudimentärer Server, der für jeden "
-"Druckauftrag einen Befehl ausführt, verwandt werden."
+"Gibt die URI aus, falls das Ergebnis der vorherigen Ausdrücke wahr ist. Das "
+"Ergebnis ist immer wahr."
+
+#. type: TP
+#: ippfind.1:109
+#, no-wrap
+msgid "B<--quiet>"
+msgstr "B<--quiet>"
 
 #. type: Plain text
-#: ../test/ippserver.man:68
-#, fuzzy
-msgid "The following options are recognized by B<ippserver:>"
-msgstr "Die folgenden Optionen werden von I<ippserver> erkannt:"
+#: ippfind.1:112
+msgid "Quiet mode - just returns the exit codes below."
+msgstr "Stiller Modus - liefert nur die unten aufgeführten Exit-Codes zurück."
 
 #. type: TP
-#: ../test/ippserver.man:68
+#: ippfind.1:114
 #, no-wrap
-msgid "B<-2>"
-msgstr "B<-2>"
+msgid "B<--remote>"
+msgstr "B<--remote>"
 
 #. type: Plain text
-#: ../test/ippserver.man:71
-msgid "Report support for two-sided (duplex) printing."
-msgstr "Meldet die Unterstützung für zweiseitigen (Duplex-)Druck."
+#: ippfind.1:117
+msgid "True if the service is not local to this computer."
+msgstr "Wahr, falls der Dienst nicht lokal am Computer ist."
 
 #. type: TP
-#: ../test/ippserver.man:71
+#: ippfind.1:117 lp.1:132 lpstat.1:117
 #, no-wrap
-msgid "B<-M >I<manufacturer>"
-msgstr "B<-M >I<Hersteller>"
+msgid "B<-s>"
+msgstr "B<-s>"
+
+#. type: TP
+#: ippfind.1:119
+#, no-wrap
+msgid "B<--print-name>"
+msgstr "B<--print-name>"
 
 #. type: Plain text
-#: ../test/ippserver.man:75
-#, fuzzy
-msgid "Set the manufacturer of the printer.  The default is \"Test\"."
-msgstr "Setzt den Hersteller des Druckers. Die Vorgabe ist »Test«."
+#: ippfind.1:123
+msgid ""
+"Prints the service instance name if the result of previous expressions is "
+"true.  The result is always true."
+msgstr ""
+"Gibt den Namen der Diensteinstanz aus, falls das Ergebnis des vorherigen "
+"Ausdrucks wahr ist. Das Ergebnis ist immer wahr."
 
 #. type: TP
-#: ../test/ippserver.man:75
+#: ippfind.1:123
 #, no-wrap
-msgid "B<-P>"
-msgstr "B<-P>"
+msgid "B<--true>"
+msgstr "B<--true>"
 
 #. type: Plain text
-#: ../test/ippserver.man:78
-msgid "Report support for PIN printing."
-msgstr "Berichtet die Unterstützung für PIN-Drucken."
+#: ippfind.1:126
+msgid "Always true."
+msgstr "Immer wahr."
 
 #. type: TP
-#: ../test/ippserver.man:78
+#: ippfind.1:126
 #, no-wrap
-msgid "B<-c >I<command>"
-msgstr "B<-c >I<Befehl>"
+msgid "B<-t >I<key>"
+msgstr "B<-t >I<Schlüssel>"
+
+#. type: TP
+#: ippfind.1:128
+#, no-wrap
+msgid "B<--txt >I<key>"
+msgstr "B<--txt >I<Schlüssel>"
 
 #. type: Plain text
-#: ../test/ippserver.man:81
-msgid "Run the specified command for each document that is printed."
-msgstr "Führt den angegebenen Befehl für jedes zu druckende Dokument aus."
+#: ippfind.1:131
+msgid "True if the TXT record contains the named key."
+msgstr "Wahr, falls der TXT-Datensatz den benannten Schlüssel enthält."
 
 #. type: TP
-#: ../test/ippserver.man:81
+#: ippfind.1:131
 #, no-wrap
-msgid "B<-d >I<spool-directory>"
-msgstr "B<-d >I<Spool-Verzeichnis>"
+msgid "B<--txt->I<key regex>"
+msgstr "B<--txt->I<key RegAus>"
 
 #. type: Plain text
-#: ../test/ippserver.man:85
+#: ippfind.1:134
 msgid ""
-"Specifies the directory that will hold the print files.  The default is a "
-"directory under the user's current temporary directory."
+"True if the TXT record contains the named key and matches the given regular "
+"expression."
 msgstr ""
-"Legt das Verzeichnis, in denen die Druckaufträge gehalten werden, fest. Die "
-"Vorgabe ist ein Verzeichnis unter dem aktuellen temporären Verzeichnis des "
-"Benutzers."
+"Wahr, falls der TXT-Datensatz den benannten Schlüssel enthält und auf den "
+"angegebenen regulären Ausdruck passt."
 
 #. type: TP
-#: ../test/ippserver.man:85
+#: ippfind.1:134
 #, no-wrap
-msgid "B<-f >I<type/subtype[,...]>"
-msgstr "B<-f >I<Typ/Untertyp[,…]>"
+msgid "B<-u >I<regex>"
+msgstr "B<-u >I<RegAus>"
+
+#. type: TP
+#: ippfind.1:136
+#, no-wrap
+msgid "B<--uri >I<regex>"
+msgstr "B<--uri >I<RegAus>"
 
 #. type: Plain text
-#: ../test/ippserver.man:89
-#, fuzzy
+#: ippfind.1:139
+msgid "True if the URI matches the given regular expression."
+msgstr "Wahr, falls die URI auf den angegebenen regulären Ausdruck passt."
+
+#. type: TP
+#: ippfind.1:139
+#, no-wrap
+msgid "B<-x >I<utility >[ I<argument >... ] B<;>"
+msgstr "B<-x >I<Hilfsprogramm >[ I<Argument >… ] B<;>"
+
+#. type: TP
+#: ippfind.1:141
+#, no-wrap
+msgid "B<--exec >I<utility >[ I<argument >... ] B<;>"
+msgstr "B<--exec >I<Hilfsprogramm >[ I<Argument >… ] B<;>"
+
+#. type: Plain text
+#: ippfind.1:145
 msgid ""
-"Specifies a list of MIME media types that the server will accept.  The "
-"default is \"application/pdf,image/jpeg,image/pwg-raster\"."
+"Executes the specified program if the current result is true.  \"{foo}\" "
+"arguments are replaced with the corresponding value - see SUBSTITUTIONS "
+"below."
 msgstr ""
-"Legt eine Liste von MIME-Medientypen fest, die der Server akzeptiert. Die "
-"Vorgabe ist »application/pdf,image/jpeg,image/pwg-raster«."
+"Führt das angegebene Programm aus, falls das aktuelle Ergebnis wahr ist. "
+"»{foo}«-Argumente werden durch den entsprechenden Wert ersetzt -- siehe "
+"ERSETZUNGEN weiter unten."
 
 #. type: Plain text
-#: ../test/ippserver.man:92 ipptool.man:94
-msgid "Shows program help."
-msgstr "Zeigt die Programmhilfe."
+#: ippfind.1:147
+msgid "Expressions may also contain modifiers:"
+msgstr "Ausdrücke können auch Modifikatoren enthalten:"
 
 #. type: TP
-#: ../test/ippserver.man:92
+#: ippfind.1:147
 #, no-wrap
-msgid "B<-i >I<iconfile.png>"
-msgstr "B<-i >I<icondatei.png>"
+msgid "B<( >I<expression >B<)>"
+msgstr "B<( >I<Ausdruck >B<)>"
 
 #. type: Plain text
-#: ../test/ippserver.man:96
-#, fuzzy
-#| msgid ""
-#| "Specifies the model name of the printer.  The default is \"Printer\"."
-msgid ""
-"Specifies the printer icon file for the server.  The default is \"printer.png"
-"\"."
-msgstr "Legt den Modellnamen des Druckers fest. Die Vorgabe ist »Printer«."
+#: ippfind.1:150
+msgid "Group the result of expressions."
+msgstr "Gruppiert die Ergebnisse von Ausdrücken."
 
 #. type: TP
-#: ../test/ippserver.man:96
+#: ippfind.1:150
 #, no-wrap
-msgid "B<-k>"
-msgstr "B<-k>"
+msgid "B<! >I<expression>"
+msgstr "B<! >I<Ausdruck>"
+
+#. type: TP
+#: ippfind.1:152
+#, no-wrap
+msgid "B<--not >I<expression>"
+msgstr "B<--not >I<Ausdruck>"
 
 #. type: Plain text
-#: ../test/ippserver.man:99
-msgid ""
-"Keeps the print documents in the spool directory rather than deleting them."
-msgstr "Belässt die Druckdokumente im Spool-Verzeichnis, statt sie zu löschen."
+#: ippfind.1:155
+msgid "Unary NOT of the expression."
+msgstr "Unäres NICHT des Ausdrucks."
 
 #. type: TP
-#: ../test/ippserver.man:99
+#: ippfind.1:155
 #, no-wrap
-msgid "B<-l >I<location>"
-msgstr "B<-l >I<Ort>"
+msgid "I<expression expression>"
+msgstr "I<Ausdruck Ausdruck>"
+
+#. type: TP
+#: ippfind.1:157
+#, no-wrap
+msgid "I<expression >B<--and >I<expression>"
+msgstr "I<Ausdruck >B<--and >I<Ausdruck>"
 
 #. type: Plain text
-#: ../test/ippserver.man:103
-msgid ""
-"Specifies the human-readable location string that is reported by the "
-"server.  The default is the empty string."
-msgstr ""
-"Legt die menschenlesbare Ortszeichenkette fest, die vom Server berichtet "
-"wird. Die Vorgabe ist die leere Zeichenkette."
+#: ippfind.1:160
+msgid "Logical AND of expressions."
+msgstr "Logisches UND von Ausdrücken."
 
 #. type: TP
-#: ../test/ippserver.man:103 lpadmin.man:87
+#: ippfind.1:160
 #, no-wrap
-msgid "B<-m >I<model>"
-msgstr "B<-m >I<Modell>"
+msgid "I<expression >B<--or >I<expression>"
+msgstr "I<Ausdruck >B<--or >I<Ausdruck>"
 
 #. type: Plain text
-#: ../test/ippserver.man:107
-msgid "Specifies the model name of the printer.  The default is \"Printer\"."
-msgstr "Legt den Modellnamen des Druckers fest. Die Vorgabe ist »Printer«."
+#: ippfind.1:163
+msgid "Logical OR of expressions."
+msgstr "Logisches ODER von Ausdrücken."
 
-#. type: TP
-#: ../test/ippserver.man:107
+#. type: SS
+#: ippfind.1:163
 #, no-wrap
-msgid "B<-n >I<hostname>"
-msgstr "B<-n >I<Rechnername>"
+msgid "SUBSTITUTIONS"
+msgstr "ERSETZUNGEN"
 
 #. type: Plain text
-#: ../test/ippserver.man:113
-msgid ""
-"Specifies the hostname that is reported by the server.  The default is the "
-"name returned by the B<hostname>(1)  command."
-msgstr ""
-"Legt den Rechnernamen, der vom Server gemeldet wird, fest. Die Vorgabe ist "
-"der durch den Befehl B<hostname>(1) zurückgelieferte Name."
+#: ippfind.1:165
+msgid "The substitutions for \"{foo}\" in I<-e> and I<--exec> are:"
+msgstr "Die Ersetzungen für »{foo}« in I<-e> und I<--exec> sind:"
 
 #. type: TP
-#: ../test/ippserver.man:113
+#: ippfind.1:165
 #, no-wrap
-msgid "B<-p >I<port>"
-msgstr "B<-p >I<Port>"
+msgid "B<{service_domain}>"
+msgstr "B<{service_domain}>"
 
 #. type: Plain text
-#: ../test/ippserver.man:117
-msgid ""
-"Specifies the port number to listen on.  The default is a user-specific "
-"number from 8000 to 8999."
-msgstr ""
-"Legt den Port fest, bei dem auf Anfragen gewartet werden soll. Die Vorgabe "
-"ist eine benutzerspezifische Nummer zwischen 8000 und 8999."
+#: ippfind.1:168 ippfind.1:221
+msgid "Domain name, e.g., \"example.com.\", \"local.\", etc."
+msgstr "Domain-Name, z.B. »example.com.«, »local.«, usw."
 
 #. type: TP
-#: ../test/ippserver.man:117
-#, fuzzy, no-wrap
-msgid "B<-r >I<subtype>"
-msgstr "B<-r >I<Untertyp>"
+#: ippfind.1:168
+#, no-wrap
+msgid "B<{service_hostname}>"
+msgstr "B<{service_hostname}>"
 
 #. type: Plain text
-#: ../test/ippserver.man:122
-#, fuzzy
+#: ippfind.1:171 ippfind.1:224
 msgid ""
-"Specifies the Bonjour subtype(s) to advertise.  Separate multiple subtypes "
-"with a comma.  The default is \"_print\"."
+"Fully-qualified domain name, e.g., \"printer.example.com.\", \"printer.local."
+"\", etc."
 msgstr ""
-"Legt den/die Bonjour-Untertyp(en) fest, die bekanntgegeben werden sollen. "
-"Mehrere Untertypen werden mit Kommata getrennt. Die Vorgabe ist »_print«."
+"Vollqualifizierter Domain-Name, z.B. »printer.example.com.«, »printer."
+"local.«, usw."
 
 #. type: TP
-#: ../test/ippserver.man:122
+#: ippfind.1:171
 #, no-wrap
-msgid "B<-s >I<speed[,color-speed]>"
-msgstr "B<-s >I<Geschwindigkeit[,Farb-Geschwindigkeit]>"
+msgid "B<{service_name}>"
+msgstr "B<{service_name}>"
 
 #. type: Plain text
-#: ../test/ippserver.man:127
-msgid ""
-"Specifies the printer speed in pages per minute.  If two numbers are "
-"specified and the second number is greater than zero, the server will report "
-"support for color printing.  The default is \"10,0\"."
-msgstr ""
-"Legt die Druckergeschwindigkeit in Seiten pro Minute fest. Falls zwei "
-"Nummern angegeben werden und die zweite Nummer größer als 0 ist, wird der "
-"Server angeben, dass er Farbdruck unterstützt. Die Vorgabe ist »10,0«."
+#: ippfind.1:174 ippfind.1:227
+msgid "Service instance name, e.g., \"My Fine Printer\"."
+msgstr "Dienste-Instanzenname, z.B. »Mein Guter Drucker«."
 
 #. type: TP
-#: ../test/ippserver.man:127
+#: ippfind.1:174
 #, no-wrap
-msgid "B<-v[vvv]>"
-msgstr "B<-v[vvv]>"
+msgid "B<{service_port}>"
+msgstr "B<{service_port}>"
 
 #. type: Plain text
-#: ../test/ippserver.man:130
-#, fuzzy
-msgid "Be (very) verbose when logging activity to the standard output."
-msgstr ""
-"Das Protokollieren der Aktivitäten auf die Standardausgabe erfolgt (sehr) "
-"ausführlich."
+#: ippfind.1:177 ippfind.1:230
+msgid "Port number for server, typically 631 for IPP and 80 for HTTP."
+msgstr "Port-Nummer für Server, typischerweise 631 für IPP und 80 für HTTP."
+
+#. type: TP
+#: ippfind.1:177
+#, no-wrap
+msgid "B<{service_regtype}>"
+msgstr "B<{service_regtype}>"
 
 #. type: Plain text
-#: ../test/ippserver.man:137
-#, fuzzy
-msgid ""
-"The B<ippserver> program returns 1 if it is unable to process the command-"
-"line arguments or register the IPP service.  Otherwise B<ippserver> will run "
-"continuously until terminated."
-msgstr ""
-"Das Programm B<ippserver> liefert 1 zurück, falls es nicht in der Lage ist, "
-"die Befehlszeilenargumente zu verarbeiten oder den IPP-Dienst zu "
-"registrieren. Andernfalls läuft B<ippserver> dauerhaft, bis er beendet wird."
+#: ippfind.1:180 ippfind.1:233
+msgid "DNS-SD registration type, e.g., \"_ipp._tcp\", \"_http._tcp\", etc."
+msgstr "DNS-SD-Registrierungstyp, z.B. »_ipp._tcp«, »_http._tcp« usw."
 
-#. type: Plain text
-#: ../test/ippserver.man:141
-#, fuzzy
-msgid ""
-"The B<ippserver> program is unique to CUPS and conforms to the IPP "
-"Everywhere (PWG 5100.14) specification."
-msgstr ""
-"Das Programm B<ippserver> ist eine Besonderheit von CUPS und konform zu der "
-"Spezifikation »IPP Everywhere (PWG 5100.14)«."
+#. type: TP
+#: ippfind.1:180
+#, no-wrap
+msgid "B<{service_scheme}>"
+msgstr "B<{service_scheme}>"
 
 #. type: Plain text
-#: ../test/ippserver.man:145
-#, fuzzy
-msgid ""
-"B<ippserver> adds environment variables starting with \"IPP_\" for all IPP "
-"Job attributes in the print request.  For example, when executing a command "
-"for an IPP Job containing the \"media\" Job Template attribute, the "
-"\"IPP_MEDIA\" environment variable will be set to the value of that "
-"attribute."
-msgstr ""
-"B<ippserver> fügt für alle IPP-Auftragsattribute in der Druckwarteschlange "
-"Umgebungsvariablen hinzu, die mit »IPP_« beginnen. Wird beispielsweise ein "
-"Befehl für einen IPP-Auftrag ausgeführt, der das Attribut »media« des »Job "
-"Template« enthält, wird die Umgebungsvariable »IPP_MEDIA« auf den Wert des "
-"Attributes gesetzt."
+#: ippfind.1:183 ippfind.1:236
+msgid "URI scheme for DNS-SD registration type, e.g., \"ipp\", \"http\", etc."
+msgstr "URI-Schema für DNS-SD-Registrationstypen, z.B: »ipp«, »http« usw."
+
+#. type: TP
+#: ippfind.1:183
+#, no-wrap
+msgid "B<{}>"
+msgstr "B<{}>"
+
+#. type: TP
+#: ippfind.1:185
+#, no-wrap
+msgid "B<{service_uri}>"
+msgstr "B<{service_uri}>"
 
 #. type: Plain text
-#: ../test/ippserver.man:148
-#, fuzzy
+#: ippfind.1:188 ippfind.1:239
 msgid ""
-"Enumerated values are converted to their keyword equivalents.  For example, "
-"a \"print-quality\" Job Template attribute with a enum value of 3 will "
-"become the \"IPP_PRINT_QUALITY\" environment variable with a value of \"draft"
-"\"."
+"URI for service, e.g., \"ipp://printer.local./ipp/print\", \"http://printer."
+"local./\", etc."
 msgstr ""
-"Aufgezählte Werte werden in ihre Schlüsselwort-Äquivalente umgewandelt. "
-"Beispielsweise wird ein Auftrags-Attribut »print-quality« mit dem "
-"aufgezählten Wert 3 die Umgebungsvariablen »IPP_PRINT_QUALITY« mit dem Wert "
-"»draft« werden."
-
-#. type: Plain text
-#: ../test/ippserver.man:152
-#, fuzzy
-msgid "Run B<ippserver> with a service name of My Cool Printer:"
-msgstr "B<ippserver> mit dem Dienstnamen »Mein Toller Drucker« ausführen:"
+"URI für Dienste, z.B. »ipp://printer.local./ipp/print«, »http://printer."
+"local./« usw."
 
-#. type: Plain text
-#: ../test/ippserver.man:155
-#, fuzzy, no-wrap
-msgid "    ippserver \"My Cool Printer\"\n"
-msgstr "    ippserver \"Mein Toller Drucker\"\n"
+#. type: TP
+#: ippfind.1:188
+#, no-wrap
+msgid "B<{txt_>I<key>B<}>"
+msgstr "B<{txt_>I<Schlüssel>B<}>"
 
 #. type: Plain text
-#: ../test/ippserver.man:160
-msgid "Run the B<file>(1)  command whenever a job is sent to the server:"
-msgstr ""
-"Den Befehl B<file>(1) immer ausführen, wenn ein Auftrag an den Server "
-"gesendet wird:"
+#: ippfind.1:191
+msgid "Value of TXT record I<key> (lowercase)."
+msgstr "Wert des TXT-Datensatz-I<Schlüssel>s (klein geschrieben)"
 
 #. type: Plain text
-#: ../test/ippserver.man:163
-#, fuzzy, no-wrap
-msgid "    ippserver -c file \"My Cool Printer\"\n"
-msgstr "    ippserver \"Mein Toller Drucker\"\n"
+#: ippfind.1:193
+msgid "B<ippfind> supports the following options:"
+msgstr "I<ippfind> unterstützt die folgenden Optionen:"
 
 #. type: Plain text
-#: ../test/ippserver.man:166
-#, fuzzy
-msgid "PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)"
-msgstr "PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)"
+#: ippfind.1:196
+msgid "Show program help."
+msgstr "Zeigt die Programmhilfe."
 
 #. type: Plain text
-#: ../test/ippserver.man:167
-msgid "Copyright \\[co] 2007-2014 by Apple Inc."
-msgstr "Copyright \\[co] 2007-2014 by Apple Inc."
+#: ippfind.1:199
+msgid "Show program version."
+msgstr "Zeigt die Programmversion."
 
-#. type: TH
-#: ipptoolfile.man:12
+#. type: TP
+#: ippfind.1:199 ipptool.1:111
 #, no-wrap
-msgid "ipptoolfile"
-msgstr "ipptoolfile"
+msgid "B<-4>"
+msgstr "B<-4>"
 
-#. type: TH
-#: ipptoolfile.man:12
+#. type: Plain text
+#: ippfind.1:202
+msgid "Use IPv4 when listing."
+msgstr "IPv4 beim Warten auf Anfragen verwenden."
+
+#. type: TP
+#: ippfind.1:202 ipptool.1:116
 #, no-wrap
-msgid "5 August 2019"
-msgstr "5. August 2019"
+msgid "B<-6>"
+msgstr "B<-6>"
 
 #. type: Plain text
-#: ipptoolfile.man:15
-msgid "ipptoolfile - ipptool file format"
-msgstr "ipptoolfile - ipptool-Dateiformat"
+#: ippfind.1:205
+msgid "Use IPv6 when listing."
+msgstr "IPv6 beim Warten auf Anfragen verwenden."
+
+#. type: TP
+#: ippfind.1:205
+#, no-wrap
+msgid "B<-T >I<seconds>"
+msgstr "B<-T >I<Sekunden>"
 
 #. type: Plain text
-#: ipptoolfile.man:21
+#: ippfind.1:210
 msgid ""
-"The B<ipptool>(1)  program accepts free-form plain text files that describe "
-"one or more IPP requests.  Comments start with the \"#\" character and "
-"continue to the end of the line.  Each request is enclosed by curly braces, "
-"for example:"
+"Specify find timeout in seconds.  If 1 or less, B<ippfind> stops as soon as "
+"it thinks it has found everything.  The default timeout is 1 second."
 msgstr ""
-"Das Programm B<ipptool>(1) akzeptiert frei formatierte einfache Textdateien, "
-"die eine oder mehrere IPP-Anfragen beschreiben. Kommentare beginnen mit dem "
-"Zeichen »#« und gehen bis zum Zeilenende. Jede Anfrage ist in geschweiften "
-"Klammern eingeschlossen. Beispiel:"
+"Legt die Zeitüberschreitung beim Suchen fest (in Sekunden). Falls 1 oder "
+"weniger wird B<ippfind> aufhören, sobald es glaubt, alles gefunden zu haben. "
+"Die Vorgabezeitüberschreitung ist eine Sekunde."
 
-#. type: Plain text
-#: ipptoolfile.man:27
+#. type: TP
+#: ippfind.1:210
 #, no-wrap
-msgid ""
-"    # This is a comment\n"
-"    {\n"
-"      # The name of the test\n"
-"      NAME \"Print PDF File\"\n"
-msgstr ""
-"    # Dies ist ein Kommentar\n"
-"    {\n"
-"      # Der Name des Tests\n"
-"      NAME \"Drucke PDF-Datei\"\n"
+msgid "B<-V >I<version>"
+msgstr "B<-V >I<Version>"
 
 #. type: Plain text
-#: ipptoolfile.man:30
-#, no-wrap
+#: ippfind.1:214
 msgid ""
-"      # The request to send\n"
-"      OPERATION Print-Job\n"
+"Specifies the IPP version when listing.  Supported values are \"1.1\", "
+"\"2.0\", \"2.1\", and \"2.2\"."
 msgstr ""
-"      # Die zu sendende Anfrage\n"
-"      OPERATION Print-Job\n"
+"Legt die IPP-Version beim Warten auf Anfragen fest. Unterstützte Werte sind "
+"»1.1«, »2.0«, »2.1« und »2.2«."
 
 #. type: Plain text
-#: ipptoolfile.man:37
-#, no-wrap
+#: ippfind.1:216
 msgid ""
-"      GROUP operation-attributes-tag\n"
-"      ATTR charset attributes-charset utf-8\n"
-"      ATTR language attributes-natural-language en\n"
-"      ATTR uri printer-uri $uri\n"
-"      ATTR name requesting-user-name $user\n"
-"      ATTR mimeMediaType document-format application/pdf\n"
+"B<ippfind> returns 0 if the result for all processed expressions is true, 1 "
+"if the result of any processed expression is false, 2 if browsing or any "
+"query or resolution failed, 3 if an undefined option or invalid expression "
+"was specified, and 4 if it ran out of memory."
 msgstr ""
-"      GROUP operation-attributes-tag\n"
-"      ATTR charset attributes-charset utf-8\n"
-"      ATTR language attributes-natural-language en\n"
-"      ATTR uri printer-uri $uri\n"
-"      ATTR name requesting-user-name $user\n"
-"      ATTR mimeMediaType document-format application/pdf\n"
+"B<ippfind> liefert 0 zurück, falls das Ergebnis für alle verarbeiteten "
+"Ausdrücke wahr ist, 1, falls das Ergebnis irgendeines Ausdruckes falsch ist, "
+"2, falls das Browsen oder irgendeine Abfrage oder Auflösung fehlschlug, 3, "
+"falls eine nicht definierte Option oder ein ungültiger Ausdruck angegeben "
+"wurde oder 4, falls nicht genug Speicher vorhanden war."
 
 #. type: Plain text
-#: ipptoolfile.man:52
-#, no-wrap
+#: ippfind.1:218
 msgid ""
-"      GROUP job-attributes-tag\n"
-"      ATTR collection media-col {\n"
-"        # US Letter plain paper from the \"main\" tray\n"
-"        MEMBER collection media-size {\n"
-"          MEMBER integer x-dimension 21590\n"
-"          MEMBER integer y-dimension 27940\n"
-"        }\n"
-"        MEMBER integer media-top-margin 423\n"
-"        MEMBER integer media-bottom-margin 423\n"
-"        MEMBER integer media-left-margin 423\n"
-"        MEMBER integer media-right-margin 423\n"
-"        MEMBER keyword media-source \"main\"\n"
-"        MEMBER keyword media-type \"stationery\"\n"
-"      }\n"
+"When executing a program, B<ippfind> sets the following environment "
+"variables for the matching service registration:"
 msgstr ""
-"      GROUP job-attributes-tag\n"
-"      ATTR collection media-col {\n"
-"        # US Letter, einfaches Papier aus dem »Haupt«-Fach\n"
-"        MEMBER collection media-size {\n"
-"          MEMBER integer x-dimension 21590\n"
-"          MEMBER integer y-dimension 27940\n"
-"        }\n"
-"        MEMBER integer media-top-margin 423\n"
-"        MEMBER integer media-bottom-margin 423\n"
-"        MEMBER integer media-left-margin 423\n"
-"        MEMBER integer media-right-margin 423\n"
-"        MEMBER keyword media-source \"main\"\n"
-"        MEMBER keyword media-type \"stationery\"\n"
-"      }\n"
+"Beim Ausführen eines Programms setzt B<ippfind> die folgenden "
+"Umgebungsvariablen für die passende Diensteregistrierung:"
 
-#. type: Plain text
-#: ipptoolfile.man:54
+#. type: TP
+#: ippfind.1:218
 #, no-wrap
-msgid "      FILE testfile.pdf\n"
-msgstr "      FILE Testdatei.pdf\n"
+msgid "B<IPPFIND_SERVICE_DOMAIN>"
+msgstr "B<IPPFIND_SERVICE_DOMAIN>"
 
-#. type: Plain text
-#: ipptoolfile.man:63
+#. type: TP
+#: ippfind.1:221
 #, no-wrap
-msgid ""
-"      # The response to expect\n"
-"      STATUS successful-ok\n"
-"      EXPECT job-id OF-TYPE integer WITH-VALUE E<gt>0\n"
-"      EXPECT job-uri OF-TYPE uri\n"
-"    }\n"
-"    {\n"
-"      # The name of the test\n"
-"      NAME \"Wait for Job to Complete\"\n"
-msgstr ""
-"      # Die zu erwartende Antwort\n"
-"      STATUS successful-ok\n"
-"      EXPECT job-id OF-TYPE integer WITH-VALUE E<gt>0\n"
-"      EXPECT job-uri OF-TYPE uri\n"
-"    }\n"
-"    {\n"
-"      # Der Name des Tests\n"
-"      NAME \"Warte auf Fertigstellung des Auftrags\"\n"
+msgid "B<IPPFIND_SERVICE_HOSTNAME>"
+msgstr "B<IPPFIND_SERVICE_HOSTNAME>"
 
-#. type: Plain text
-#: ipptoolfile.man:66
+#. type: TP
+#: ippfind.1:224
 #, no-wrap
-msgid ""
-"      # The request to send\n"
-"      OPERATION Get-Job-Attributes\n"
-msgstr ""
-"      # Die zu sendende Anfrage\n"
-"      OPERATION Get-Job-Attributes\n"
+msgid "B<IPPFIND_SERVICE_NAME>"
+msgstr "B<IPPFIND_SERVICE_NAME>"
 
-#. type: Plain text
-#: ipptoolfile.man:73
+#. type: TP
+#: ippfind.1:227
 #, no-wrap
-msgid ""
-"      GROUP operation-attributes-tag\n"
-"      ATTR charset attributes-charset utf-8\n"
-"      ATTR language attributes-natural-language en\n"
-"      ATTR uri printer-uri $uri\n"
-"      ATTR integer job-id $job-id\n"
-"      ATTR name requesting-user-name $user\n"
-msgstr ""
-"      GROUP operation-attributes-tag\n"
-"      ATTR charset attributes-charset utf-8\n"
-"      ATTR language attributes-natural-language en\n"
-"      ATTR uri printer-uri $uri\n"
-"      ATTR integer job-id $job-id\n"
-"      ATTR name requesting-user-name $user\n"
+msgid "B<IPPFIND_SERVICE_PORT>"
+msgstr "B<IPPFIND_SERVICE_PORT>"
 
-#. type: Plain text
-#: ipptoolfile.man:80
+#. type: TP
+#: ippfind.1:230
 #, no-wrap
-msgid ""
-"      # The response to expect\n"
-"      STATUS successful-ok\n"
-"      EXPECT job-id OF-TYPE integer WITH-VALUE $job-id\n"
-"      EXPECT job-uri OF-TYPE uri\n"
-"      EXPECT job-state OF-TYPE enum WITH-VALUE E<gt>5 REPEAT-NO-MATCH\n"
-"      EXPECT job-originating-user-name OF-TYPE name WITH-VALUE \"$user\"\n"
-msgstr ""
-"      # Die zu erwartende Antwort\n"
-"      STATUS successful-ok\n"
-"      EXPECT job-id OF-TYPE integer WITH-VALUE $job-id\n"
-"      EXPECT job-uri OF-TYPE uri\n"
-"      EXPECT job-state OF-TYPE enum WITH-VALUE E<gt>5 REPEAT-NO-MATCH\n"
-"      EXPECT job-originating-user-name OF-TYPE name WITH-VALUE \"$user\"\n"
+msgid "B<IPPFIND_SERVICE_REGTYPE>"
+msgstr "B<IPPFIND_SERVICE_REGTYPE>"
 
-#. type: Plain text
-#: ipptoolfile.man:85
+#. type: TP
+#: ippfind.1:233
 #, no-wrap
-msgid ""
-"      # Show the job state until completed...\n"
-"      DISPLAY job-state\n"
-"      DISPLAY job-state-reasons\n"
-"    }\n"
-msgstr ""
-"      # Den Auftragsstatus zeigen, bis fertig…\n"
-"      DISPLAY job-state\n"
-"      DISPLAY job-state-reasons\n"
-"    }\n"
-
-#. type: Plain text
-#: ipptoolfile.man:88
-msgid "The following directives can be used outside of a I<test>:"
-msgstr ""
-"Die folgenden Direktiven können außerhalb eines I<Tests> verwandt werden:"
+msgid "B<IPPFIND_SERVICE_SCHEME>"
+msgstr "B<IPPFIND_SERVICE_SCHEME>"
 
 #. type: TP
-#: ipptoolfile.man:88
+#: ippfind.1:236
 #, no-wrap
-msgid "B<{ >I<test >B<}>"
-msgstr "B<{ >I<Test >B<}>"
-
-#. type: Plain text
-#: ipptoolfile.man:91
-msgid "Defines a test."
-msgstr "Definiert einen Test."
+msgid "B<IPPFIND_SERVICE_URI>"
+msgstr "B<IPPFIND_SERVICE_URI>"
 
 #. type: TP
-#: ipptoolfile.man:91
+#: ippfind.1:239
 #, no-wrap
-msgid "B<DEFINE >I<variable-name value>"
-msgstr "B<DEFINE >I<Variablennamen Wert>"
+msgid "B<IPPFIND_TXT_>I<KEY>"
+msgstr "B<IPPFIND_TXT_>I<SCHLÜSSEL>"
 
 #. type: Plain text
-#: ipptoolfile.man:96
-msgid ""
-"Defines the named variable to the given value. This is equivalent to "
-"specifying I<-d variable-name=value> on the B<ipptool>(8)  command-line."
+#: ippfind.1:242
+msgid "Values of TXT record I<KEY> (uppercase)."
+msgstr "Wert des TXT-Datensatz-I<SCHLÜSSEL>s (groß geschrieben)"
+
+#. type: Plain text
+#: ippfind.1:244
+msgid "To show the status of all registered IPP printers on your network, run:"
 msgstr ""
-"Definiert die benannte Variable auf den angegebenen Wert. Dies ist zur "
-"Angabe von I<-d Variablennamen=Wert> auf der B<ipptool>(8)-Befehlszeile "
-"äquivalent."
+"Um den Status aller registrierten IPP-Drucker in Ihrem Netz anzuzeigen, "
+"führen Sie folgendes aus:"
 
-#. type: TP
-#: ipptoolfile.man:96
+#. type: Plain text
+#: ippfind.1:247
 #, no-wrap
-msgid "B<DEFINE-DEFAULT >I<variable-name value>"
-msgstr "B<DEFINE-DEFAULT >I<Variablennamen Wert>"
+msgid "    ippfind --ls\n"
+msgstr "    ippfind --ls\n"
 
 #. type: Plain text
-#: ipptoolfile.man:99
+#: ippfind.1:250
 msgid ""
-"Defines the named variable to the given value if it does not already have a "
-"value."
+"Similarly, to send a PostScript test page to every PostScript printer, run:"
 msgstr ""
-"Definiert die benannte Variable auf den angegebenen Wert, falls sie nicht "
-"bereits einen Wert hat."
+"Um eine PostScript-Testseite an jeden PostScript-Drucker zu senden, führen "
+"Sie aus:"
 
-#. type: TP
-#: ipptoolfile.man:99
+#. type: Plain text
+#: ippfind.1:254
 #, no-wrap
-msgid "B<FILE-ID \">I<identifier>B<\">"
-msgstr "B<FILE-ID \">I<Bezeichner>B<\">"
+msgid ""
+"    ippfind --txt-pdl application/postscript --exec ipptool\n"
+"      -f onepage-letter.ps '{}' print-job.test \\e;\n"
+msgstr ""
+"    ippfind --txt-pdl application/postscript --exec ipptool\n"
+"      -f onepage-letter.ps '{}' print-job.test \\e;\n"
 
 #. type: Plain text
-#: ipptoolfile.man:102
-msgid "Specifies an identifier string for the current file."
-msgstr "Legt einen Bezeichner als Zeichenkette für die aktuelle Datei fest."
+#: ippfind.1:257
+msgid "B<ipptool>(1)"
+msgstr "B<ipptool>(1)"
 
-#. type: TP
-#: ipptoolfile.man:102 ipptoolfile.man:212
-#, no-wrap
-msgid "B<IGNORE-ERRORS yes>"
-msgstr "B<IGNORE-ERRORS yes>"
+#. type: Plain text
+#: ippfind.1:258
+#, fuzzy
+msgid "Copyright \\[co] 2013-2019 by Apple Inc."
+msgstr "Copyright \\[co] 2013-2018 by Apple Inc."
 
-#. type: TP
-#: ipptoolfile.man:104 ipptoolfile.man:214
+#. type: TH
+#: ipptool.1:9
 #, no-wrap
-msgid "B<IGNORE-ERRORS no>"
-msgstr "B<IGNORE-ERRORS no>"
+msgid "ipptool"
+msgstr "ipptool"
+
+#. type: Plain text
+#: ipptool.1:12
+msgid "ipptool - perform internet printing protocol requests"
+msgstr "ipptool - Internet-Printing-Protocol-Abfragen durchführen"
 
 #. type: Plain text
-#: ipptoolfile.man:109
+#: ipptool.1:75
+#, fuzzy
 msgid ""
-"Specifies whether, by default, B<ipptool>(8)  will ignore errors and "
-"continue with subsequent tests."
+"B<ipptool> [ B<--help> ] [ B<--ippserver> I<filename> ] [ B<--stop-after-"
+"include-error> ] [ B<--version> ] [ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] "
+"[ B<-I> ] [ B<-L> ] [ B<-P> I<filename.plist> ] [ B<-S> ] [ B<-T> "
+"I<seconds> ] [ B<-V> I<version> ] [ B<-X> ] [ B<-c> ] [ B<-d> "
+"I<name=value> ] [ B<-f> I<filename> ] [ B<-h> ] [ B<-i> I<seconds> ] [ B<-n> "
+"I<repeat-count> ] [ B<-q> ] [ B<-t> ] [ B<-v ]> I<printer-uri> I<testfile> "
+"[ ...  I<testfile> ]"
 msgstr ""
-"Legt fest, ob B<ipptool>(8) standardmäßig Fehler ignorieren und mit "
-"folgenden Tests fortfahren wird."
-
-#. type: TP
-#: ipptoolfile.man:109
-#, no-wrap
-msgid "B<INCLUDE \">I<filename>B<\">"
-msgstr "B<INCLUDE \">I<Dateiname>B<\">"
-
-#. type: TP
-#: ipptoolfile.man:111
-#, no-wrap
-msgid "B<INCLUDE E<lt>>I<filename>B<E<gt>>"
-msgstr "B<INCLUDE E<lt>>I<Dateiname>B<E<gt>>"
+"B<ipptool> [ B<--help> ] [ B<--stop-after-include-error> ] [ B<--version> ] "
+"[ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] [ B<-I> ] [ B<-L> ] [ B<-P> "
+"I<Dateiname.plist> ] [ B<-S> ] [ B<-T> I<Sekunden> ] [ B<-V> I<Version> ] "
+"[ B<-X> ] [ B<-c> ] [ B<-d> I<Name=Wert> ] [ B<-f> I<Dateiname> ] [ B<-h> ] "
+"[ B<-i> I<Sekunden> ] [ B<-n> I<Anzahl-Wiederholungen> ] [ B<-q> ] [ B<-t> ] "
+"[ B<-v ]> I<Drucker-URI> I<Testdatei> [ …  I<Testdatei> ]"
 
 #. type: Plain text
-#: ipptoolfile.man:116
+#: ipptool.1:88
 msgid ""
-"Includes another test file. The first form includes a file relative to the "
-"current test file, while the second form includes a file from the "
-"B<ipptool>(8)  include directory."
+"B<ipptool> sends IPP requests to the specified I<printer-uri> and tests and/"
+"or displays the results.  Each named I<testfile> defines one or more "
+"requests, including the expected response status, attributes, and values.  "
+"Output is either a plain text, formatted text, CSV, or XML report on the "
+"standard output, with a non-zero exit status indicating that one or more "
+"tests have failed.  The I<testfile> format is described in B<ipptoolfile>(5)."
 msgstr ""
-"Bindet eine andere Testdatei ein. Die erste Form bindet eine Datei relativ "
-"zu der aktuellen Testdatei ein, während die zweite Form eine Datei aus dem "
-"B<ipptool>(8)-Einbindeverzeichnis einbindet."
+"B<ipptool> sendet IPP-Anfragen an die angegebene I<Drucker-URI> und "
+"überprüft das Ergebnis oder zeigt es an. Jede benannte I<Testdatei> "
+"definiert eine oder mehrere Anfragen, dazu gehören der erwartete "
+"Antwortstatus, die Attribute und Werte. Die Ausgabe ist entweder reiner "
+"Text, formatierter Text, CSV oder ein XML-Bericht auf der Standardausgabe. "
+"Ein von Null verschiedener Exit-Status gibt an, dass eine oder mehrere Tests "
+"fehlgeschlagen sind. Das Format der I<Testdatei> wird in B<ipptoolfile>(5) "
+"beschrieben."
 
-#. type: TP
-#: ipptoolfile.man:116
-#, no-wrap
-msgid "B<INCLUDE-IF-DEFINED >I<name >B<\">I<filename>B<\">"
-msgstr "B<INCLUDE-IF-DEFINED >I<Name >B<\">I<Dateiname>B<\">"
+#. type: Plain text
+#: ipptool.1:91
+msgid "The following options are recognized by B<ipptool:>"
+msgstr "Die folgenden Optionen werden von B<ipptool> erkannt:"
+
+#. type: Plain text
+#: ipptool.1:94
+msgid "Shows program help."
+msgstr "Zeigt die Programmhilfe."
 
 #. type: TP
-#: ipptoolfile.man:118
-#, no-wrap
-msgid "B<INCLUDE-IF-DEFINED >I<name >B<E<lt>>I<filename>B<E<gt>>"
-msgstr "B<INCLUDE-IF-DEFINED >I<Name >B<E<lt>>I<Dateiname>B<E<gt>>"
+#: ipptool.1:94
+#, fuzzy, no-wrap
+msgid "B<--ippserver >I<filename>"
+msgstr "B<-p >I<Dateiname.ppd>"
 
 #. type: Plain text
-#: ipptoolfile.man:123
+#: ipptool.1:99
+#, fuzzy
 msgid ""
-"Includes another test file if the named variable is defined. The first form "
-"includes a file relative to the current test file, while the second form "
-"includes a file from the B<ipptool>(8)  include directory."
+"Specifies that the test results should be written to the named B<ippserver> "
+"attributes file."
 msgstr ""
-"Bindet eine andere Testdatei ein, falls die benannte Variable definiert ist. "
-"Die erste Form bindet eine Datei relativ zu der aktuellen Testdatei ein, "
-"während die zweite Form eine Datei aus dem B<ipptool>(8)-Einbindeverzeichnis "
-"einbindet."
-
-#. type: TP
-#: ipptoolfile.man:123
-#, no-wrap
-msgid "B<INCLUDE-IF-NOT-DEFINED >I<name >B<\">I<filename>B<\">"
-msgstr "B<INCLUDE-IF-NOT-DEFINED >I<Name >B<\">I<Dateiname>B<\">"
+"Legt fest, dass der aktuelle Test übersprungen werden soll, wenn die "
+"Variable (nicht) definiert ist."
 
 #. type: TP
-#: ipptoolfile.man:125
+#: ipptool.1:99
 #, no-wrap
-msgid "B<INCLUDE-IF-NOT-DEFINED >I<name >B<E<lt>>I<filename>B<E<gt>>"
-msgstr "B<INCLUDE-IF-NOT-DEFINED >I<Name >B<E<lt>>I<Dateiname>B<E<gt>>"
+msgid "B<--stop-after-include-error>"
+msgstr "B<--stop-after-include-error>"
 
 #. type: Plain text
-#: ipptoolfile.man:130
+#: ipptool.1:106
 msgid ""
-"Includes another test file if the named variable is not defined. The first "
-"form includes a file relative to the current test file, while the second "
-"form includes a file from the B<ipptool>(8)  include directory."
+"Tells B<ipptool> to stop if an error occurs in an included file. Normally "
+"B<ipptool> will continue with subsequent tests after the INCLUDE directive."
 msgstr ""
-"Bindet eine andere Testdatei ein, falls die benannte Variable nicht "
-"definiert ist. Die erste Form bindet eine Datei relativ zu der aktuellen "
-"Testdatei ein, während die zweite Form eine Datei aus dem B<ipptool>(8)-"
-"Einbindeverzeichnis einbindet."
-
-#. type: TP
-#: ipptoolfile.man:130 ipptoolfile.man:238
-#, no-wrap
-msgid "B<SKIP-IF-DEFINED >I<variable-name>"
-msgstr "B<SKIP-IF-DEFINED >I<Variablenname>"
+"Teilt B<ipptool> mit, abzubrechen, falls ein Fehler in der eingebundenen "
+"Datei auftritt. Normalerweise wird B<ipptool> mit folgenden Tests nach der "
+"INCLUDE-Direktive fortfahren."
 
-#. type: TP
-#: ipptoolfile.man:132 ipptoolfile.man:240
-#, no-wrap
-msgid "B<SKIP-IF-NOT-DEFINED >I<variable-name>"
-msgstr "B<SKIP-IF-NOT-DEFINED >I<Variablenname>"
+#. type: Plain text
+#: ipptool.1:111
+msgid "Shows the version of B<ipptool> being used."
+msgstr "Zeigt die verwendete Version von B<ipptool> an."
 
 #. type: Plain text
-#: ipptoolfile.man:135
+#: ipptool.1:116
 msgid ""
-"Specifies that the remainder of the test file should be skipped when the "
-"variable is or is not defined."
+"Specifies that B<ipptool> must connect to the printer or server using IPv4."
 msgstr ""
-"Legt fest, dass der Rest der Testdatei übersprungen werden soll, wenn die "
-"Variable (nicht) definiert ist."
+"Legt fest, dass B<ipptool> sich zu dem Drucker oder Server mit IPv4 "
+"verbinden muss."
 
-#. type: TP
-#: ipptoolfile.man:135
-#, no-wrap
-msgid "B<STOP-AFTER-INCLUDE-ERROR no>"
-msgstr "B<STOP-AFTER-INCLUDE-ERROR no>"
+#. type: Plain text
+#: ipptool.1:121
+msgid ""
+"Specifies that B<ipptool> must connect to the printer or server using IPv6."
+msgstr ""
+"Legt fest, dass B<ipptool> sich zu dem Drucker oder Server mit IPv6 "
+"verbinden muss."
 
 #. type: TP
-#: ipptoolfile.man:137
+#: ipptool.1:121
 #, no-wrap
-msgid "B<STOP-AFTER-INCLUDE-ERROR yes>"
-msgstr "B<STOP-AFTER-INCLUDE-ERROR yes>"
+msgid "B<-C>"
+msgstr "B<-C>"
 
 #. type: Plain text
-#: ipptoolfile.man:140
+#: ipptool.1:125
 msgid ""
-"Specifies whether tests will be stopped after an error in an included file."
+"Specifies that requests should be sent using the HTTP/1.1 \"Transfer-"
+"Encoding: chunked\" header, which is required for conformance by all "
+"versions of IPP.  The default is to use \"Transfer-Encoding: chunked\" for "
+"requests with attached files and \"Content-Length:\" for requests without "
+"attached files."
 msgstr ""
-"Legt fest, ob Tests nach einem Fehler in einer eingebundenen Datei "
-"angehalten werden oder nicht."
-
-#. type: TP
-#: ipptoolfile.man:140 ipptoolfile.man:256
-#, no-wrap
-msgid "B<TRANSFER auto>"
-msgstr "B<TRANSFER auto>"
+"Legt fest, dass Anfragen mit der HTTP/1.1-Kopfzeile »Transfer-Encoding: "
+"chunked« gesendet werden sollen, der für Konformität von allen IPP-Versionen "
+"verlangt wird. Standardmäßig wird »Transfer-Encoding: chunked« für Anfragen "
+"mit anhängenden Dateien und »Content-Length:« für Anfragen ohne anhängende "
+"Dateien verwandt."
 
 #. type: Plain text
-#: ipptoolfile.man:143
+#: ipptool.1:128
 msgid ""
-"Specifies that tests will, by default, use \"Transfer-Encoding: chunked\" "
-"for requests with attached files and \"Content-Length:\" for requests "
-"without attached files."
+"Forces TLS encryption when connecting to the server using the HTTP \"Upgrade"
+"\" header."
 msgstr ""
-"Legt fest, dass der Test standardmäßig »Transfer-Encoding: chunked« für "
-"Anfragen mit angehängten Dateien und »Content-Length:« für Anfragen ohne "
-"angehängte Dateien verwenden wird."
+"Erzwingt TLS-Verschlüsselung bei Verbindungen zum Server mit der HTTP-"
+"Kopfzeile »Upgrade«."
 
 #. type: TP
-#: ipptoolfile.man:143 ipptoolfile.man:259
+#: ipptool.1:128
 #, no-wrap
-msgid "B<TRANSFER chunked>"
-msgstr "B<TRANSFER chunked>"
+msgid "B<-I>"
+msgstr "B<-I>"
 
 #. type: Plain text
-#: ipptoolfile.man:148
-msgid ""
-"Specifies that tests will, by default, use the HTTP/1.1 \"Transfer-Encoding: "
-"chunked\" header. This is the default and is equivalent to specifying I<-c> "
-"on the B<ipptool>(8)  command-line. Support for chunked requests is required "
-"for conformance with all versions of IPP."
-msgstr ""
-"Legt fest, dass die Tests standardmäßig die HTTP/1.1-Kopfzeile »Transfer-"
-"Encoding: chunked« verwenden. Dies ist die Vorgabe und äquivalent zur Angabe "
-"von I<-c> auf der Befehlszeile von B<ipptool>(8). Die Unterstützung für "
-"blockweise Abfragen wird für die Konformität mit allen Versionen von IPP "
-"benötigt."
+#: ipptool.1:133
+msgid "Specifies that B<ipptool> will continue past errors."
+msgstr "Legt fest, dass B<ipptool> bei Fehlern fortfahren soll."
 
 #. type: TP
-#: ipptoolfile.man:148 ipptoolfile.man:262
+#: ipptool.1:133
 #, no-wrap
-msgid "B<TRANSFER length>"
-msgstr "B<TRANSFER length>"
+msgid "B<-L>"
+msgstr "B<-L>"
 
 #. type: Plain text
-#: ipptoolfile.man:153
+#: ipptool.1:137
 msgid ""
-"Specifies that tests will, by default, use the HTTP/1.0 \"Content-Length:\" "
-"header. This is equivalent to specifying I<-l> on the B<ipptool>(8)  command-"
-"line. Support for content length requests is required for conformance with "
-"all versions of IPP."
+"Specifies that requests should be sent using the HTTP/1.0 \"Content-Length:"
+"\" header, which is required for conformance by all versions of IPP.  The "
+"default is to use \"Transfer-Encoding: chunked\" for requests with attached "
+"files and \"Content-Length:\" for requests without attached files."
 msgstr ""
-"Legt fest, dass die Tests standardmäßig die HTTP/1.0-Kopfzeile »Content-"
-"Length« verwenden. Dies ist die Vorgabe und äquivalent zur Angabe von I<-l> "
-"auf der Befehlszeile von B<ipptool>(8). Die Unterstützung für Inhaltslängen-"
-"Abfragen wird für die Konformität mit allen Versionen von IPP benötigt."
-
-#. type: TP
-#: ipptoolfile.man:153 ipptoolfile.man:265
-#, no-wrap
-msgid "B<VERSION 1.0>"
-msgstr "B<VERSION 1.0>"
-
-#. type: TP
-#: ipptoolfile.man:155 ipptoolfile.man:267
-#, no-wrap
-msgid "B<VERSION 1.1>"
-msgstr "B<VERSION 1.1>"
-
-#. type: TP
-#: ipptoolfile.man:157 ipptoolfile.man:269
-#, no-wrap
-msgid "B<VERSION 2.0>"
-msgstr "B<VERSION 2.0>"
-
-#. type: TP
-#: ipptoolfile.man:159 ipptoolfile.man:271
-#, no-wrap
-msgid "B<VERSION 2.1>"
-msgstr "B<VERSION 2.1>"
+"Legt fest, dass Anfragen mit der HTTP/1.0-Kopfzeile »Content-Length:« "
+"gesendet werden sollen, der für Konformität von allen IPP-Versionen verlangt "
+"wird. Standardmäßig wird »Transfer-Encoding: chunked« für Anfragen mit "
+"anhängenden Dateien und »Content-Length:« für Anfragen ohne anhängende "
+"Dateien verwandt."
 
 #. type: TP
-#: ipptoolfile.man:161 ipptoolfile.man:273
+#: ipptool.1:137
 #, no-wrap
-msgid "B<VERSION 2.2>"
-msgstr "B<VERSION 2.2>"
+msgid "B<-P>I<\\ filename.plist>"
+msgstr "B<-P>I<\\ Dateiname.plist>"
 
 #. type: Plain text
-#: ipptoolfile.man:164
+#: ipptool.1:141
 msgid ""
-"Specifies the default IPP version number to use for the tests that follow."
+"Specifies that the test results should be written to the named XML (Apple "
+"plist) file in addition to the regular test report (B<-t>).  This option is "
+"incompatible with the B<-i> (interval) and B<-n> (repeat-count) options."
 msgstr ""
-"Legt die Standard-IPP-Versionsnummer, die für die nachfolgenden Tests "
-"verwandt werden soll, fest."
+"Legt fest, dass die Ergebnisse der Tests zusätzlich zu dem normalen "
+"Testbericht (B<-t>) in die benannte XML- (Apple plist-)Datei geschrieben "
+"werden sollen. Diese Option ist inkompatibel zu den Optionen B<-i> "
+"(Intervall) und B<-n> (Anzahl-Wiederholungen)."
 
-#. type: SS
-#: ipptoolfile.man:164
+#. type: TP
+#: ipptool.1:141
 #, no-wrap
-msgid "TEST DIRECTIVES"
-msgstr "TESTDIREKTIVEN"
+msgid "B<-S>"
+msgstr "B<-S>"
 
 #. type: Plain text
-#: ipptoolfile.man:166
-msgid "The following directives are understood within a I<test>:"
-msgstr ""
-"Die nachfolgenden Direktiven werden innerhalb eines I<Test> verstanden:"
-
-#. type: TP
-#: ipptoolfile.man:166
-#, no-wrap
-msgid "B<ATTR >I<out-of-band-tag attribute-name>"
-msgstr "B<ATTR >I<Außerbandmarkierung Attributname>"
+#: ipptool.1:144
+msgid "Forces (dedicated) TLS encryption when connecting to the server."
+msgstr "Erzwingt (dedizierte) TLS-Verschlüsselung bei Verbindungen zum Server."
 
 #. type: TP
-#: ipptoolfile.man:168
+#: ipptool.1:144
 #, no-wrap
-msgid "B<ATTR >I<tag attribute-name value(s)>"
-msgstr "B<ATTR >I<Markierung Attributname Wert(e)>"
+msgid "B<-T>I<\\ seconds>"
+msgstr "B<-T>I<\\ Sekunden>"
 
-# FIXME: Broken string
-#.  character.
 #. type: Plain text
-#: ipptoolfile.man:174
-msgid ""
-"Adds an attribute to the test request.  Out-of-band tags (admin-define, "
-"delete-attribute, no-value, not-settable, unknown, unsupported) have no "
-"value.  Values for other tags are separated by the comma (\",\") character - "
-"escape commas using the \" Common attributes and values are listed in the "
-"IANA IPP registry - see references below."
-msgstr ""
-"Fügt ein Attribut zu der Testanfrage hinzu. Außerbandmarkierungen (admin-"
-"define, delete-attribute, no-value, not-settable, unknown, unsupported) "
-"haben keinen Wert. Werte für die anderen Markierungen werden durch Kommata "
-"(»,«) getrennt -- schützen Sie Kommata mittels des Anführungszeichens "
-"(»\"«). Gemeinsame Attribute und Werte sind in der »IANA IPP registry« "
-"aufgeführt, siehe Referenz unten."
+#: ipptool.1:147
+msgid "Specifies a timeout for IPP requests in seconds."
+msgstr "Legt eine Zeitüberschreitung in Sekunden für IPP-Anfragen fest."
 
 #. type: TP
-#: ipptoolfile.man:174
+#: ipptool.1:147
 #, no-wrap
-msgid "B<ATTR collection >I<attribute-name >B<{ MEMBER >I<tag member-name value(s) ... >B<}> [ I<... >B<,{ >I<... >B<} >]"
-msgstr "B<ATTR collection >I<Attributname >B<{ MEMBER >I<Markierung Mitgliedsname Wert(e) … >B<}> [ I<… >B<,{ >I<… >B<} >]"
+msgid "B<-V>I<\\ version>"
+msgstr "B<-V>I<\\ Version>"
 
 #. type: Plain text
-#: ipptoolfile.man:179
+#: ipptool.1:150
 msgid ""
-"Adds a collection attribute to the test request.  Member attributes follow "
-"the same syntax as regular attributes and can themselves be nested "
-"collections.  Multiple collection values can be supplied as needed, "
-"separated by commas."
+"Specifies the default IPP version to use: 1.0, 1.1, 2.0, 2.1, or 2.2. If not "
+"specified, version 1.1 is used."
 msgstr ""
-"Fügt der Testanfrage ein Sammlungsattribut hinzu. Mitgliedsattribute folgen "
-"der gleichen Syntax wie reguläre Attribute und können selbst wieder "
-"verschachtelte Sammlungen sein. Mehrere Sammlungswerte können, durch Kommata "
-"getrennt, wie benötigt angegeben werden."
-
-#. type: TP
-#: ipptoolfile.man:179
-#, no-wrap
-msgid "B<COMPRESSION deflate>"
-msgstr "B<COMPRESSION deflate>"
-
-#. type: TP
-#: ipptoolfile.man:181
-#, no-wrap
-msgid "B<COMPRESSION gzip>"
-msgstr "B<COMPRESSION gzip>"
+"Legt die zu verwendende Standard-IPP-Version fest: 1.0, 1.1, 2.0, 2.1 oder "
+"2.2. Falls nicht angegeben, wird Version 1.1 verwandt."
 
 #. type: TP
-#: ipptoolfile.man:183
+#: ipptool.1:150
 #, no-wrap
-msgid "B<COMPRESSION none>"
-msgstr "B<COMPRESSION none>"
+msgid "B<-X>"
+msgstr "B<-X>"
 
 #. type: Plain text
-#: ipptoolfile.man:186
+#: ipptool.1:154
 msgid ""
-"Uses the specified compression on the document data following the attributes "
-"in a Print-Job or Send-Document request."
+"Specifies that XML (Apple plist) output is desired instead of the plain text "
+"report.  This option is incompatible with the B<-i> (interval) and B<-n> "
+"(repeat-count) options."
 msgstr ""
-"Verwendet die angegebene Komprimierung auf die Dokumentendaten, die den "
-"Attributen in einer Print-Job- oder Send-Document-Anfrage folgen."
-
-#. type: TP
-#: ipptoolfile.man:186
-#, no-wrap
-msgid "B<DELAY >I<seconds>[I<,repeat-seconds>]"
-msgstr "B<DELAY >I<Sekunden>[I<,Wiederholungssekunden>]"
+"Legt fest, dass die XML- (Apple-Plist-)Ausgabe statt des reinen Textberichts "
+"erwünscht ist. Diese Option ist inkompatibel zu den Optionen B<-i> "
+"(Intervall) und B<-n> (Anzahl-Wiederholungen)."
 
 #. type: Plain text
-#: ipptoolfile.man:190
+#: ipptool.1:157
 msgid ""
-"Specifies a delay in seconds before this test will be run.  If two values "
-"are specified, the second value is used as the delay between repeated tests."
+"Specifies that CSV (comma-separated values) output is desired instead of the "
+"plain text output."
 msgstr ""
-"Legt eine Verzögerung in Sekunden fest, bevor dieser Test ausgeführt wird. "
-"Falls zwei Werte festgelegt werden, wird der zweite als Verzögerung zwischen "
-"wiederholten Tests verwandt."
+"Legt fest, dass CVS- (Kommata-getrennte Werte-)Ausgabe statt des reinen "
+"Textberichts erwünscht ist."
 
 #. type: TP
-#: ipptoolfile.man:190
+#: ipptool.1:157
 #, no-wrap
-msgid "B<DISPLAY >I<attribute-name>"
-msgstr "B<DISPLAY >I<Attributname>"
+msgid "B<-d>I<\\ name=value>"
+msgstr "B<-d>I<\\ Name=Wert>"
 
 #. type: Plain text
-#: ipptoolfile.man:194
-msgid ""
-"Specifies that value of the named attribute should be output as part of the "
-"test report."
-msgstr ""
-"Legt fest, dass der Wert des benannten Attributes als Teil des Testberichts "
-"ausgegeben werden soll."
+#: ipptool.1:160
+msgid "Defines the named variable."
+msgstr "Definiert die genannte Variable."
 
 #. type: TP
-#: ipptoolfile.man:194
+#: ipptool.1:160
 #, no-wrap
-msgid "B<EXPECT >I<attribute-name >[ I<predicate(s) >]"
-msgstr "B<EXPECT >I<Attributname >[ I<Eigenschaft(en) >]"
+msgid "B<-f>I<\\ filename>"
+msgstr "B<-f>I<\\ Dateiname>"
 
-#. type: TP
-#: ipptoolfile.man:196
-#, no-wrap
-msgid "B<EXPECT ?>I<attribute-name predicate(s)>"
-msgstr "B<EXPECT ?>I<Attributname Eigenschaft(en)>"
+#. type: Plain text
+#: ipptool.1:163
+msgid "Defines the default request filename for tests."
+msgstr "Definiert den Standardanfragedateinamen für Tests."
+
+#. type: Plain text
+#: ipptool.1:166
+msgid "Validate HTTP response headers."
+msgstr "Validiert HTTP-Antwort-Kopfzeilen."
 
 #. type: TP
-#: ipptoolfile.man:198
+#: ipptool.1:166
 #, no-wrap
-msgid "B<EXPECT !>I<attribute-name>"
-msgstr "B<EXPECT !>I<Attributname>"
+msgid "B<-i>I<\\ seconds>"
+msgstr "B<-i>I<\\ Sekunden>"
 
 #. type: Plain text
-#: ipptoolfile.man:201
+#: ipptool.1:172
 msgid ""
-"Specifies that the response must/may/must not include the named attribute. "
-"Additional requirements can be added as predicates - see the \"EXPECT "
-"PREDICATES\" section for more information on predicates. Attribute names can "
-"specify member attributes by separating the attribute and member names with "
-"the forward slash, for example \"media-col/media-size/x-dimension\"."
+"Specifies that the (last)  I<testfile> should be repeated at the specified "
+"interval.  This option is incompatible with the B<-X> (XML plist output) "
+"option."
 msgstr ""
-"Legt fest, dass die Antwort das benannte Attribut enthalten muss/kann/nicht "
-"darf. Zusätzliche Anforderungen können als Eigenschaften hinzugefügt werden "
-"- siehe den Abschnitt »EXPECT-EIGENSCHAFTEN« für weitere Informationen über "
-"Eigenschaften. Attributnamen können weitere Mitgliederattribute festlegen, "
-"indem die Attribut- und Mitgliedernamen durch einen normalen Schrägstrich "
-"getrennt werden. Beispiel: »media-col/media-size/x-dimension«."
+"Legt fest, dass die (letzte) I<Testdatei> mit dem angegebenen Intervall "
+"wiederholt werden soll. Diese Option ist inkompatibel zu der Option B<-X> "
+"(XML-Plist-Ausgabe)."
 
-#. type: TP
-#: ipptoolfile.man:201
-#, no-wrap
-msgid "B<EXPECT-ALL >I<attribute-name >[ I<predicate(s) >]"
-msgstr "B<EXPECT-ALL >I<Attributname >[ I<Eigenschaft(en) >]"
+#. type: Plain text
+#: ipptool.1:175
+msgid "Specifies that plain text output is desired."
+msgstr "Legt fest, dass die Ausgabe als einfacher Text erwünscht ist."
 
 #. type: TP
-#: ipptoolfile.man:203
+#: ipptool.1:175
 #, no-wrap
-msgid "B<EXPECT-ALL ?>I<attribute-name predicate(s)>"
-msgstr "B<EXPECT-ALL ?>I<Attributname Eigenschaft(en)>"
+msgid "B<-n>I<\\ repeat-count>"
+msgstr "B<-n>I<\\ Anzahl-Wiederholungen>"
 
 #. type: Plain text
-#: ipptoolfile.man:206
+#: ipptool.1:181
 msgid ""
-"Specifies that the response must/may include the named attribute and that "
-"all occurrences of that attribute must match the given predicates."
+"Specifies that the (last)  I<testfile> should be repeated the specified "
+"number of times.  This option is incompatible with the I<-X> (XML plist "
+"output) option."
 msgstr ""
-"Legt fest, dass die Antwort das benannte Attribut enthalten muss/kann und "
-"dass alle Vorkommen dieses Attributs auf die angegebenen Eigenschaften "
-"passen müssen."
+"Legt fest, dass die (letzte) I<Testdatei> entsprechend der angegeben Zahl "
+"wiederholt werden soll. Diese Option ist inkompatibel zu der Option I<-X> "
+"(XML-Plist-Ausgabe)."
 
-#. type: TP
-#: ipptoolfile.man:206
-#, no-wrap
-msgid "B<FILE filename>"
-msgstr "B<FILE Dateiname>"
+#. type: Plain text
+#: ipptool.1:184
+msgid "Be quiet and produce no output."
+msgstr "Still sein und keine Ausgabe erzeugen."
 
 #. type: Plain text
-#: ipptoolfile.man:209
+#: ipptool.1:187
 msgid ""
-"Specifies a file to include at the end of the request. This is typically "
-"used when sending a test print file."
+"Specifies that CUPS test report output is desired instead of the plain text "
+"output."
 msgstr ""
-"Legt eine Datei, die am Ende der Anfrage eingefügt werden soll, fest. Dies "
-"wird typischerweise verwandt, wenn eine Testausdrucksdatei gesandt wird."
-
-#. type: TP
-#: ipptoolfile.man:209
-#, no-wrap
-msgid "B<GROUP tag>"
-msgstr "B<GROUP Markierung>"
+"Legt fest, dass CUPS-Testberichtausgabe statt einfache Textausgabe erwünscht "
+"ist."
 
 #. type: Plain text
-#: ipptoolfile.man:212
-msgid "Specifies the group tag for subsequent attributes in the request."
+#: ipptool.1:191
+msgid ""
+"Specifies that all request and response attributes should be output in CUPS "
+"test mode (B<-t>).  This is the default for XML output."
 msgstr ""
-"Legt die Gruppenmarkierung für nachfolgende Attribute in der Anfrage fest."
+"Legt fest, dass alle Anfrage- und Antwort-Attribute im CUPS-Testmodus (B<-"
+"t>) ausgegeben werden sollen. Dies ist die Vorgabe für XML-Ausgabe."
 
 #. type: Plain text
-#: ipptoolfile.man:219
+#: ipptool.1:195
 msgid ""
-"Specifies whether B<ipptool>(8)  will ignore errors and continue with "
-"subsequent tests."
+"The B<ipptool> program returns 0 if all tests were successful and 1 "
+"otherwise."
 msgstr ""
-"Legt fest, ob B<ipptool>(8) Fehler in nachfolgenden Tests ignorieren und "
-"fortfahren soll."
-
-#. type: TP
-#: ipptoolfile.man:219
-#, no-wrap
-msgid "B<NAME \">I<literal string>B<\">"
-msgstr "B<NAME \">I< Zeichenkette>B<\">"
+"Das Programm B<ipptool> liefert 0 zurück, falls alle Tests erfolgreich waren "
+"und ansonsten 1."
 
 #. type: Plain text
-#: ipptoolfile.man:222
-msgid "Specifies the human-readable name of the test."
-msgstr "Legt den menschenlesbaren Namen des Tests fest."
-
-#. type: TP
-#: ipptoolfile.man:222
-#, no-wrap
-msgid "B<OPERATION >I<operation-code>"
-msgstr "B<OPERATION >I<Vorgangscode>"
+#: ipptool.1:197
+msgid "The following standard files are available:"
+msgstr "Die folgenden Standarddateien sind verfügbar:"
 
 #. type: Plain text
-#: ipptoolfile.man:225
-msgid "Specifies the operation to be performed."
-msgstr "Legt den auszuführenden Vorgang fest."
-
-#. type: TP
-#: ipptoolfile.man:225
+#: ipptool.1:228
 #, no-wrap
-msgid "B<PAUSE \">I<message>B<\">"
-msgstr "B<PAUSE \">I<Nachricht>B<\">"
-
-#. type: Plain text
-#: ipptoolfile.man:228
 msgid ""
-"Displays the provided message and waits for the user to press a key to "
-"continue."
+"I<color.jpg>\n"
+"I<create-printer-subscription.test>\n"
+"I<document-a4.pdf>\n"
+"I<document-a4.ps>\n"
+"I<document-letter.pdf>\n"
+"I<document-letter.ps>\n"
+"I<get-completed-jobs.test>\n"
+"I<get-jobs.test>\n"
+"I<get-notifications.test>\n"
+"I<get-printer-attributes.test>\n"
+"I<get-subscriptions.test>\n"
+"I<gray.jpg>\n"
+"I<ipp-1.1.test>\n"
+"I<ipp-2.0.test>\n"
+"I<ipp-2.1.test>\n"
+"I<ipp-2.2.test>\n"
+"I<ipp-everywhere.test>\n"
+"I<onepage-a4.pdf>\n"
+"I<onepage-a4.ps>\n"
+"I<onepage-letter.pdf>\n"
+"I<onepage-letter.ps>\n"
+"I<print-job.test>\n"
+"I<print-job-deflate.test>\n"
+"I<print-job-gzip.test>\n"
+"I<testfile.jpg>\n"
+"I<testfile.pcl>\n"
+"I<testfile.pdf>\n"
+"I<testfile.ps>\n"
+"I<testfile.txt>\n"
+"I<validate-job.test>\n"
 msgstr ""
-"Zeigt die bereitgestellte Nachricht an und warten darauf, dass der Benutzer "
-"eine Taste zum Fortfahren drückt."
-
-#. type: TP
-#: ipptoolfile.man:228
-#, no-wrap
-msgid "B<REQUEST-ID >I<number>"
-msgstr "B<REQUEST-ID >I<Nummer>"
-
-#. type: TP
-#: ipptoolfile.man:230
-#, no-wrap
-msgid "B<REQUEST-ID random>"
-msgstr "B<REQUEST-ID random>"
+"I<color.jpg>\n"
+"I<create-printer-subscription.test>\n"
+"I<document-a4.pdf>\n"
+"I<document-a4.ps>\n"
+"I<document-letter.pdf>\n"
+"I<document-letter.ps>\n"
+"I<get-completed-jobs.test>\n"
+"I<get-jobs.test>\n"
+"I<get-notifications.test>\n"
+"I<get-printer-attributes.test>\n"
+"I<get-subscriptions.test>\n"
+"I<gray.jpg>\n"
+"I<ipp-1.1.test>\n"
+"I<ipp-2.0.test>\n"
+"I<ipp-2.1.test>\n"
+"I<ipp-2.2.test>\n"
+"I<ipp-everywhere.test>\n"
+"I<onepage-a4.pdf>\n"
+"I<onepage-a4.ps>\n"
+"I<onepage-letter.pdf>\n"
+"I<onepage-letter.ps>\n"
+"I<print-job.test>\n"
+"I<print-job-deflate.test>\n"
+"I<print-job-gzip.test>\n"
+"I<testfile.jpg>\n"
+"I<testfile.pcl>\n"
+"I<testfile.pdf>\n"
+"I<testfile.ps>\n"
+"I<testfile.txt>\n"
+"I<validate-job.test>\n"
 
 #. type: Plain text
-#: ipptoolfile.man:233
+#: ipptool.1:233
 msgid ""
-"Specifies the request-id value to use in the request, either an integer or "
-"the word \"random\" to use a randomly generated value (the default)."
+"The B<ipptool> program is unique to CUPS and conforms to the Internet "
+"Printing Protocol up to version 2.2."
 msgstr ""
-"Legt die in der Anfrage zu verwendende Anfrage-ID, entweder eine Ganzzahl "
-"oder das Wort »random«, um einen zufällig erzeugten Wert zu verwenden "
-"(Vorgabe), fest."
-
-#. type: TP
-#: ipptoolfile.man:233
-#, no-wrap
-msgid "B<RESOURCE >I<path>"
-msgstr "B<RESOURCE >I<Pfad>"
+"Das Programm B<ipptool> ist eine Besonderheit von CUPS und konform zu der "
+"Spezifikation »Internet Printing Protocol« bis zu Version 2.2."
 
 #. type: Plain text
-#: ipptoolfile.man:238
-msgid ""
-"Specifies an alternate resource path that is used for the HTTP POST request. "
-"The default is the resource from the URI provided to the B<ipptool>(8)  "
-"program."
-msgstr ""
-"Legt einen alternativen Ressourcen-Pfad, der für HTTP-POST-Anfragen verwandt "
-"wird, fest. Die Vorgabe ist die Ressource, die aus der an das Programm "
-"B<ipptool>(8) übergebenen URI entstammt."
+#: ipptool.1:235
+msgid "Get a list of completed jobs for \"myprinter\":"
+msgstr "Eine Liste von abgeschlossenen Aufträgen für »MeinDrucker« ermitteln:"
 
 #. type: Plain text
-#: ipptoolfile.man:243
-msgid ""
-"Specifies that the current test should be skipped when the variable is or is "
-"not defined."
-msgstr ""
-"Legt fest, dass der aktuelle Test übersprungen werden soll, wenn die "
-"Variable (nicht) definiert ist."
-
-#. type: TP
-#: ipptoolfile.man:243
-#, no-wrap
-msgid "B<SKIP-PREVIOUS-ERROR yes>"
-msgstr "B<SKIP-PREVIOUS-ERROR yes>"
-
-#. type: TP
-#: ipptoolfile.man:245
+#: ipptool.1:238
 #, no-wrap
-msgid "B<SKIP-PREVIOUS-ERROR no>"
-msgstr "B<SKIP-PREVIOUS-ERROR no>"
+msgid "    ipptool ipp://localhost/printers/myprinter get-completed-jobs.test\n"
+msgstr "    ipptool ipp://localhost/printers/MeinDrucker get-completed-jobs.test\n"
 
 #. type: Plain text
-#: ipptoolfile.man:250
+#: ipptool.1:241
 msgid ""
-"Specifies whether B<ipptool>(8)  will skip the current test if the previous "
-"test resulted in an error/failure."
+"Send email notifications to \"user@example.com\" when \"myprinter\" changes:"
 msgstr ""
-"Legt fest, ob B<ipptool>(8) den aktuellen Test überspringt, falls der "
-"vorhergehende Test zu einem Fehler/Fehlschlag führte."
+"Eine E-Mail-Benachrichtigung an »user@example.com« senden, wenn sich "
+"»MeinDrucker« ändert:"
 
-#. type: TP
-#: ipptoolfile.man:250
+#. type: Plain text
+#: ipptool.1:245
 #, no-wrap
-msgid "B<STATUS >I<status-code >[ I<predicate> ]"
-msgstr "B<STATUS >I<Status-Code >[ I<Eigenschaft> ]"
+msgid ""
+"    ipptool -d recipient=mailto:user@example.com \\e\n"
+"        ipp://localhost/printers/myprinter create-printer-subscription.test\n"
+msgstr ""
+"    ipptool -d recipient=mailto:user@example.com \\e\n"
+"        ipp://localhost/printers/myprinter create-printer-subscription.test\n"
 
 #. type: Plain text
-#: ipptoolfile.man:253
+#: ipptool.1:251
 msgid ""
-"Specifies an expected response status-code value. Additional requirements "
-"can be added as predicates - see the \"STATUS PREDICATES\" section for more "
-"information on predicates."
+"B<ipptoolfile>(5), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
+"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
+"ipp)  RFC 8011 (http://tools.ietf.org/html/rfc8011),"
 msgstr ""
-"Legt den Status-Code-Wert einer erwarteten Antwort fest. Zusätzliche "
-"Anforderungen können als Eigenschaften hinzugefügt werden - siehe den "
-"Abschnitt »EXPECT-EIGENSCHAFTEN« für weitere Informationen über "
-"Eigenschaften."
+"B<ipptoolfile>(5), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
+"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
+"ipp)  RFC 8011 (http://tools.ietf.org/html/rfc8011),"
 
-#. type: TP
-#: ipptoolfile.man:253
+#. type: TH
+#: ipptoolfile.5:9
 #, no-wrap
-msgid "B<TEST-ID \">I<identifier>\""
-msgstr "B<TEST-ID \">I<Bezeichner>\""
+msgid "ipptoolfile"
+msgstr "ipptoolfile"
 
-#. type: Plain text
-#: ipptoolfile.man:256
-msgid "Specifies an identifier string for the current test."
-msgstr "Legt einen Bezeichner als Zeichenkette für den aktuellen Test fest."
+#. type: TH
+#: ipptoolfile.5:9
+#, fuzzy, no-wrap
+#| msgid "5 August 2019"
+msgid "15 August 2019"
+msgstr "5. August 2019"
 
 #. type: Plain text
-#: ipptoolfile.man:259
-msgid ""
-"Specifies that this test will use \"Transfer-Encoding: chunked\" if it has "
-"an attached file or \"Content-Length:\" otherwise."
-msgstr ""
-"Legt fest, dass dieser Test »Transfer-Encoding: chunked« verwendet, falls er "
-"eine angehängt Datei hat und »Content-Length:« andernfalls."
+#: ipptoolfile.5:12
+msgid "ipptoolfile - ipptool file format"
+msgstr "ipptoolfile - ipptool-Dateiformat"
 
 #. type: Plain text
-#: ipptoolfile.man:262
+#: ipptoolfile.5:18
 msgid ""
-"Specifies that this test will use the HTTP/1.1 \"Transfer-Encoding: chunked"
-"\" header."
+"The B<ipptool>(1)  program accepts free-form plain text files that describe "
+"one or more IPP requests.  Comments start with the \"#\" character and "
+"continue to the end of the line.  Each request is enclosed by curly braces, "
+"for example:"
 msgstr ""
-"Legt fest, dass dieser Test die HTTP/1.1-Kopfzeile »Transfer-Encoding: "
-"chunked« verwenden wird."
+"Das Programm B<ipptool>(1) akzeptiert frei formatierte einfache Textdateien, "
+"die eine oder mehrere IPP-Anfragen beschreiben. Kommentare beginnen mit dem "
+"Zeichen »#« und gehen bis zum Zeilenende. Jede Anfrage ist in geschweiften "
+"Klammern eingeschlossen. Beispiel:"
 
 #. type: Plain text
-#: ipptoolfile.man:265
+#: ipptoolfile.5:24
+#, no-wrap
 msgid ""
-"Specifies that this test will use the HTTP/1.0 \"Content-Length:\" header."
+"    # This is a comment\n"
+"    {\n"
+"      # The name of the test\n"
+"      NAME \"Print PDF File\"\n"
 msgstr ""
-"Legt fest, dass dieser Test die HTTP/1.0-Kopfzeile »Content-Length:« "
-"verwenden wird."
+"    # Dies ist ein Kommentar\n"
+"    {\n"
+"      # Der Name des Tests\n"
+"      NAME \"Drucke PDF-Datei\"\n"
 
 #. type: Plain text
-#: ipptoolfile.man:276
-msgid "Specifies the IPP version number to use for this test."
-msgstr "Legt die für diesen Test zu verwendende IPP-Versionsnummer fest."
-
-#. type: SS
-#: ipptoolfile.man:276
+#: ipptoolfile.5:27
 #, no-wrap
-msgid "EXPECT PREDICATES"
-msgstr "EXPECT-EIGENSCHAFTEN"
-
-#. type: Plain text
-#: ipptoolfile.man:278
 msgid ""
-"The following predicates are understood following the B<EXPECT> test "
-"directive:"
+"      # The request to send\n"
+"      OPERATION Print-Job\n"
 msgstr ""
-"Die folgenden Eigenschaften (Prädikate) werden angehängt an die B<EXPECT>-"
-"Test-Direktiven verstanden:"
-
-#. type: TP
-#: ipptoolfile.man:278
-#, no-wrap
-msgid "B<COUNT >I<number>"
-msgstr "B<COUNT >I<Anzahl>"
+"      # Die zu sendende Anfrage\n"
+"      OPERATION Print-Job\n"
 
 #. type: Plain text
-#: ipptoolfile.man:281
+#: ipptoolfile.5:34
+#, no-wrap
 msgid ""
-"Requires the B<EXPECT> attribute to have the specified number of values."
+"      GROUP operation-attributes-tag\n"
+"      ATTR charset attributes-charset utf-8\n"
+"      ATTR language attributes-natural-language en\n"
+"      ATTR uri printer-uri $uri\n"
+"      ATTR name requesting-user-name $user\n"
+"      ATTR mimeMediaType document-format application/pdf\n"
 msgstr ""
-"Verlangt, dass das Attribut von B<EXPECT> die angegebene Anzahl an Werten "
-"hat."
-
-#. type: TP
-#: ipptoolfile.man:281 ipptoolfile.man:390
-#, no-wrap
-msgid "B<DEFINE-MATCH >I<variable-name>"
-msgstr "B<DEFINE-MATCH >I<Variablenname>"
+"      GROUP operation-attributes-tag\n"
+"      ATTR charset attributes-charset utf-8\n"
+"      ATTR language attributes-natural-language en\n"
+"      ATTR uri printer-uri $uri\n"
+"      ATTR name requesting-user-name $user\n"
+"      ATTR mimeMediaType document-format application/pdf\n"
 
 #. type: Plain text
-#: ipptoolfile.man:284
+#: ipptoolfile.5:49
+#, no-wrap
 msgid ""
-"Defines the variable to \"1\" when the B<EXPECT> condition matches. A side-"
-"effect of this predicate is that this B<EXPECT> will never fail a test."
+"      GROUP job-attributes-tag\n"
+"      ATTR collection media-col {\n"
+"        # US Letter plain paper from the \"main\" tray\n"
+"        MEMBER collection media-size {\n"
+"          MEMBER integer x-dimension 21590\n"
+"          MEMBER integer y-dimension 27940\n"
+"        }\n"
+"        MEMBER integer media-top-margin 423\n"
+"        MEMBER integer media-bottom-margin 423\n"
+"        MEMBER integer media-left-margin 423\n"
+"        MEMBER integer media-right-margin 423\n"
+"        MEMBER keyword media-source \"main\"\n"
+"        MEMBER keyword media-type \"stationery\"\n"
+"      }\n"
 msgstr ""
-"Setzt die Variable auf »1«, wenn die B<EXPECT>-Bedingung passt. Ein "
-"Seiteneffekt dieser Eigenschaft ist, dass dieser B<EXPECT> niemals bei einem "
-"Test fehlschlägt."
+"      GROUP job-attributes-tag\n"
+"      ATTR collection media-col {\n"
+"        # US Letter, einfaches Papier aus dem »Haupt«-Fach\n"
+"        MEMBER collection media-size {\n"
+"          MEMBER integer x-dimension 21590\n"
+"          MEMBER integer y-dimension 27940\n"
+"        }\n"
+"        MEMBER integer media-top-margin 423\n"
+"        MEMBER integer media-bottom-margin 423\n"
+"        MEMBER integer media-left-margin 423\n"
+"        MEMBER integer media-right-margin 423\n"
+"        MEMBER keyword media-source \"main\"\n"
+"        MEMBER keyword media-type \"stationery\"\n"
+"      }\n"
 
-#. type: TP
-#: ipptoolfile.man:284 ipptoolfile.man:393
+#. type: Plain text
+#: ipptoolfile.5:51
 #, no-wrap
-msgid "B<DEFINE-NO-MATCH >I<variable-name>"
-msgstr "B<DEFINE-NO-MATCH >I<Variablenname>"
+msgid "      FILE testfile.pdf\n"
+msgstr "      FILE Testdatei.pdf\n"
 
 #. type: Plain text
-#: ipptoolfile.man:287
+#: ipptoolfile.5:60
+#, no-wrap
 msgid ""
-"Defines the variable to \"1\" when the B<EXPECT> condition does not match. A "
-"side-effect of this predicate is that this B<EXPECT> will never fail a test."
+"      # The response to expect\n"
+"      STATUS successful-ok\n"
+"      EXPECT job-id OF-TYPE integer WITH-VALUE E<gt>0\n"
+"      EXPECT job-uri OF-TYPE uri\n"
+"    }\n"
+"    {\n"
+"      # The name of the test\n"
+"      NAME \"Wait for Job to Complete\"\n"
 msgstr ""
-"Setzt die Variable auf »1«, wenn die B<EXPECT>-Bedingung nicht passt. Ein "
-"Seiteneffekt dieser Eigenschaft ist, dass dieser B<EXPECT> niemals bei einem "
-"Test fehlschlägt."
+"      # Die zu erwartende Antwort\n"
+"      STATUS successful-ok\n"
+"      EXPECT job-id OF-TYPE integer WITH-VALUE E<gt>0\n"
+"      EXPECT job-uri OF-TYPE uri\n"
+"    }\n"
+"    {\n"
+"      # Der Name des Tests\n"
+"      NAME \"Warte auf Fertigstellung des Auftrags\"\n"
 
-#. type: TP
-#: ipptoolfile.man:287
+#. type: Plain text
+#: ipptoolfile.5:63
 #, no-wrap
-msgid "B<DEFINE-VALUE >I<variable-name>"
-msgstr "B<DEFINE-VALUE >I<Variablenname>"
+msgid ""
+"      # The request to send\n"
+"      OPERATION Get-Job-Attributes\n"
+msgstr ""
+"      # Die zu sendende Anfrage\n"
+"      OPERATION Get-Job-Attributes\n"
 
 #. type: Plain text
-#: ipptoolfile.man:290
+#: ipptoolfile.5:70
+#, no-wrap
 msgid ""
-"Defines the variable to the value of the attribute when the B<EXPECT> "
-"condition matches. A side-effect of this predicate is that this B<EXPECT> "
-"will never fail a test."
+"      GROUP operation-attributes-tag\n"
+"      ATTR charset attributes-charset utf-8\n"
+"      ATTR language attributes-natural-language en\n"
+"      ATTR uri printer-uri $uri\n"
+"      ATTR integer job-id $job-id\n"
+"      ATTR name requesting-user-name $user\n"
 msgstr ""
-"Setzt die Variable auf den Wert des Attributes, wenn die B<EXPECT>-Bedingung "
-"passt. Ein Seiteneffekt dieser Eigenschaft ist, dass dieser B<EXPECT> "
-"niemals bei einem Test fehlschlägt."
+"      GROUP operation-attributes-tag\n"
+"      ATTR charset attributes-charset utf-8\n"
+"      ATTR language attributes-natural-language en\n"
+"      ATTR uri printer-uri $uri\n"
+"      ATTR integer job-id $job-id\n"
+"      ATTR name requesting-user-name $user\n"
 
-#. type: TP
-#: ipptoolfile.man:290 ipptoolfile.man:396
+#. type: Plain text
+#: ipptoolfile.5:77
 #, no-wrap
-msgid "B<IF-DEFINED >I<variable-name>"
-msgstr "B<IF-DEFINED >I<Variablenname>"
+msgid ""
+"      # The response to expect\n"
+"      STATUS successful-ok\n"
+"      EXPECT job-id OF-TYPE integer WITH-VALUE $job-id\n"
+"      EXPECT job-uri OF-TYPE uri\n"
+"      EXPECT job-state OF-TYPE enum WITH-VALUE E<gt>5 REPEAT-NO-MATCH\n"
+"      EXPECT job-originating-user-name OF-TYPE name WITH-VALUE \"$user\"\n"
+msgstr ""
+"      # Die zu erwartende Antwort\n"
+"      STATUS successful-ok\n"
+"      EXPECT job-id OF-TYPE integer WITH-VALUE $job-id\n"
+"      EXPECT job-uri OF-TYPE uri\n"
+"      EXPECT job-state OF-TYPE enum WITH-VALUE E<gt>5 REPEAT-NO-MATCH\n"
+"      EXPECT job-originating-user-name OF-TYPE name WITH-VALUE \"$user\"\n"
 
 #. type: Plain text
-#: ipptoolfile.man:293
+#: ipptoolfile.5:82
+#, no-wrap
 msgid ""
-"Makes the B<EXPECT> conditions apply only if the specified variable is "
-"defined."
+"      # Show the job state until completed...\n"
+"      DISPLAY job-state\n"
+"      DISPLAY job-state-reasons\n"
+"    }\n"
 msgstr ""
-"Die B<EXPECT>-Bedingung wird nur angewandt, falls die angegebene Variable "
-"definiert ist."
+"      # Den Auftragsstatus zeigen, bis fertig…\n"
+"      DISPLAY job-state\n"
+"      DISPLAY job-state-reasons\n"
+"    }\n"
+
+#. type: Plain text
+#: ipptoolfile.5:85
+msgid "The following directives can be used outside of a I<test>:"
+msgstr ""
+"Die folgenden Direktiven können außerhalb eines I<Tests> verwandt werden:"
 
 #. type: TP
-#: ipptoolfile.man:293 ipptoolfile.man:399
+#: ipptoolfile.5:85
 #, no-wrap
-msgid "B<IF-NOT-DEFINED >I<variable-name>"
-msgstr "B<IF-NOT-DEFINED >I<Variablenname>"
+msgid "B<{ >I<test >B<}>"
+msgstr "B<{ >I<Test >B<}>"
 
 #. type: Plain text
-#: ipptoolfile.man:296
-msgid ""
-"Makes the B<EXPECT> conditions apply only if the specified variable is not "
-"defined."
-msgstr ""
-"Die B<EXPECT>-Bedingung wird nur angewandt, falls die angegebene Variable "
-"nicht definiert ist."
+#: ipptoolfile.5:88
+msgid "Defines a test."
+msgstr "Definiert einen Test."
 
 #. type: TP
-#: ipptoolfile.man:296
+#: ipptoolfile.5:88
 #, no-wrap
-msgid "B<IN-GROUP >I<tag>"
-msgstr "B<IN-GROUP >I<Markierung>"
+msgid "B<DEFINE >I<variable-name value>"
+msgstr "B<DEFINE >I<Variablennamen Wert>"
 
 #. type: Plain text
-#: ipptoolfile.man:299
-msgid "Requires the B<EXPECT> attribute to be in the specified group tag."
+#: ipptoolfile.5:93
+msgid ""
+"Defines the named variable to the given value. This is equivalent to "
+"specifying I<-d variable-name=value> on the B<ipptool>(8)  command-line."
 msgstr ""
-"Verlangt, dass das B<EXPECT>-Attribut in der angegebenen Gruppenmarkierung "
-"ist."
+"Definiert die benannte Variable auf den angegebenen Wert. Dies ist zur "
+"Angabe von I<-d Variablennamen=Wert> auf der B<ipptool>(8)-Befehlszeile "
+"äquivalent."
 
 #. type: TP
-#: ipptoolfile.man:299
-#, fuzzy, no-wrap
-msgid "B<OF-TYPE >I<tag[|tag,...]>"
-msgstr "B<OF-TYPE >I<Markierung[|Markierung,…]>"
+#: ipptoolfile.5:93
+#, no-wrap
+msgid "B<DEFINE-DEFAULT >I<variable-name value>"
+msgstr "B<DEFINE-DEFAULT >I<Variablennamen Wert>"
 
 #. type: Plain text
-#: ipptoolfile.man:302
+#: ipptoolfile.5:96
 msgid ""
-"Requires the B<EXPECT> attribute to use one of the specified value tag(s)."
+"Defines the named variable to the given value if it does not already have a "
+"value."
 msgstr ""
-"Verlangt, dass das B<EXPECT>-Attribut die angegebenen Wertemarkierung(en) "
-"verwendet."
+"Definiert die benannte Variable auf den angegebenen Wert, falls sie nicht "
+"bereits einen Wert hat."
 
 #. type: TP
-#: ipptoolfile.man:302 ipptoolfile.man:402
+#: ipptoolfile.5:96
 #, no-wrap
-msgid "B<REPEAT-LIMIT >I<number>"
-msgstr "B<REPEAT-LIMIT >I<Anzahl>"
+msgid "B<FILE-ID \">I<identifier>B<\">"
+msgstr "B<FILE-ID \">I<Bezeichner>B<\">"
 
 #. type: Plain text
-#: ipptoolfile.man:306
-msgid ""
-"Specifies the maximum number of times to repeat if the B<REPEAT-MATCH> or "
-"B<REPEAT-NO-MATCH> predicate is specified. The default value is 1000."
-msgstr ""
-"Legt die maximale Anzahl an Wiederholungen, falls die Eigenschaft B<REPEAT-"
-"MATCH> oder B<REPEAT-NO-MATCH> festgelegt ist, fest. Die Vorgabe ist 1000."
+#: ipptoolfile.5:99
+msgid "Specifies an identifier string for the current file."
+msgstr "Legt einen Bezeichner als Zeichenkette für die aktuelle Datei fest."
 
 #. type: TP
-#: ipptoolfile.man:306 ipptoolfile.man:406
+#: ipptoolfile.5:99 ipptoolfile.5:209
 #, no-wrap
-msgid "B<REPEAT-MATCH>"
-msgstr "B<REPEAT-MATCH>"
+msgid "B<IGNORE-ERRORS yes>"
+msgstr "B<IGNORE-ERRORS yes>"
 
 #. type: TP
-#: ipptoolfile.man:308 ipptoolfile.man:408
+#: ipptoolfile.5:101 ipptoolfile.5:211
 #, no-wrap
-msgid "B<REPEAT-NO-MATCH>"
-msgstr "B<REPEAT-NO-MATCH>"
+msgid "B<IGNORE-ERRORS no>"
+msgstr "B<IGNORE-ERRORS no>"
 
 #. type: Plain text
-#: ipptoolfile.man:311
+#: ipptoolfile.5:106
 msgid ""
-"Specifies that the current test should be repeated when the B<EXPECT> "
-"condition matches or does not match."
+"Specifies whether, by default, B<ipptool>(8)  will ignore errors and "
+"continue with subsequent tests."
 msgstr ""
-"Legt fest, dass der aktuelle Test wiederholt werden soll, wenn die B<EXPECT>-"
-"Bedingung (nicht) passt."
+"Legt fest, ob B<ipptool>(8) standardmäßig Fehler ignorieren und mit "
+"folgenden Tests fortfahren wird."
 
 #. type: TP
-#: ipptoolfile.man:311
+#: ipptoolfile.5:106
 #, no-wrap
-msgid "B<SAME-COUNT-AS >I<attribute-name>"
-msgstr "B<SAME-COUNT-AS >I<Attributname>"
+msgid "B<INCLUDE \">I<filename>B<\">"
+msgstr "B<INCLUDE \">I<Dateiname>B<\">"
+
+#. type: TP
+#: ipptoolfile.5:108
+#, no-wrap
+msgid "B<INCLUDE E<lt>>I<filename>B<E<gt>>"
+msgstr "B<INCLUDE E<lt>>I<Dateiname>B<E<gt>>"
 
 #. type: Plain text
-#: ipptoolfile.man:314
+#: ipptoolfile.5:113
 msgid ""
-"Requires the B<EXPECT> attribute to have the same number of values as the "
-"specified parallel attribute."
+"Includes another test file. The first form includes a file relative to the "
+"current test file, while the second form includes a file from the "
+"B<ipptool>(8)  include directory."
 msgstr ""
-"Verlangt, dass das B<EXPECT>-Attribut die gleiche Anzahl von Werten wie das "
-"festgelegte parallele Attribut hat."
+"Bindet eine andere Testdatei ein. Die erste Form bindet eine Datei relativ "
+"zu der aktuellen Testdatei ein, während die zweite Form eine Datei aus dem "
+"B<ipptool>(8)-Einbindeverzeichnis einbindet."
 
 #. type: TP
-#: ipptoolfile.man:314
+#: ipptoolfile.5:113
 #, no-wrap
-msgid "B<WITH-ALL-HOSTNAMES \">I<literal string>B<\">"
-msgstr "B<WITH-ALL-HOSTNAMES \">I<Zeichenkette>B<\">"
+msgid "B<INCLUDE-IF-DEFINED >I<name >B<\">I<filename>B<\">"
+msgstr "B<INCLUDE-IF-DEFINED >I<Name >B<\">I<Dateiname>B<\">"
 
 #. type: TP
-#: ipptoolfile.man:316
+#: ipptoolfile.5:115
 #, no-wrap
-msgid "B<WITH-ALL-HOSTNAMES \"/>I<regular expression>B</\">"
-msgstr "B<WITH-ALL-HOSTNAMES \"/>I<regulärer Ausdruck>B</\">"
+msgid "B<INCLUDE-IF-DEFINED >I<name >B<E<lt>>I<filename>B<E<gt>>"
+msgstr "B<INCLUDE-IF-DEFINED >I<Name >B<E<lt>>I<Dateiname>B<E<gt>>"
 
 #. type: Plain text
-#: ipptoolfile.man:319
-msgid "Requires that all URI values contain a matching hostname."
-msgstr "Verlangt, dass alle URI-Werte einen passenden Rechnernamen enthalten."
+#: ipptoolfile.5:120
+msgid ""
+"Includes another test file if the named variable is defined. The first form "
+"includes a file relative to the current test file, while the second form "
+"includes a file from the B<ipptool>(8)  include directory."
+msgstr ""
+"Bindet eine andere Testdatei ein, falls die benannte Variable definiert ist. "
+"Die erste Form bindet eine Datei relativ zu der aktuellen Testdatei ein, "
+"während die zweite Form eine Datei aus dem B<ipptool>(8)-Einbindeverzeichnis "
+"einbindet."
 
 #. type: TP
-#: ipptoolfile.man:319
+#: ipptoolfile.5:120
 #, no-wrap
-msgid "B<WITH-ALL-RESOURCES \">I<literal string>B<\">"
-msgstr "B<WITH-ALL-RESOURCES \">I<Zeichenkette>B<\">"
+msgid "B<INCLUDE-IF-NOT-DEFINED >I<name >B<\">I<filename>B<\">"
+msgstr "B<INCLUDE-IF-NOT-DEFINED >I<Name >B<\">I<Dateiname>B<\">"
 
 #. type: TP
-#: ipptoolfile.man:321
+#: ipptoolfile.5:122
 #, no-wrap
-msgid "B<WITH-ALL-RESOURCES \"/>I<regular expression>B</\">"
-msgstr "B<WITH-ALL-RESOURCES \"/>I<regulärer Ausdruck>B</\">"
+msgid "B<INCLUDE-IF-NOT-DEFINED >I<name >B<E<lt>>I<filename>B<E<gt>>"
+msgstr "B<INCLUDE-IF-NOT-DEFINED >I<Name >B<E<lt>>I<Dateiname>B<E<gt>>"
 
 #. type: Plain text
-#: ipptoolfile.man:324
+#: ipptoolfile.5:127
 msgid ""
-"Requires that all URI values contain a matching resource (including "
-"leading /)."
+"Includes another test file if the named variable is not defined. The first "
+"form includes a file relative to the current test file, while the second "
+"form includes a file from the B<ipptool>(8)  include directory."
 msgstr ""
-"Verlangt, dass alle URI-Werte eine passende Ressource (einschließlich des "
-"führenden /) enthalten."
+"Bindet eine andere Testdatei ein, falls die benannte Variable nicht "
+"definiert ist. Die erste Form bindet eine Datei relativ zu der aktuellen "
+"Testdatei ein, während die zweite Form eine Datei aus dem B<ipptool>(8)-"
+"Einbindeverzeichnis einbindet."
 
 #. type: TP
-#: ipptoolfile.man:324
+#: ipptoolfile.5:127 ipptoolfile.5:235
 #, no-wrap
-msgid "B<WITH-ALL-SCHEMES \">I<literal string>B<\">"
-msgstr "B<WITH-ALL-SCHEMES \">I<Zeichenkette>B<\">"
+msgid "B<SKIP-IF-DEFINED >I<variable-name>"
+msgstr "B<SKIP-IF-DEFINED >I<Variablenname>"
 
 #. type: TP
-#: ipptoolfile.man:326
+#: ipptoolfile.5:129 ipptoolfile.5:237
 #, no-wrap
-msgid "B<WITH-ALL-SCHEMES \"/>I<regular expression>B</\">"
-msgstr "B<WITH-ALL-SCHEMES \"/>I<regulärer Ausdruck>B</\">"
-
-#. type: Plain text
-#: ipptoolfile.man:329
-msgid "Requires that all URI values contain a matching scheme."
-msgstr "Verlangt, dass alle URI-Werte ein passendes Schema enthalten."
-
-#. type: TP
-#: ipptoolfile.man:329
-#, no-wrap
-msgid "B<WITH-ALL-VALUES \">I<literal string>B<\">"
-msgstr "B<WITH-ALL-VALUES \">I<Zeichenkette>B<\">"
+msgid "B<SKIP-IF-NOT-DEFINED >I<variable-name>"
+msgstr "B<SKIP-IF-NOT-DEFINED >I<Variablenname>"
 
 #. type: Plain text
-#: ipptoolfile.man:332
+#: ipptoolfile.5:132
 msgid ""
-"Requires that all values of the B<EXPECT> attribute match the literal "
-"string. Comparisons are case-sensitive."
+"Specifies that the remainder of the test file should be skipped when the "
+"variable is or is not defined."
 msgstr ""
-"Verlangt, dass alle Werte des B<EXPECT>-Attributs auf die Zeichenkette "
-"passen. Vergleiche berücksichtigen die Groß- und Kleinschreibung."
+"Legt fest, dass der Rest der Testdatei übersprungen werden soll, wenn die "
+"Variable (nicht) definiert ist."
 
 #. type: TP
-#: ipptoolfile.man:332
+#: ipptoolfile.5:132
 #, no-wrap
-msgid "B<WITH-ALL-VALUES E<lt>>I<number>"
-msgstr "B<WITH-ALL-VALUES E<lt>>I<Zahl>"
+msgid "B<STOP-AFTER-INCLUDE-ERROR no>"
+msgstr "B<STOP-AFTER-INCLUDE-ERROR no>"
 
 #. type: TP
-#: ipptoolfile.man:334
+#: ipptoolfile.5:134
 #, no-wrap
-msgid "B<WITH-ALL-VALUES =>I<number>"
-msgstr "B<WITH-ALL-VALUES =>I<Zahl>"
+msgid "B<STOP-AFTER-INCLUDE-ERROR yes>"
+msgstr "B<STOP-AFTER-INCLUDE-ERROR yes>"
 
-#. type: TP
-#: ipptoolfile.man:336
-#, no-wrap
-msgid "B<WITH-ALL-VALUES E<gt>>I<number>"
-msgstr "B<WITH-ALL-VALUES E<gt>>I<Zahl>"
+#. type: Plain text
+#: ipptoolfile.5:137
+msgid ""
+"Specifies whether tests will be stopped after an error in an included file."
+msgstr ""
+"Legt fest, ob Tests nach einem Fehler in einer eingebundenen Datei "
+"angehalten werden oder nicht."
 
 #. type: TP
-#: ipptoolfile.man:338
+#: ipptoolfile.5:137 ipptoolfile.5:253
 #, no-wrap
-msgid "B<WITH-ALL-VALUES >I<number>[I<,...,number>]"
-msgstr "B<WITH-ALL-VALUES >I<Zahl>[I<,…,Zahl>]"
+msgid "B<TRANSFER auto>"
+msgstr "B<TRANSFER auto>"
 
 #. type: Plain text
-#: ipptoolfile.man:341
+#: ipptoolfile.5:140
 msgid ""
-"Requires that all values of the B<EXPECT> attribute match the number(s) or "
-"numeric comparison. When comparing rangeOfInteger values, the \"E<lt>\" and "
-"\"E<gt>\" operators only check the upper bound of the range."
+"Specifies that tests will, by default, use \"Transfer-Encoding: chunked\" "
+"for requests with attached files and \"Content-Length:\" for requests "
+"without attached files."
 msgstr ""
-"Verlangt, dass alle Werte des B<EXPECT>-Attributs auf die Zahl(en) passen "
-"oder den numerischen Vergleich erfüllen. Beim Vergleich von rangeOfInteger-"
-"Werten prüfen die Operatoren »E<lt>« und »E<gt>« nur die obere Grenze der "
-"Bereiche."
-
-#. type: TP
-#: ipptoolfile.man:341
-#, no-wrap
-msgid "B<WITH-ALL-VALUES \"false\">"
-msgstr "B<WITH-ALL-VALUES \"false\">"
+"Legt fest, dass der Test standardmäßig »Transfer-Encoding: chunked« für "
+"Anfragen mit angehängten Dateien und »Content-Length:« für Anfragen ohne "
+"angehängte Dateien verwenden wird."
 
 #. type: TP
-#: ipptoolfile.man:343
+#: ipptoolfile.5:140 ipptoolfile.5:256
 #, no-wrap
-msgid "B<WITH-ALL-VALUES \"true\">"
-msgstr "B<WITH-ALL-VALUES \"true\">"
+msgid "B<TRANSFER chunked>"
+msgstr "B<TRANSFER chunked>"
 
 #. type: Plain text
-#: ipptoolfile.man:346
+#: ipptoolfile.5:145
 msgid ""
-"Requires that all values of the B<EXPECT> attribute match the boolean value "
-"given."
+"Specifies that tests will, by default, use the HTTP/1.1 \"Transfer-Encoding: "
+"chunked\" header. This is the default and is equivalent to specifying I<-c> "
+"on the B<ipptool>(8)  command-line. Support for chunked requests is required "
+"for conformance with all versions of IPP."
 msgstr ""
-"Verlangt, dass alle Werte des B<EXPECT>-Attributs auf den übergebenen "
-"logischen Wert passen."
+"Legt fest, dass die Tests standardmäßig die HTTP/1.1-Kopfzeile »Transfer-"
+"Encoding: chunked« verwenden. Dies ist die Vorgabe und äquivalent zur Angabe "
+"von I<-c> auf der Befehlszeile von B<ipptool>(8). Die Unterstützung für "
+"blockweise Abfragen wird für die Konformität mit allen Versionen von IPP "
+"benötigt."
 
 #. type: TP
-#: ipptoolfile.man:346
+#: ipptoolfile.5:145 ipptoolfile.5:259
 #, no-wrap
-msgid "B<WITH-ALL-VALUES \"/>I<regular expression>B</\">"
-msgstr "B<WITH-ALL-VALUES \"/>I<regulärer Ausdruck>B</\">"
+msgid "B<TRANSFER length>"
+msgstr "B<TRANSFER length>"
 
 #. type: Plain text
-#: ipptoolfile.man:349
+#: ipptoolfile.5:150
 msgid ""
-"Requires that all values of the B<EXPECT> attribute match the regular "
-"expression, which must conform to the POSIX regular expression syntax. "
-"Comparisons are case-sensitive."
+"Specifies that tests will, by default, use the HTTP/1.0 \"Content-Length:\" "
+"header. This is equivalent to specifying I<-l> on the B<ipptool>(8)  command-"
+"line. Support for content length requests is required for conformance with "
+"all versions of IPP."
 msgstr ""
-"Verlangt, dass alle Werte des B<EXPECT>-Attributes auf den regulären "
-"Ausdruck passen. Dieser muss die Syntax regulärer POSIX-Ausdrücke erfüllen. "
-"Vergleiche berücksichtigen Groß- und Kleinschreibung."
+"Legt fest, dass die Tests standardmäßig die HTTP/1.0-Kopfzeile »Content-"
+"Length« verwenden. Dies ist die Vorgabe und äquivalent zur Angabe von I<-l> "
+"auf der Befehlszeile von B<ipptool>(8). Die Unterstützung für Inhaltslängen-"
+"Abfragen wird für die Konformität mit allen Versionen von IPP benötigt."
 
 #. type: TP
-#: ipptoolfile.man:349
+#: ipptoolfile.5:150 ipptoolfile.5:262
 #, no-wrap
-msgid "B<WITH-HOSTNAME \">I<literal string>B<\">"
-msgstr "B<WITH-HOSTNAME \">I<Zeichenkette>B<\">"
+msgid "B<VERSION 1.0>"
+msgstr "B<VERSION 1.0>"
 
 #. type: TP
-#: ipptoolfile.man:351
+#: ipptoolfile.5:152 ipptoolfile.5:264
 #, no-wrap
-msgid "B<WITH-HOSTNAME \"/>I<regular expression>B</\">"
-msgstr "B<WITH-HOSTNAME \"/>I<regulärer Ausdruck>B</\">"
+msgid "B<VERSION 1.1>"
+msgstr "B<VERSION 1.1>"
 
-#. type: Plain text
-#: ipptoolfile.man:354
-msgid "Requires that at least one URI value contains a matching hostname."
-msgstr ""
-"Verlangt, dass mindestens ein URI-Wert einen passenden Rechnernamen enthält."
+#. type: TP
+#: ipptoolfile.5:154 ipptoolfile.5:266
+#, no-wrap
+msgid "B<VERSION 2.0>"
+msgstr "B<VERSION 2.0>"
 
 #. type: TP
-#: ipptoolfile.man:354
+#: ipptoolfile.5:156 ipptoolfile.5:268
 #, no-wrap
-msgid "B<WITH-RESOURCE \">I<literal string>B<\">"
-msgstr "B<WITH-RESOURCE \">I<Zeichenkette>B<\">"
+msgid "B<VERSION 2.1>"
+msgstr "B<VERSION 2.1>"
 
 #. type: TP
-#: ipptoolfile.man:356
+#: ipptoolfile.5:158 ipptoolfile.5:270
 #, no-wrap
-msgid "B<WITH-RESOURCE \"/>I<regular expression>B</\">"
-msgstr "B<WITH-RESOURCE \"/>I<regulärer Ausdruck>B</\">"
+msgid "B<VERSION 2.2>"
+msgstr "B<VERSION 2.2>"
 
 #. type: Plain text
-#: ipptoolfile.man:359
+#: ipptoolfile.5:161
 msgid ""
-"Requires that at least one URI value contains a matching resource (including "
-"leading /)."
+"Specifies the default IPP version number to use for the tests that follow."
 msgstr ""
-"Verlangt, dass mindestens ein URI-Wert eine passende Ressource "
-"(einschließlich des führenden /) enthält."
+"Legt die Standard-IPP-Versionsnummer, die für die nachfolgenden Tests "
+"verwandt werden soll, fest."
 
-#. type: TP
-#: ipptoolfile.man:359
+#. type: SS
+#: ipptoolfile.5:161
 #, no-wrap
-msgid "B<WITH-SCHEME \">I<literal string>B<\">"
-msgstr "B<WITH-SCHEME \">I<Zeichenkette>B<\">"
+msgid "TEST DIRECTIVES"
+msgstr "TESTDIREKTIVEN"
+
+#. type: Plain text
+#: ipptoolfile.5:163
+msgid "The following directives are understood within a I<test>:"
+msgstr ""
+"Die nachfolgenden Direktiven werden innerhalb eines I<Test> verstanden:"
 
 #. type: TP
-#: ipptoolfile.man:361
+#: ipptoolfile.5:163
 #, no-wrap
-msgid "B<WITH-SCHEME \"/>I<regular expression>B</\">"
-msgstr "B<WITH-SCHEME \"/>I<regulärer Ausdruck>B</\">"
-
-#. type: Plain text
-#: ipptoolfile.man:364
-msgid "Requires that at least one URI value contains a matching scheme."
-msgstr "Verlangt, dass mindestens ein URI-Wert ein passendes Schema enthält."
+msgid "B<ATTR >I<out-of-band-tag attribute-name>"
+msgstr "B<ATTR >I<Außerbandmarkierung Attributname>"
 
 #. type: TP
-#: ipptoolfile.man:364
+#: ipptoolfile.5:165
 #, no-wrap
-msgid "B<WITH-VALUE \">I<literal string>B<\">"
-msgstr "B<WITH-VALUE \">I<Zeichenkette>B<\">"
+msgid "B<ATTR >I<tag attribute-name value(s)>"
+msgstr "B<ATTR >I<Markierung Attributname Wert(e)>"
 
+# FIXME: Broken string
 #. type: Plain text
-#: ipptoolfile.man:367
+#: ipptoolfile.5:171
+#, fuzzy
+#| msgid ""
+#| "Adds an attribute to the test request.  Out-of-band tags (admin-define, "
+#| "delete-attribute, no-value, not-settable, unknown, unsupported) have no "
+#| "value.  Values for other tags are separated by the comma (\",\") "
+#| "character - escape commas using the \" Common attributes and values are "
+#| "listed in the IANA IPP registry - see references below."
 msgid ""
-"Requires that at least one value of the B<EXPECT> attribute matches the "
-"literal string. Comparisons are case-sensitive."
+"Adds an attribute to the test request.  Out-of-band tags (admin-define, "
+"delete-attribute, no-value, not-settable, unknown, unsupported) have no "
+"value.  Values for other tags are delimited by the comma (\",\") character - "
+"escape commas using the \"\\e\" character.  Common attributes and values are "
+"listed in the IANA IPP registry - see references below."
 msgstr ""
-"Verlangt, dass mindestens ein Wert des B<EXPECT>-Attributs auf die "
-"Zeichenkette passt. Vergleiche berücksichtigen Groß- und Kleinschreibung."
+"Fügt ein Attribut zu der Testanfrage hinzu. Außerbandmarkierungen (admin-"
+"define, delete-attribute, no-value, not-settable, unknown, unsupported) "
+"haben keinen Wert. Werte für die anderen Markierungen werden durch Kommata "
+"(»,«) getrennt -- schützen Sie Kommata mittels des Anführungszeichens "
+"(»\"«). Gemeinsame Attribute und Werte sind in der »IANA IPP registry« "
+"aufgeführt, siehe Referenz unten."
 
 #. type: TP
-#: ipptoolfile.man:367
+#: ipptoolfile.5:171
 #, no-wrap
-msgid "B<WITH-VALUE E<lt>>I<number>"
-msgstr "B<WITH-VALUE E<lt>>I<Zahl>"
+msgid "B<ATTR collection >I<attribute-name >B<{ MEMBER >I<tag member-name value(s) ... >B<}> [ I<... >B<,{ >I<... >B<} >]"
+msgstr "B<ATTR collection >I<Attributname >B<{ MEMBER >I<Markierung Mitgliedsname Wert(e) … >B<}> [ I<… >B<,{ >I<… >B<} >]"
+
+#. type: Plain text
+#: ipptoolfile.5:176
+msgid ""
+"Adds a collection attribute to the test request.  Member attributes follow "
+"the same syntax as regular attributes and can themselves be nested "
+"collections.  Multiple collection values can be supplied as needed, "
+"separated by commas."
+msgstr ""
+"Fügt der Testanfrage ein Sammlungsattribut hinzu. Mitgliedsattribute folgen "
+"der gleichen Syntax wie reguläre Attribute und können selbst wieder "
+"verschachtelte Sammlungen sein. Mehrere Sammlungswerte können, durch Kommata "
+"getrennt, wie benötigt angegeben werden."
 
 #. type: TP
-#: ipptoolfile.man:369
+#: ipptoolfile.5:176
 #, no-wrap
-msgid "B<WITH-VALUE =>I<number>"
-msgstr "B<WITH-VALUE =>I<Zahl>"
+msgid "B<COMPRESSION deflate>"
+msgstr "B<COMPRESSION deflate>"
 
 #. type: TP
-#: ipptoolfile.man:371
+#: ipptoolfile.5:178
 #, no-wrap
-msgid "B<WITH-VALUE E<gt>>I<number>"
-msgstr "B<WITH-VALUE E<gt>>I<Zahl>"
+msgid "B<COMPRESSION gzip>"
+msgstr "B<COMPRESSION gzip>"
 
 #. type: TP
-#: ipptoolfile.man:373
+#: ipptoolfile.5:180
 #, no-wrap
-msgid "B<WITH-VALUE >I<number>[I<,...,number>]"
-msgstr "B<WITH-VALUE >I<Zahl>[I<,…,Zahl>]"
+msgid "B<COMPRESSION none>"
+msgstr "B<COMPRESSION none>"
 
 #. type: Plain text
-#: ipptoolfile.man:376
+#: ipptoolfile.5:183
 msgid ""
-"Requires that at least one value of the B<EXPECT> attribute matches the "
-"number(s) or numeric comparison. When comparing rangeOfInteger values, the "
-"\"E<lt>\" and \"E<gt>\" operators only check the upper bound of the range."
+"Uses the specified compression on the document data following the attributes "
+"in a Print-Job or Send-Document request."
 msgstr ""
-"Verlangt, dass mindestens ein Wert des B<EXPECT>-Attributs auf die Zahl(en) "
-"passt oder den numerischen Vergleich erfüllt. Beim Vergleich von "
-"rangeOfInteger-Werten prüfen die Operatoren »E<lt>« und »E<gt>« nur die "
-"obere Grenze der Bereiche."
-
-#. type: TP
-#: ipptoolfile.man:376
-#, no-wrap
-msgid "B<WITH-VALUE \"false\">"
-msgstr "B<WITH-VALUE \"false\">"
+"Verwendet die angegebene Komprimierung auf die Dokumentendaten, die den "
+"Attributen in einer Print-Job- oder Send-Document-Anfrage folgen."
 
 #. type: TP
-#: ipptoolfile.man:378
+#: ipptoolfile.5:183
 #, no-wrap
-msgid "B<WITH-VALUE \"true\">"
-msgstr "B<WITH-VALUE \"true\">"
+msgid "B<DELAY >I<seconds>[I<,repeat-seconds>]"
+msgstr "B<DELAY >I<Sekunden>[I<,Wiederholungssekunden>]"
 
 #. type: Plain text
-#: ipptoolfile.man:381
+#: ipptoolfile.5:187
 msgid ""
-"Requires that at least one value of the B<EXPECT> attribute matches the "
-"boolean value given."
+"Specifies a delay in seconds before this test will be run.  If two values "
+"are specified, the second value is used as the delay between repeated tests."
 msgstr ""
-"Verlangt, dass mindestens ein Wert des B<EXPECT>-Attributs auf den "
-"übergebenen logischen Wert passt."
+"Legt eine Verzögerung in Sekunden fest, bevor dieser Test ausgeführt wird. "
+"Falls zwei Werte festgelegt werden, wird der zweite als Verzögerung zwischen "
+"wiederholten Tests verwandt."
 
 #. type: TP
-#: ipptoolfile.man:381
+#: ipptoolfile.5:187
 #, no-wrap
-msgid "B<WITH-VALUE \"/>I<regular expression>B</\">"
-msgstr "B<WITH-VALUE \"/>I<regulärer Ausdruck>B</\">"
+msgid "B<DISPLAY >I<attribute-name>"
+msgstr "B<DISPLAY >I<Attributname>"
 
 #. type: Plain text
-#: ipptoolfile.man:384
+#: ipptoolfile.5:191
 msgid ""
-"Requires that at least one value of the B<EXPECT> attribute matches the "
-"regular expression, which must conform to the POSIX regular expression "
-"syntax. Comparisons are case-sensitive."
+"Specifies that value of the named attribute should be output as part of the "
+"test report."
 msgstr ""
-"Verlangt, dass mindestens ein Wert des B<EXPECT>-Attributes auf den "
-"regulären Ausdruck passt. Dieser muss die Syntax regulärer POSIX-Ausdrücke "
-"erfüllen. Vergleiche berücksichtigen Groß- und Kleinschreibung."
+"Legt fest, dass der Wert des benannten Attributes als Teil des Testberichts "
+"ausgegeben werden soll."
 
 #. type: TP
-#: ipptoolfile.man:384
+#: ipptoolfile.5:191
 #, no-wrap
-msgid "B<WITH-VALUE-FROM >I<attribute-name>"
-msgstr "B<WITH-VALUE-FROM >I<Attributname>"
-
-#. type: Plain text
-#: ipptoolfile.man:388
-msgid ""
-"Requires that the value(s) of the B<EXPECT> attribute matches the value(s) "
-"in the specified attribute.  For example, \"EXPECT job-sheets WITH-VALUE-"
-"FROM job-sheets-supported\" requires that the \"job-sheets\" value is listed "
-"as a value of the \"job-sheets-supported\" attribute."
-msgstr ""
-"Verlangt, dass der Wert/die Werte des Attributes B<EXPECT> auf den Wert/die "
-"Werte in dem angegebenen Attribut passt/passen. Beispielsweise verlangt "
-"»EXPECT job-sheets WITH-VALUE-FROM job-sheets-supported«, dass der Wert »job-"
-"sheets« als Wert im Attribut »job-sheets-supported« aufgeführt ist."
+msgid "B<EXPECT >I<attribute-name >[ I<predicate(s) >]"
+msgstr "B<EXPECT >I<Attributname >[ I<Eigenschaft(en) >]"
 
-#. type: SS
-#: ipptoolfile.man:388
+#. type: TP
+#: ipptoolfile.5:193
 #, no-wrap
-msgid "STATUS PREDICATES"
-msgstr "STATUS-EIGENSCHAFTEN"
+msgid "B<EXPECT ?>I<attribute-name predicate(s)>"
+msgstr "B<EXPECT ?>I<Attributname Eigenschaft(en)>"
+
+#. type: TP
+#: ipptoolfile.5:195
+#, no-wrap
+msgid "B<EXPECT !>I<attribute-name>"
+msgstr "B<EXPECT !>I<Attributname>"
 
 #. type: Plain text
-#: ipptoolfile.man:390
+#: ipptoolfile.5:198
 msgid ""
-"The following predicates are understood following the B<STATUS> test "
-"directive:"
+"Specifies that the response must/may/must not include the named attribute. "
+"Additional requirements can be added as predicates - see the \"EXPECT "
+"PREDICATES\" section for more information on predicates. Attribute names can "
+"specify member attributes by separating the attribute and member names with "
+"the forward slash, for example \"media-col/media-size/x-dimension\"."
 msgstr ""
-"Die folgenden Eigenschaften werden nach der B<STATUS>-Testdirektive "
-"verstanden:"
+"Legt fest, dass die Antwort das benannte Attribut enthalten muss/kann/nicht "
+"darf. Zusätzliche Anforderungen können als Eigenschaften hinzugefügt werden "
+"- siehe den Abschnitt »EXPECT-EIGENSCHAFTEN« für weitere Informationen über "
+"Eigenschaften. Attributnamen können weitere Mitgliederattribute festlegen, "
+"indem die Attribut- und Mitgliedernamen durch einen normalen Schrägstrich "
+"getrennt werden. Beispiel: »media-col/media-size/x-dimension«."
+
+#. type: TP
+#: ipptoolfile.5:198
+#, no-wrap
+msgid "B<EXPECT-ALL >I<attribute-name >[ I<predicate(s) >]"
+msgstr "B<EXPECT-ALL >I<Attributname >[ I<Eigenschaft(en) >]"
+
+#. type: TP
+#: ipptoolfile.5:200
+#, no-wrap
+msgid "B<EXPECT-ALL ?>I<attribute-name predicate(s)>"
+msgstr "B<EXPECT-ALL ?>I<Attributname Eigenschaft(en)>"
 
 #. type: Plain text
-#: ipptoolfile.man:393
+#: ipptoolfile.5:203
 msgid ""
-"Defines the variable to \"1\" when the B<STATUS> matches. A side-effect of "
-"this predicate is that this B<STATUS> will never fail a test."
+"Specifies that the response must/may include the named attribute and that "
+"all occurrences of that attribute must match the given predicates."
 msgstr ""
-"Setzt die Variable auf »1« wenn der B<STATUS> passt. Ein Seiteneffekt dieser "
-"Eigenschaft ist, dass dieser B<STATUS> niemals bei einem Test fehlschlägt."
+"Legt fest, dass die Antwort das benannte Attribut enthalten muss/kann und "
+"dass alle Vorkommen dieses Attributs auf die angegebenen Eigenschaften "
+"passen müssen."
+
+#. type: TP
+#: ipptoolfile.5:203
+#, no-wrap
+msgid "B<FILE filename>"
+msgstr "B<FILE Dateiname>"
 
 #. type: Plain text
-#: ipptoolfile.man:396
+#: ipptoolfile.5:206
 msgid ""
-"Defines the variable to \"1\" when the B<STATUS> does not match. A side-"
-"effect of this predicate is that this B<STATUS> will never fail a test."
+"Specifies a file to include at the end of the request. This is typically "
+"used when sending a test print file."
 msgstr ""
-"Setzt die Variable auf »1« wenn der B<STATUS> nicht passt. Ein Seiteneffekt "
-"dieser Eigenschaft ist, dass dieser B<STATUS> niemals bei einem Test "
-"fehlschlägt."
+"Legt eine Datei, die am Ende der Anfrage eingefügt werden soll, fest. Dies "
+"wird typischerweise verwandt, wenn eine Testausdrucksdatei gesandt wird."
+
+#. type: TP
+#: ipptoolfile.5:206
+#, no-wrap
+msgid "B<GROUP tag>"
+msgstr "B<GROUP Markierung>"
 
 #. type: Plain text
-#: ipptoolfile.man:399
-msgid "Makes the B<STATUS> apply only if the specified variable is defined."
+#: ipptoolfile.5:209
+msgid "Specifies the group tag for subsequent attributes in the request."
 msgstr ""
-"Führt dazu, dass der B<STATUS> nur angewandt wird, falls die angegebene "
-"Variable definiert ist."
+"Legt die Gruppenmarkierung für nachfolgende Attribute in der Anfrage fest."
 
 #. type: Plain text
-#: ipptoolfile.man:402
+#: ipptoolfile.5:216
 msgid ""
-"Makes the B<STATUS> apply only if the specified variable is not defined."
+"Specifies whether B<ipptool>(8)  will ignore errors and continue with "
+"subsequent tests."
 msgstr ""
-"Führt dazu, dass der B<STATUS> nur angewandt wird, falls die angegebene "
-"Variable nicht definiert ist."
+"Legt fest, ob B<ipptool>(8) Fehler in nachfolgenden Tests ignorieren und "
+"fortfahren soll."
+
+#. type: TP
+#: ipptoolfile.5:216
+#, no-wrap
+msgid "B<NAME \">I<literal string>B<\">"
+msgstr "B<NAME \">I< Zeichenkette>B<\">"
+
+#. type: Plain text
+#: ipptoolfile.5:219
+msgid "Specifies the human-readable name of the test."
+msgstr "Legt den menschenlesbaren Namen des Tests fest."
+
+#. type: TP
+#: ipptoolfile.5:219
+#, no-wrap
+msgid "B<OPERATION >I<operation-code>"
+msgstr "B<OPERATION >I<Vorgangscode>"
+
+#. type: Plain text
+#: ipptoolfile.5:222
+msgid "Specifies the operation to be performed."
+msgstr "Legt den auszuführenden Vorgang fest."
+
+#. type: TP
+#: ipptoolfile.5:222
+#, no-wrap
+msgid "B<PAUSE \">I<message>B<\">"
+msgstr "B<PAUSE \">I<Nachricht>B<\">"
 
 #. type: Plain text
-#: ipptoolfile.man:406
+#: ipptoolfile.5:225
 msgid ""
-"Specifies the maximum number of times to repeat. The default value is 1000."
-msgstr "Legt die maximale Anzahl an Wiederholungen fest. Die Vorgabe ist 1000."
+"Displays the provided message and waits for the user to press a key to "
+"continue."
+msgstr ""
+"Zeigt die bereitgestellte Nachricht an und warten darauf, dass der Benutzer "
+"eine Taste zum Fortfahren drückt."
+
+#. type: TP
+#: ipptoolfile.5:225
+#, no-wrap
+msgid "B<REQUEST-ID >I<number>"
+msgstr "B<REQUEST-ID >I<Nummer>"
+
+#. type: TP
+#: ipptoolfile.5:227
+#, no-wrap
+msgid "B<REQUEST-ID random>"
+msgstr "B<REQUEST-ID random>"
 
 #. type: Plain text
-#: ipptoolfile.man:411
+#: ipptoolfile.5:230
 msgid ""
-"Specifies that the current test should be repeated when the response status-"
-"code matches or does not match the value specified by the STATUS directive."
+"Specifies the request-id value to use in the request, either an integer or "
+"the word \"random\" to use a randomly generated value (the default)."
 msgstr ""
-"Legt fest, dass der aktuelle Test wiederholt werden soll, wenn der "
-"Rückgabestatuscode (nicht) auf den durch die STATUS-Direktive angegebenen "
-"Wert passt."
+"Legt die in der Anfrage zu verwendende Anfrage-ID, entweder eine Ganzzahl "
+"oder das Wort »random«, um einen zufällig erzeugten Wert zu verwenden "
+"(Vorgabe), fest."
 
-#. type: SS
-#: ipptoolfile.man:411
+#. type: TP
+#: ipptoolfile.5:230
 #, no-wrap
-msgid "OPERATION CODES"
-msgstr "VORGANGSCODES"
+msgid "B<RESOURCE >I<path>"
+msgstr "B<RESOURCE >I<Pfad>"
 
 #. type: Plain text
-#: ipptoolfile.man:414
+#: ipptoolfile.5:235
 msgid ""
-"Operation codes correspond to the hexadecimal numbers (0xHHHH) and names "
-"from RFC 8011 and other IPP extension specifications. Here is a complete "
-"list of names supported by B<ipptool>(8):"
+"Specifies an alternate resource path that is used for the HTTP POST request. "
+"The default is the resource from the URI provided to the B<ipptool>(8)  "
+"program."
 msgstr ""
-"Vorgangscodes entsprechen hexadezimalen Zahlen (0xHHHH) und Namen aus RFC "
-"8011 und anderen IPP-Erweiterungsspezifikationen. Hier ist die komplette "
-"Liste der von B<ipptool>(8) unterstützten Namen:"
+"Legt einen alternativen Ressourcen-Pfad, der für HTTP-POST-Anfragen verwandt "
+"wird, fest. Die Vorgabe ist die Ressource, die aus der an das Programm "
+"B<ipptool>(8) übergebenen URI entstammt."
 
 #. type: Plain text
-#: ipptoolfile.man:483
+#: ipptoolfile.5:240
+msgid ""
+"Specifies that the current test should be skipped when the variable is or is "
+"not defined."
+msgstr ""
+"Legt fest, dass der aktuelle Test übersprungen werden soll, wenn die "
+"Variable (nicht) definiert ist."
+
+#. type: TP
+#: ipptoolfile.5:240
+#, no-wrap
+msgid "B<SKIP-PREVIOUS-ERROR yes>"
+msgstr "B<SKIP-PREVIOUS-ERROR yes>"
+
+#. type: TP
+#: ipptoolfile.5:242
 #, no-wrap
+msgid "B<SKIP-PREVIOUS-ERROR no>"
+msgstr "B<SKIP-PREVIOUS-ERROR no>"
+
+#. type: Plain text
+#: ipptoolfile.5:247
 msgid ""
-"    Activate-Printer\n"
-"    CUPS-Accept-Jobs\n"
-"    CUPS-Add-Modify-Class\n"
-"    CUPS-Add-Modify-Printer\n"
-"    CUPS-Authenticate-Job\n"
-"    CUPS-Delete-Class\n"
-"    CUPS-Delete-Printer\n"
-"    CUPS-Get-Classes\n"
-"    CUPS-Get-Default\n"
-"    CUPS-Get-Devices\n"
-"    CUPS-Get-Document\n"
-"    CUPS-Get-PPD\n"
-"    CUPS-Get-PPDs\n"
-"    CUPS-Get-Printers\n"
-"    CUPS-Move-Job\n"
-"    CUPS-Reject-Jobs\n"
-"    CUPS-Set-Default\n"
-"    Cancel-Current-Job\n"
-"    Cancel-Job\n"
-"    Cancel-Jobs\n"
-"    Cancel-My-Jobs\n"
-"    Cancel-Subscription\n"
-"    Close-Job\n"
-"    Create-Job\n"
-"    Create-Job-Subscriptions\n"
-"    Create-Printer-Subscriptions\n"
-"    Deactivate-Printer\n"
-"    Disable-Printer\n"
-"    Enable-Printer\n"
-"    Get-Job-Attributes\n"
-"    Get-Jobs\n"
-"    Get-Notifications\n"
-"    Get-Printer-Attributes\n"
-"    Get-Printer-Support-Files\n"
-"    Get-Printer-Supported-Values\n"
-"    Get-Subscription-Attributes\n"
-"    Get-Subscriptions\n"
-"    Hold-Job\n"
-"    Hold-New-Jobs\n"
-"    Identify-Printer\n"
-"    Pause-Printer\n"
-"    Pause-Printer-After-Current-Job\n"
-"    Print-Job\n"
-"    Print-URI\n"
-"    Promote-Job\n"
-"    Purge-Jobs\n"
-"    Release-Held-New-Jobs\n"
-"    Release-Job\n"
-"    Renew-Subscription\n"
-"    Reprocess-Job\n"
-"    Restart-Job\n"
-"    Restart-Printer\n"
-"    Resubmit-Job\n"
-"    Resume-Job\n"
-"    Resume-Printer\n"
-"    Schedule-Job-After\n"
-"    Send-Document\n"
-"    Send-Hardcopy-Document\n"
-"    Send-Notifications\n"
-"    Send-URI\n"
-"    Set-Job-Attributes\n"
-"    Set-Printer-Attributes\n"
-"    Shutdown-Printer\n"
-"    Startup-Printer\n"
-"    Suspend-Current-Job\n"
-"    Validate-Document\n"
-"    Validate-Job\n"
+"Specifies whether B<ipptool>(8)  will skip the current test if the previous "
+"test resulted in an error/failure."
 msgstr ""
-"    Activate-Printer\n"
-"    CUPS-Accept-Jobs\n"
-"    CUPS-Add-Modify-Class\n"
-"    CUPS-Add-Modify-Printer\n"
-"    CUPS-Authenticate-Job\n"
-"    CUPS-Delete-Class\n"
-"    CUPS-Delete-Printer\n"
-"    CUPS-Get-Classes\n"
-"    CUPS-Get-Default\n"
-"    CUPS-Get-Devices\n"
-"    CUPS-Get-Document\n"
-"    CUPS-Get-PPD\n"
-"    CUPS-Get-PPDs\n"
-"    CUPS-Get-Printers\n"
-"    CUPS-Move-Job\n"
-"    CUPS-Reject-Jobs\n"
-"    CUPS-Set-Default\n"
-"    Cancel-Current-Job\n"
-"    Cancel-Job\n"
-"    Cancel-Jobs\n"
-"    Cancel-My-Jobs\n"
-"    Cancel-Subscription\n"
-"    Close-Job\n"
-"    Create-Job\n"
-"    Create-Job-Subscriptions\n"
-"    Create-Printer-Subscriptions\n"
-"    Deactivate-Printer\n"
-"    Disable-Printer\n"
-"    Enable-Printer\n"
-"    Get-Job-Attributes\n"
-"    Get-Jobs\n"
-"    Get-Notifications\n"
-"    Get-Printer-Attributes\n"
-"    Get-Printer-Support-Files\n"
-"    Get-Printer-Supported-Values\n"
-"    Get-Subscription-Attributes\n"
-"    Get-Subscriptions\n"
-"    Hold-Job\n"
-"    Hold-New-Jobs\n"
-"    Identify-Printer\n"
-"    Pause-Printer\n"
-"    Pause-Printer-After-Current-Job\n"
-"    Print-Job\n"
-"    Print-URI\n"
-"    Promote-Job\n"
-"    Purge-Jobs\n"
-"    Release-Held-New-Jobs\n"
-"    Release-Job\n"
-"    Renew-Subscription\n"
-"    Reprocess-Job\n"
-"    Restart-Job\n"
-"    Restart-Printer\n"
-"    Resubmit-Job\n"
-"    Resume-Job\n"
-"    Resume-Printer\n"
-"    Schedule-Job-After\n"
-"    Send-Document\n"
-"    Send-Hardcopy-Document\n"
-"    Send-Notifications\n"
-"    Send-URI\n"
-"    Set-Job-Attributes\n"
-"    Set-Printer-Attributes\n"
-"    Shutdown-Printer\n"
-"    Startup-Printer\n"
-"    Suspend-Current-Job\n"
-"    Validate-Document\n"
-"    Validate-Job\n"
+"Legt fest, ob B<ipptool>(8) den aktuellen Test überspringt, falls der "
+"vorhergehende Test zu einem Fehler/Fehlschlag führte."
 
-#. type: SS
-#: ipptoolfile.man:484
+#. type: TP
+#: ipptoolfile.5:247
 #, no-wrap
-msgid "STATUS CODES"
-msgstr "STATUS-CODES"
+msgid "B<STATUS >I<status-code >[ I<predicate> ]"
+msgstr "B<STATUS >I<Status-Code >[ I<Eigenschaft> ]"
 
 #. type: Plain text
-#: ipptoolfile.man:487
+#: ipptoolfile.5:250
 msgid ""
-"Status codes correspond to the hexadecimal numbers (0xHHHH) and names from "
-"RFC 8011 and other IPP extension specifications. Here is a complete list of "
-"the names supported by B<ipptool>(8):"
+"Specifies an expected response status-code value. Additional requirements "
+"can be added as predicates - see the \"STATUS PREDICATES\" section for more "
+"information on predicates."
 msgstr ""
-"Status-Codes entsprechend den hexadezimalen Zahlen (0xHHHH) und Namen aus "
-"RFC 8011 und anderen IPP-Erweiterungsspezifikationen. Hier ist die komplette "
-"Liste der von B<ipptool>(8) unterstützten Namen:"
+"Legt den Status-Code-Wert einer erwarteten Antwort fest. Zusätzliche "
+"Anforderungen können als Eigenschaften hinzugefügt werden - siehe den "
+"Abschnitt »EXPECT-EIGENSCHAFTEN« für weitere Informationen über "
+"Eigenschaften."
 
-#. type: Plain text
-#: ipptoolfile.man:546
+#. type: TP
+#: ipptoolfile.5:250
 #, no-wrap
+msgid "B<TEST-ID \">I<identifier>\""
+msgstr "B<TEST-ID \">I<Bezeichner>\""
+
+#. type: Plain text
+#: ipptoolfile.5:253
+msgid "Specifies an identifier string for the current test."
+msgstr "Legt einen Bezeichner als Zeichenkette für den aktuellen Test fest."
+
+#. type: Plain text
+#: ipptoolfile.5:256
 msgid ""
-"    client-error-account-authorization-failed\n"
-"    client-error-account-closed\n"
-"    client-error-account-info-needed\n"
-"    client-error-account-limit-reached\n"
-"    client-error-attributes-not-settable\n"
-"    client-error-attributes-or-values-not-supported\n"
-"    client-error-bad-request\n"
-"    client-error-charset-not-supported\n"
-"    client-error-compression-error\n"
-"    client-error-compression-not-supported\n"
-"    client-error-conflicting-attributes\n"
-"    client-error-document-access-error\n"
-"    client-error-document-format-error\n"
-"    client-error-document-format-not-supported\n"
-"    client-error-document-password-error\n"
-"    client-error-document-permission-error\n"
-"    client-error-document-security-error\n"
-"    client-error-document-unprintable-error\n"
-"    client-error-forbidden\n"
-"    client-error-gone\n"
-"    client-error-ignored-all-notifications\n"
-"    client-error-ignored-all-subscriptions\n"
-"    client-error-not-authenticated\n"
-"    client-error-not-authorized\n"
-"    client-error-not-found\n"
-"    client-error-not-possible\n"
-"    client-error-print-support-file-not-found\n"
-"    client-error-request-entity-too-large\n"
-"    client-error-request-value-too-long\n"
-"    client-error-timeout\n"
-"    client-error-too-many-subscriptions\n"
-"    client-error-uri-scheme-not-supported\n"
-"    cups-error-account-authorization-failed\n"
-"    cups-error-account-closed\n"
-"    cups-error-account-info-needed\n"
-"    cups-error-account-limit-reached\n"
-"    cups-see-other\n"
-"    redirection-other-site\n"
-"    server-error-busy\n"
-"    server-error-device-error\n"
-"    server-error-internal-error\n"
-"    server-error-job-canceled\n"
-"    server-error-multiple-document-jobs-not-supported\n"
-"    server-error-not-accepting-jobs\n"
-"    server-error-operation-not-supported\n"
-"    server-error-printer-is-deactivated\n"
-"    server-error-service-unavailable\n"
-"    server-error-temporary-error\n"
-"    server-error-version-not-supported\n"
-"    successful-ok\n"
-"    successful-ok-but-cancel-subscription\n"
-"    successful-ok-conflicting-attributes\n"
-"    successful-ok-events-complete\n"
-"    successful-ok-ignored-notifications\n"
-"    successful-ok-ignored-or-substituted-attributes\n"
-"    successful-ok-ignored-subscriptions\n"
-"    successful-ok-too-many-events\n"
+"Specifies that this test will use \"Transfer-Encoding: chunked\" if it has "
+"an attached file or \"Content-Length:\" otherwise."
 msgstr ""
-"    client-error-account-authorization-failed\n"
-"    client-error-account-closed\n"
-"    client-error-account-info-needed\n"
-"    client-error-account-limit-reached\n"
-"    client-error-attributes-not-settable\n"
-"    client-error-attributes-or-values-not-supported\n"
-"    client-error-bad-request\n"
-"    client-error-charset-not-supported\n"
-"    client-error-compression-error\n"
-"    client-error-compression-not-supported\n"
-"    client-error-conflicting-attributes\n"
-"    client-error-document-access-error\n"
-"    client-error-document-format-error\n"
-"    client-error-document-format-not-supported\n"
-"    client-error-document-password-error\n"
-"    client-error-document-permission-error\n"
-"    client-error-document-security-error\n"
-"    client-error-document-unprintable-error\n"
-"    client-error-forbidden\n"
-"    client-error-gone\n"
-"    client-error-ignored-all-notifications\n"
-"    client-error-ignored-all-subscriptions\n"
-"    client-error-not-authenticated\n"
-"    client-error-not-authorized\n"
-"    client-error-not-found\n"
-"    client-error-not-possible\n"
-"    client-error-print-support-file-not-found\n"
-"    client-error-request-entity-too-large\n"
-"    client-error-request-value-too-long\n"
-"    client-error-timeout\n"
-"    client-error-too-many-subscriptions\n"
-"    client-error-uri-scheme-not-supported\n"
-"    cups-error-account-authorization-failed\n"
-"    cups-error-account-closed\n"
-"    cups-error-account-info-needed\n"
-"    cups-error-account-limit-reached\n"
-"    cups-see-other\n"
-"    redirection-other-site\n"
-"    server-error-busy\n"
-"    server-error-device-error\n"
-"    server-error-internal-error\n"
-"    server-error-job-canceled\n"
-"    server-error-multiple-document-jobs-not-supported\n"
-"    server-error-not-accepting-jobs\n"
-"    server-error-operation-not-supported\n"
-"    server-error-printer-is-deactivated\n"
-"    server-error-service-unavailable\n"
-"    server-error-temporary-error\n"
-"    server-error-version-not-supported\n"
-"    successful-ok\n"
-"    successful-ok-but-cancel-subscription\n"
-"    successful-ok-conflicting-attributes\n"
-"    successful-ok-events-complete\n"
-"    successful-ok-ignored-notifications\n"
-"    successful-ok-ignored-or-substituted-attributes\n"
-"    successful-ok-ignored-subscriptions\n"
-"    successful-ok-too-many-events\n"
+"Legt fest, dass dieser Test »Transfer-Encoding: chunked« verwendet, falls er "
+"eine angehängt Datei hat und »Content-Length:« andernfalls."
 
-#. type: SS
-#: ipptoolfile.man:547
-#, no-wrap
-msgid "TAGS"
-msgstr "MARKIERUNGEN"
+#. type: Plain text
+#: ipptoolfile.5:259
+msgid ""
+"Specifies that this test will use the HTTP/1.1 \"Transfer-Encoding: chunked"
+"\" header."
+msgstr ""
+"Legt fest, dass dieser Test die HTTP/1.1-Kopfzeile »Transfer-Encoding: "
+"chunked« verwenden wird."
 
 #. type: Plain text
-#: ipptoolfile.man:549
+#: ipptoolfile.5:262
 msgid ""
-"Value and group tags correspond to the names from RFC 8011 and other IPP "
-"extension specifications. Here are the group tags:"
+"Specifies that this test will use the HTTP/1.0 \"Content-Length:\" header."
 msgstr ""
-"Werte- und Gruppenmarkierungen entsprechen den Namen aus RFC 8011 und "
-"anderen IPP-Erweiterungsspezifikationen. Hier sind die Gruppenmarkierungen:"
+"Legt fest, dass dieser Test die HTTP/1.0-Kopfzeile »Content-Length:« "
+"verwenden wird."
 
 #. type: Plain text
-#: ipptoolfile.man:558
+#: ipptoolfile.5:273
+msgid "Specifies the IPP version number to use for this test."
+msgstr "Legt die für diesen Test zu verwendende IPP-Versionsnummer fest."
+
+#. type: SS
+#: ipptoolfile.5:273
 #, no-wrap
+msgid "EXPECT PREDICATES"
+msgstr "EXPECT-EIGENSCHAFTEN"
+
+#. type: Plain text
+#: ipptoolfile.5:275
 msgid ""
-"    document-attributes-tag\n"
-"    event-notification-attributes-tag\n"
-"    job-attributes-tag\n"
-"    operation-attributes-tag\n"
-"    printer-attributes-tag\n"
-"    subscription-attributes-tag\n"
-"    unsupported-attributes-tag\n"
+"The following predicates are understood following the B<EXPECT> test "
+"directive:"
 msgstr ""
-"    document-attributes-tag\n"
-"    event-notification-attributes-tag\n"
-"    job-attributes-tag\n"
-"    operation-attributes-tag\n"
-"    printer-attributes-tag\n"
-"    subscription-attributes-tag\n"
-"    unsupported-attributes-tag\n"
+"Die folgenden Eigenschaften (Prädikate) werden angehängt an die B<EXPECT>-"
+"Test-Direktiven verstanden:"
 
-#. type: Plain text
-#: ipptoolfile.man:561
-msgid "Here are the value tags:"
-msgstr "Hier sind die Wertemarkierungen:"
+#. type: TP
+#: ipptoolfile.5:275
+#, no-wrap
+msgid "B<COUNT >I<number>"
+msgstr "B<COUNT >I<Anzahl>"
 
 #. type: Plain text
-#: ipptoolfile.man:588
+#: ipptoolfile.5:278
+msgid ""
+"Requires the B<EXPECT> attribute to have the specified number of values."
+msgstr ""
+"Verlangt, dass das Attribut von B<EXPECT> die angegebene Anzahl an Werten "
+"hat."
+
+#. type: TP
+#: ipptoolfile.5:278 ipptoolfile.5:387
 #, no-wrap
+msgid "B<DEFINE-MATCH >I<variable-name>"
+msgstr "B<DEFINE-MATCH >I<Variablenname>"
+
+#. type: Plain text
+#: ipptoolfile.5:281
 msgid ""
-"    admin-define\n"
-"    boolean\n"
-"    charset\n"
-"    collection\n"
-"    dateTime\n"
-"    default\n"
-"    delete-attribute\n"
-"    enum\n"
-"    integer\n"
-"    keyword\n"
-"    mimeMediaType\n"
-"    nameWithLanguage\n"
-"    nameWithoutLanguage\n"
-"    naturalLanguage\n"
-"    no-value\n"
-"    not-settable\n"
-"    octetString\n"
-"    rangeOfInteger\n"
-"    resolution\n"
-"    textWithLanguage\n"
-"    textWithoutLanguage\n"
-"    unknown\n"
-"    unsupported\n"
-"    uri\n"
-"    uriScheme\n"
+"Defines the variable to \"1\" when the B<EXPECT> condition matches. A side-"
+"effect of this predicate is that this B<EXPECT> will never fail a test."
 msgstr ""
-"    admin-define\n"
-"    boolean\n"
-"    charset\n"
-"    collection\n"
-"    dateTime\n"
-"    default\n"
-"    delete-attribute\n"
-"    enum\n"
-"    integer\n"
-"    keyword\n"
-"    mimeMediaType\n"
-"    nameWithLanguage\n"
-"    nameWithoutLanguage\n"
-"    naturalLanguage\n"
-"    no-value\n"
-"    not-settable\n"
-"    octetString\n"
-"    rangeOfInteger\n"
-"    resolution\n"
-"    textWithLanguage\n"
-"    textWithoutLanguage\n"
-"    unknown\n"
-"    unsupported\n"
-"    uri\n"
-"    uriScheme\n"
+"Setzt die Variable auf »1«, wenn die B<EXPECT>-Bedingung passt. Ein "
+"Seiteneffekt dieser Eigenschaft ist, dass dieser B<EXPECT> niemals bei einem "
+"Test fehlschlägt."
 
-#. type: SS
-#: ipptoolfile.man:589
+#. type: TP
+#: ipptoolfile.5:281 ipptoolfile.5:390
 #, no-wrap
-msgid "VARIABLES"
-msgstr "VARIABLEN"
+msgid "B<DEFINE-NO-MATCH >I<variable-name>"
+msgstr "B<DEFINE-NO-MATCH >I<Variablenname>"
 
 #. type: Plain text
-#: ipptoolfile.man:593
+#: ipptoolfile.5:284
 msgid ""
-"The B<ipptool>(8)  program maintains a list of variables that can be used in "
-"any literal string or attribute value by specifying \"I<$variable-name>\". "
-"Aside from variables defined using the I<-d> option or B<DEFINE> directive, "
-"the following pre-defined variables are available:"
+"Defines the variable to \"1\" when the B<EXPECT> condition does not match. A "
+"side-effect of this predicate is that this B<EXPECT> will never fail a test."
 msgstr ""
-"Das Programm B<ipptool>(8) verwaltet eine Liste von Variablen, die in jeder "
-"Zeichenkette oder jedem Attributswert über Angabe von »I<$variable-name>« "
-"verwandt werden können. Neben den durch die Option I<-d> oder der Direktiven "
-"B<DEFINE> angegebenen Variablen sind folgende vordefinierte Variablen "
-"verfügbar:"
+"Setzt die Variable auf »1«, wenn die B<EXPECT>-Bedingung nicht passt. Ein "
+"Seiteneffekt dieser Eigenschaft ist, dass dieser B<EXPECT> niemals bei einem "
+"Test fehlschlägt."
 
 #. type: TP
-#: ipptoolfile.man:593
+#: ipptoolfile.5:284
 #, no-wrap
-msgid "B<$$>"
-msgstr "B<$$>"
+msgid "B<DEFINE-VALUE >I<variable-name>"
+msgstr "B<DEFINE-VALUE >I<Variablenname>"
 
 #. type: Plain text
-#: ipptoolfile.man:596
-msgid "Inserts a single \"$\" character."
-msgstr "Fügt ein einzelnes »$«-Zeichen ein."
+#: ipptoolfile.5:287
+msgid ""
+"Defines the variable to the value of the attribute when the B<EXPECT> "
+"condition matches. A side-effect of this predicate is that this B<EXPECT> "
+"will never fail a test."
+msgstr ""
+"Setzt die Variable auf den Wert des Attributes, wenn die B<EXPECT>-Bedingung "
+"passt. Ein Seiteneffekt dieser Eigenschaft ist, dass dieser B<EXPECT> "
+"niemals bei einem Test fehlschlägt."
 
 #. type: TP
-#: ipptoolfile.man:596
+#: ipptoolfile.5:287 ipptoolfile.5:393
 #, no-wrap
-msgid "B<$ENV[>I<name>B<]>"
-msgstr "B<$ENV[>I<Name>B<]>"
+msgid "B<IF-DEFINED >I<variable-name>"
+msgstr "B<IF-DEFINED >I<Variablenname>"
 
 #. type: Plain text
-#: ipptoolfile.man:599
+#: ipptoolfile.5:290
 msgid ""
-"Inserts the value of the named environment variable, or an empty string if "
-"the environment variable is not defined."
+"Makes the B<EXPECT> conditions apply only if the specified variable is "
+"defined."
 msgstr ""
-"Fügt den Wert der benannten Umgebungsvariablen oder eine leere Zeichenkette, "
-"falls die Umgebungsvariable nicht definiert ist, ein."
+"Die B<EXPECT>-Bedingung wird nur angewandt, falls die angegebene Variable "
+"definiert ist."
 
 #. type: TP
-#: ipptoolfile.man:599
+#: ipptoolfile.5:290 ipptoolfile.5:396
 #, no-wrap
-msgid "B<$filename>"
-msgstr "B<$filename>"
+msgid "B<IF-NOT-DEFINED >I<variable-name>"
+msgstr "B<IF-NOT-DEFINED >I<Variablenname>"
 
 #. type: Plain text
-#: ipptoolfile.man:604
-msgid "Inserts the filename provided to B<ipptool>(8)  with the I<-f> option."
+#: ipptoolfile.5:293
+msgid ""
+"Makes the B<EXPECT> conditions apply only if the specified variable is not "
+"defined."
 msgstr ""
-"Fügt den mit der Option I<-f> an B<ipptool>(8) bereitgestellten Dateinamen "
-"ein."
+"Die B<EXPECT>-Bedingung wird nur angewandt, falls die angegebene Variable "
+"nicht definiert ist."
 
 #. type: TP
-#: ipptoolfile.man:604
+#: ipptoolfile.5:293
 #, no-wrap
-msgid "B<$filetype>"
-msgstr "B<$filetype>"
+msgid "B<IN-GROUP >I<tag>"
+msgstr "B<IN-GROUP >I<Markierung>"
 
 #. type: Plain text
-#: ipptoolfile.man:609
-msgid ""
-"Inserts the MIME media type for the filename provided to B<ipptool>(8)  with "
-"the I<-f> option."
+#: ipptoolfile.5:296
+msgid "Requires the B<EXPECT> attribute to be in the specified group tag."
 msgstr ""
-"Fügt den MIME-Medientyp für den mit der Option I<-f> an B<ipptool>(8) "
-"bereitgestellten Dateinamen ein."
+"Verlangt, dass das B<EXPECT>-Attribut in der angegebenen Gruppenmarkierung "
+"ist."
 
 #. type: TP
-#: ipptoolfile.man:609
-#, no-wrap
-msgid "B<$hostname>"
-msgstr "B<$hostname>"
+#: ipptoolfile.5:296
+#, fuzzy, no-wrap
+msgid "B<OF-TYPE >I<tag[|tag,...]>"
+msgstr "B<OF-TYPE >I<Markierung[|Markierung,…]>"
 
 #. type: Plain text
-#: ipptoolfile.man:613
-msgid "Inserts the hostname from the URI provided to B<ipptool>(8)."
-msgstr "Fügt den Rechnernamen aus der B<ipptool>(8) bereitgestellten URI ein."
+#: ipptoolfile.5:299
+msgid ""
+"Requires the B<EXPECT> attribute to use one of the specified value tag(s)."
+msgstr ""
+"Verlangt, dass das B<EXPECT>-Attribut die angegebenen Wertemarkierung(en) "
+"verwendet."
 
 #. type: TP
-#: ipptoolfile.man:613
+#: ipptoolfile.5:299 ipptoolfile.5:399
 #, no-wrap
-msgid "B<$job-id>"
-msgstr "B<$job-id>"
+msgid "B<REPEAT-LIMIT >I<number>"
+msgstr "B<REPEAT-LIMIT >I<Anzahl>"
 
 #. type: Plain text
-#: ipptoolfile.man:616
+#: ipptoolfile.5:303
 msgid ""
-"Inserts the last \"job-id\" attribute value returned in a test response or 0 "
-"if no \"job-id\" attribute has been seen."
+"Specifies the maximum number of times to repeat if the B<REPEAT-MATCH> or "
+"B<REPEAT-NO-MATCH> predicate is specified. The default value is 1000."
 msgstr ""
-"Fügt den letzten in einer Testantwort zurückgelieferten »job-id«-"
-"Attributwert oder 0, falls kein Attribut »job-id« gesehen wurde, ein."
+"Legt die maximale Anzahl an Wiederholungen, falls die Eigenschaft B<REPEAT-"
+"MATCH> oder B<REPEAT-NO-MATCH> festgelegt ist, fest. Die Vorgabe ist 1000."
 
 #. type: TP
-#: ipptoolfile.man:616
+#: ipptoolfile.5:303 ipptoolfile.5:403
 #, no-wrap
-msgid "B<$job-uri>"
-msgstr "B<$job-uri>"
+msgid "B<REPEAT-MATCH>"
+msgstr "B<REPEAT-MATCH>"
+
+#. type: TP
+#: ipptoolfile.5:305 ipptoolfile.5:405
+#, no-wrap
+msgid "B<REPEAT-NO-MATCH>"
+msgstr "B<REPEAT-NO-MATCH>"
 
 #. type: Plain text
-#: ipptoolfile.man:619
+#: ipptoolfile.5:308
 msgid ""
-"Inserts the last \"job-uri\" attribute value returned in a test response or "
-"an empty string if no \"job-uri\" attribute has been seen."
+"Specifies that the current test should be repeated when the B<EXPECT> "
+"condition matches or does not match."
 msgstr ""
-"Fügt den letzten in einer Testantwort zurückgelieferten »job-uri«-"
-"Attributwert oder eine leere Zeichenkette, falls kein Attribut »job-uri« "
-"gesehen wurde, ein."
+"Legt fest, dass der aktuelle Test wiederholt werden soll, wenn die B<EXPECT>-"
+"Bedingung (nicht) passt."
 
 #. type: TP
-#: ipptoolfile.man:619
+#: ipptoolfile.5:308
 #, no-wrap
-msgid "B<$notify-subscription-id>"
-msgstr "B<$notify-subscription-id>"
+msgid "B<SAME-COUNT-AS >I<attribute-name>"
+msgstr "B<SAME-COUNT-AS >I<Attributname>"
 
 #. type: Plain text
-#: ipptoolfile.man:622
+#: ipptoolfile.5:311
 msgid ""
-"Inserts the last \"notify-subscription-id\" attribute value returned in a "
-"test response or 0 if no \"notify-subscription-id\" attribute has been seen."
+"Requires the B<EXPECT> attribute to have the same number of values as the "
+"specified parallel attribute."
 msgstr ""
-"Fügt den letzten in einer Testantwort zurückgelieferten »notify-subscription-"
-"id«-Attributwert oder 0, falls kein Attribut »notify-subscription-id« "
-"gesehen wurde, ein."
+"Verlangt, dass das B<EXPECT>-Attribut die gleiche Anzahl von Werten wie das "
+"festgelegte parallele Attribut hat."
 
 #. type: TP
-#: ipptoolfile.man:622
+#: ipptoolfile.5:311
 #, no-wrap
-msgid "B<$port>"
-msgstr "B<$port>"
-
-#. type: Plain text
-#: ipptoolfile.man:626
-msgid "Inserts the port number from the URI provided to B<ipptool>(8)."
-msgstr "Fügt die Portnummer aus der an B<ipptool>(8) übergebenen URI ein."
+msgid "B<WITH-ALL-HOSTNAMES \">I<literal string>B<\">"
+msgstr "B<WITH-ALL-HOSTNAMES \">I<Zeichenkette>B<\">"
 
 #. type: TP
-#: ipptoolfile.man:626
+#: ipptoolfile.5:313
 #, no-wrap
-msgid "B<$resource>"
-msgstr "B<$resource>"
+msgid "B<WITH-ALL-HOSTNAMES \"/>I<regular expression>B</\">"
+msgstr "B<WITH-ALL-HOSTNAMES \"/>I<regulärer Ausdruck>B</\">"
 
 #. type: Plain text
-#: ipptoolfile.man:630
-msgid "Inserts the resource path from the URI provided to B<ipptool>(8)."
-msgstr "Fügt den Ressourcenpfad aus der an B<ipptool>(8) übergebenen URI ein."
+#: ipptoolfile.5:316
+msgid "Requires that all URI values contain a matching hostname."
+msgstr "Verlangt, dass alle URI-Werte einen passenden Rechnernamen enthalten."
 
 #. type: TP
-#: ipptoolfile.man:630
+#: ipptoolfile.5:316
 #, no-wrap
-msgid "B<$scheme>"
-msgstr "B<$scheme>"
-
-#. type: Plain text
-#: ipptoolfile.man:634
-msgid "Inserts the scheme from the URI provided to B<ipptool>(8)."
-msgstr "Fügt das Schema aus der B<ipptool>(8) übergebenen URI ein."
+msgid "B<WITH-ALL-RESOURCES \">I<literal string>B<\">"
+msgstr "B<WITH-ALL-RESOURCES \">I<Zeichenkette>B<\">"
 
 #. type: TP
-#: ipptoolfile.man:634
+#: ipptoolfile.5:318
 #, no-wrap
-msgid "B<$uri>"
-msgstr "B<$uri>"
+msgid "B<WITH-ALL-RESOURCES \"/>I<regular expression>B</\">"
+msgstr "B<WITH-ALL-RESOURCES \"/>I<regulärer Ausdruck>B</\">"
 
 #. type: Plain text
-#: ipptoolfile.man:638
-msgid "Inserts the URI provided to B<ipptool>(8)."
-msgstr "Fügt die an B<ipptool>(8) übergebene URI ein."
+#: ipptoolfile.5:321
+msgid ""
+"Requires that all URI values contain a matching resource (including "
+"leading /)."
+msgstr ""
+"Verlangt, dass alle URI-Werte eine passende Ressource (einschließlich des "
+"führenden /) enthalten."
 
 #. type: TP
-#: ipptoolfile.man:638
+#: ipptoolfile.5:321
 #, no-wrap
-msgid "B<$uriuser>"
-msgstr "B<$uriuser>"
-
-#. type: Plain text
-#: ipptoolfile.man:643
-msgid "Inserts the username from the URI provided to B<ipptool>(8), if any."
-msgstr ""
-"Fügt den Benutzernamen aus der B<ipptool>(8) übergebenen URI ein, falls "
-"vorhanden."
+msgid "B<WITH-ALL-SCHEMES \">I<literal string>B<\">"
+msgstr "B<WITH-ALL-SCHEMES \">I<Zeichenkette>B<\">"
 
 #. type: TP
-#: ipptoolfile.man:643
+#: ipptoolfile.5:323
 #, no-wrap
-msgid "B<$user>"
-msgstr "B<$user>"
+msgid "B<WITH-ALL-SCHEMES \"/>I<regular expression>B</\">"
+msgstr "B<WITH-ALL-SCHEMES \"/>I<regulärer Ausdruck>B</\">"
 
 #. type: Plain text
-#: ipptoolfile.man:646
-msgid "Inserts the current user's login name."
-msgstr "Fügt den Anmeldenamen des aktuellen Benutzers ein."
+#: ipptoolfile.5:326
+msgid "Requires that all URI values contain a matching scheme."
+msgstr "Verlangt, dass alle URI-Werte ein passendes Schema enthalten."
+
+#. type: TP
+#: ipptoolfile.5:326
+#, no-wrap
+msgid "B<WITH-ALL-VALUES \">I<literal string>B<\">"
+msgstr "B<WITH-ALL-VALUES \">I<Zeichenkette>B<\">"
 
 #. type: Plain text
-#: ipptoolfile.man:651
+#: ipptoolfile.5:329
 msgid ""
-"B<ipptool>(1), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
-"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
-"ipp), RFC 8011 (http://tools.ietf.org/html/rfc8011)"
+"Requires that all values of the B<EXPECT> attribute match the literal "
+"string. Comparisons are case-sensitive."
 msgstr ""
-"B<ipptool>(1), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
-"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
-"ipp), RFC 8011 (http://tools.ietf.org/html/rfc8011)"
+"Verlangt, dass alle Werte des B<EXPECT>-Attributs auf die Zeichenkette "
+"passen. Vergleiche berücksichtigen die Groß- und Kleinschreibung."
 
-#. type: TH
-#: ipptool.man:12
+#. type: TP
+#: ipptoolfile.5:329
 #, no-wrap
-msgid "ipptool"
-msgstr "ipptool"
+msgid "B<WITH-ALL-VALUES E<lt>>I<number>"
+msgstr "B<WITH-ALL-VALUES E<lt>>I<Zahl>"
 
-#. type: TH
-#: ipptool.man:12
+#. type: TP
+#: ipptoolfile.5:331
 #, no-wrap
-msgid "4 August 2017"
-msgstr "4. August 2017"
-
-#. type: Plain text
-#: ipptool.man:15
-msgid "ipptool - perform internet printing protocol requests"
-msgstr "ipptool - Internet-Printing-Protocol-Abfragen durchführen"
+msgid "B<WITH-ALL-VALUES =>I<number>"
+msgstr "B<WITH-ALL-VALUES =>I<Zahl>"
 
-#. type: Plain text
-#: ipptool.man:75
-#, fuzzy
-msgid ""
-"B<ipptool> [ B<--help> ] [ B<--stop-after-include-error> ] [ B<--version> ] "
-"[ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] [ B<-I> ] [ B<-L> ] [ B<-P> "
-"I<filename.plist> ] [ B<-S> ] [ B<-T> I<seconds> ] [ B<-V> I<version> ] [ B<-"
-"X> ] [ B<-c> ] [ B<-d> I<name=value> ] [ B<-f> I<filename> ] [ B<-h> ] [ B<-"
-"i> I<seconds> ] [ B<-n> I<repeat-count> ] [ B<-q> ] [ B<-t> ] [ B<-v ]> "
-"I<printer-uri> I<testfile> [ ...  I<testfile> ]"
-msgstr ""
-"B<ipptool> [ B<--help> ] [ B<--stop-after-include-error> ] [ B<--version> ] "
-"[ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] [ B<-I> ] [ B<-L> ] [ B<-P> "
-"I<Dateiname.plist> ] [ B<-S> ] [ B<-T> I<Sekunden> ] [ B<-V> I<Version> ] "
-"[ B<-X> ] [ B<-c> ] [ B<-d> I<Name=Wert> ] [ B<-f> I<Dateiname> ] [ B<-h> ] "
-"[ B<-i> I<Sekunden> ] [ B<-n> I<Anzahl-Wiederholungen> ] [ B<-q> ] [ B<-t> ] "
-"[ B<-v ]> I<Drucker-URI> I<Testdatei> [ …  I<Testdatei> ]"
-
-#. type: Plain text
-#: ipptool.man:88
-msgid ""
-"B<ipptool> sends IPP requests to the specified I<printer-uri> and tests and/"
-"or displays the results.  Each named I<testfile> defines one or more "
-"requests, including the expected response status, attributes, and values.  "
-"Output is either a plain text, formatted text, CSV, or XML report on the "
-"standard output, with a non-zero exit status indicating that one or more "
-"tests have failed.  The I<testfile> format is described in B<ipptoolfile>(5)."
-msgstr ""
-"B<ipptool> sendet IPP-Anfragen an die angegebene I<Drucker-URI> und "
-"überprüft das Ergebnis oder zeigt es an. Jede benannte I<Testdatei> "
-"definiert eine oder mehrere Anfragen, dazu gehören der erwartete "
-"Antwortstatus, die Attribute und Werte. Die Ausgabe ist entweder reiner "
-"Text, formatierter Text, CSV oder ein XML-Bericht auf der Standardausgabe. "
-"Ein von Null verschiedener Exit-Status gibt an, dass eine oder mehrere Tests "
-"fehlgeschlagen sind. Das Format der I<Testdatei> wird in B<ipptoolfile>(5) "
-"beschrieben."
-
-#. type: Plain text
-#: ipptool.man:91
-msgid "The following options are recognized by B<ipptool:>"
-msgstr "Die folgenden Optionen werden von B<ipptool> erkannt:"
+#. type: TP
+#: ipptoolfile.5:333
+#, no-wrap
+msgid "B<WITH-ALL-VALUES E<gt>>I<number>"
+msgstr "B<WITH-ALL-VALUES E<gt>>I<Zahl>"
 
 #. type: TP
-#: ipptool.man:94
+#: ipptoolfile.5:335
 #, no-wrap
-msgid "B<--stop-after-include-error>"
-msgstr "B<--stop-after-include-error>"
+msgid "B<WITH-ALL-VALUES >I<number>[I<,...,number>]"
+msgstr "B<WITH-ALL-VALUES >I<Zahl>[I<,…,Zahl>]"
 
 #. type: Plain text
-#: ipptool.man:101
+#: ipptoolfile.5:338
 msgid ""
-"Tells B<ipptool> to stop if an error occurs in an included file. Normally "
-"B<ipptool> will continue with subsequent tests after the INCLUDE directive."
+"Requires that all values of the B<EXPECT> attribute match the number(s) or "
+"numeric comparison. When comparing rangeOfInteger values, the \"E<lt>\" and "
+"\"E<gt>\" operators only check the upper bound of the range."
 msgstr ""
-"Teilt B<ipptool> mit, abzubrechen, falls ein Fehler in der eingebundenen "
-"Datei auftritt. Normalerweise wird B<ipptool> mit folgenden Tests nach der "
-"INCLUDE-Direktive fortfahren."
+"Verlangt, dass alle Werte des B<EXPECT>-Attributs auf die Zahl(en) passen "
+"oder den numerischen Vergleich erfüllen. Beim Vergleich von rangeOfInteger-"
+"Werten prüfen die Operatoren »E<lt>« und »E<gt>« nur die obere Grenze der "
+"Bereiche."
 
-#. type: Plain text
-#: ipptool.man:106
-msgid "Shows the version of B<ipptool> being used."
-msgstr "Zeigt die verwendete Version von B<ipptool> an."
+#. type: TP
+#: ipptoolfile.5:338
+#, no-wrap
+msgid "B<WITH-ALL-VALUES \"false\">"
+msgstr "B<WITH-ALL-VALUES \"false\">"
 
-#. type: Plain text
-#: ipptool.man:111
-msgid ""
-"Specifies that B<ipptool> must connect to the printer or server using IPv4."
-msgstr ""
-"Legt fest, dass B<ipptool> sich zu dem Drucker oder Server mit IPv4 "
-"verbinden muss."
+#. type: TP
+#: ipptoolfile.5:340
+#, no-wrap
+msgid "B<WITH-ALL-VALUES \"true\">"
+msgstr "B<WITH-ALL-VALUES \"true\">"
 
 #. type: Plain text
-#: ipptool.man:116
+#: ipptoolfile.5:343
 msgid ""
-"Specifies that B<ipptool> must connect to the printer or server using IPv6."
+"Requires that all values of the B<EXPECT> attribute match the boolean value "
+"given."
 msgstr ""
-"Legt fest, dass B<ipptool> sich zu dem Drucker oder Server mit IPv6 "
-"verbinden muss."
+"Verlangt, dass alle Werte des B<EXPECT>-Attributs auf den übergebenen "
+"logischen Wert passen."
 
 #. type: TP
-#: ipptool.man:116
+#: ipptoolfile.5:343
 #, no-wrap
-msgid "B<-C>"
-msgstr "B<-C>"
-
-#. type: Plain text
-#: ipptool.man:120
-msgid ""
-"Specifies that requests should be sent using the HTTP/1.1 \"Transfer-"
-"Encoding: chunked\" header, which is required for conformance by all "
-"versions of IPP.  The default is to use \"Transfer-Encoding: chunked\" for "
-"requests with attached files and \"Content-Length:\" for requests without "
-"attached files."
-msgstr ""
-"Legt fest, dass Anfragen mit der HTTP/1.1-Kopfzeile »Transfer-Encoding: "
-"chunked« gesendet werden sollen, der für Konformität von allen IPP-Versionen "
-"verlangt wird. Standardmäßig wird »Transfer-Encoding: chunked« für Anfragen "
-"mit anhängenden Dateien und »Content-Length:« für Anfragen ohne anhängende "
-"Dateien verwandt."
+msgid "B<WITH-ALL-VALUES \"/>I<regular expression>B</\">"
+msgstr "B<WITH-ALL-VALUES \"/>I<regulärer Ausdruck>B</\">"
 
 #. type: Plain text
-#: ipptool.man:123
+#: ipptoolfile.5:346
 msgid ""
-"Forces TLS encryption when connecting to the server using the HTTP \"Upgrade"
-"\" header."
+"Requires that all values of the B<EXPECT> attribute match the regular "
+"expression, which must conform to the POSIX regular expression syntax. "
+"Comparisons are case-sensitive."
 msgstr ""
-"Erzwingt TLS-Verschlüsselung bei Verbindungen zum Server mit der HTTP-"
-"Kopfzeile »Upgrade«."
+"Verlangt, dass alle Werte des B<EXPECT>-Attributes auf den regulären "
+"Ausdruck passen. Dieser muss die Syntax regulärer POSIX-Ausdrücke erfüllen. "
+"Vergleiche berücksichtigen Groß- und Kleinschreibung."
 
 #. type: TP
-#: ipptool.man:123
+#: ipptoolfile.5:346
 #, no-wrap
-msgid "B<-I>"
-msgstr "B<-I>"
-
-#. type: Plain text
-#: ipptool.man:128
-msgid "Specifies that B<ipptool> will continue past errors."
-msgstr "Legt fest, dass B<ipptool> bei Fehlern fortfahren soll."
+msgid "B<WITH-HOSTNAME \">I<literal string>B<\">"
+msgstr "B<WITH-HOSTNAME \">I<Zeichenkette>B<\">"
 
 #. type: TP
-#: ipptool.man:128
+#: ipptoolfile.5:348
 #, no-wrap
-msgid "B<-L>"
-msgstr "B<-L>"
+msgid "B<WITH-HOSTNAME \"/>I<regular expression>B</\">"
+msgstr "B<WITH-HOSTNAME \"/>I<regulärer Ausdruck>B</\">"
 
 #. type: Plain text
-#: ipptool.man:132
-msgid ""
-"Specifies that requests should be sent using the HTTP/1.0 \"Content-Length:"
-"\" header, which is required for conformance by all versions of IPP.  The "
-"default is to use \"Transfer-Encoding: chunked\" for requests with attached "
-"files and \"Content-Length:\" for requests without attached files."
+#: ipptoolfile.5:351
+msgid "Requires that at least one URI value contains a matching hostname."
 msgstr ""
-"Legt fest, dass Anfragen mit der HTTP/1.0-Kopfzeile »Content-Length:« "
-"gesendet werden sollen, der für Konformität von allen IPP-Versionen verlangt "
-"wird. Standardmäßig wird »Transfer-Encoding: chunked« für Anfragen mit "
-"anhängenden Dateien und »Content-Length:« für Anfragen ohne anhängende "
-"Dateien verwandt."
+"Verlangt, dass mindestens ein URI-Wert einen passenden Rechnernamen enthält."
 
 #. type: TP
-#: ipptool.man:132
+#: ipptoolfile.5:351
 #, no-wrap
-msgid "B<-P>I<\\ filename.plist>"
-msgstr "B<-P>I<\\ Dateiname.plist>"
+msgid "B<WITH-RESOURCE \">I<literal string>B<\">"
+msgstr "B<WITH-RESOURCE \">I<Zeichenkette>B<\">"
+
+#. type: TP
+#: ipptoolfile.5:353
+#, no-wrap
+msgid "B<WITH-RESOURCE \"/>I<regular expression>B</\">"
+msgstr "B<WITH-RESOURCE \"/>I<regulärer Ausdruck>B</\">"
 
 #. type: Plain text
-#: ipptool.man:136
+#: ipptoolfile.5:356
 msgid ""
-"Specifies that the test results should be written to the named XML (Apple "
-"plist) file in addition to the regular test report (B<-t>).  This option is "
-"incompatible with the B<-i> (interval) and B<-n> (repeat-count) options."
+"Requires that at least one URI value contains a matching resource (including "
+"leading /)."
 msgstr ""
-"Legt fest, dass die Ergebnisse der Tests zusätzlich zu dem normalen "
-"Testbericht (B<-t>) in die benannte XML- (Apple plist-)Datei geschrieben "
-"werden sollen. Diese Option ist inkompatibel zu den Optionen B<-i> "
-"(Intervall) und B<-n> (Anzahl-Wiederholungen)."
+"Verlangt, dass mindestens ein URI-Wert eine passende Ressource "
+"(einschließlich des führenden /) enthält."
 
 #. type: TP
-#: ipptool.man:136
+#: ipptoolfile.5:356
 #, no-wrap
-msgid "B<-S>"
-msgstr "B<-S>"
-
-#. type: Plain text
-#: ipptool.man:139
-msgid "Forces (dedicated) TLS encryption when connecting to the server."
-msgstr "Erzwingt (dedizierte) TLS-Verschlüsselung bei Verbindungen zum Server."
+msgid "B<WITH-SCHEME \">I<literal string>B<\">"
+msgstr "B<WITH-SCHEME \">I<Zeichenkette>B<\">"
 
 #. type: TP
-#: ipptool.man:139
+#: ipptoolfile.5:358
 #, no-wrap
-msgid "B<-T>I<\\ seconds>"
-msgstr "B<-T>I<\\ Sekunden>"
+msgid "B<WITH-SCHEME \"/>I<regular expression>B</\">"
+msgstr "B<WITH-SCHEME \"/>I<regulärer Ausdruck>B</\">"
 
 #. type: Plain text
-#: ipptool.man:142
-msgid "Specifies a timeout for IPP requests in seconds."
-msgstr "Legt eine Zeitüberschreitung in Sekunden für IPP-Anfragen fest."
+#: ipptoolfile.5:361
+msgid "Requires that at least one URI value contains a matching scheme."
+msgstr "Verlangt, dass mindestens ein URI-Wert ein passendes Schema enthält."
 
 #. type: TP
-#: ipptool.man:142
+#: ipptoolfile.5:361
 #, no-wrap
-msgid "B<-V>I<\\ version>"
-msgstr "B<-V>I<\\ Version>"
+msgid "B<WITH-VALUE \">I<literal string>B<\">"
+msgstr "B<WITH-VALUE \">I<Zeichenkette>B<\">"
 
 #. type: Plain text
-#: ipptool.man:145
+#: ipptoolfile.5:364
 msgid ""
-"Specifies the default IPP version to use: 1.0, 1.1, 2.0, 2.1, or 2.2. If not "
-"specified, version 1.1 is used."
+"Requires that at least one value of the B<EXPECT> attribute matches the "
+"literal string. Comparisons are case-sensitive."
 msgstr ""
-"Legt die zu verwendende Standard-IPP-Version fest: 1.0, 1.1, 2.0, 2.1 oder "
-"2.2. Falls nicht angegeben, wird Version 1.1 verwandt."
+"Verlangt, dass mindestens ein Wert des B<EXPECT>-Attributs auf die "
+"Zeichenkette passt. Vergleiche berücksichtigen Groß- und Kleinschreibung."
 
 #. type: TP
-#: ipptool.man:145
+#: ipptoolfile.5:364
 #, no-wrap
-msgid "B<-X>"
-msgstr "B<-X>"
-
-#. type: Plain text
-#: ipptool.man:149
-msgid ""
-"Specifies that XML (Apple plist) output is desired instead of the plain text "
-"report.  This option is incompatible with the B<-i> (interval) and B<-n> "
-"(repeat-count) options."
-msgstr ""
-"Legt fest, dass die XML- (Apple-Plist-)Ausgabe statt des reinen Textberichts "
-"erwünscht ist. Diese Option ist inkompatibel zu den Optionen B<-i> "
-"(Intervall) und B<-n> (Anzahl-Wiederholungen)."
-
-#. type: Plain text
-#: ipptool.man:152
-msgid ""
-"Specifies that CSV (comma-separated values) output is desired instead of the "
-"plain text output."
-msgstr ""
-"Legt fest, dass CVS- (Kommata-getrennte Werte-)Ausgabe statt des reinen "
-"Textberichts erwünscht ist."
+msgid "B<WITH-VALUE E<lt>>I<number>"
+msgstr "B<WITH-VALUE E<lt>>I<Zahl>"
 
 #. type: TP
-#: ipptool.man:152
+#: ipptoolfile.5:366
 #, no-wrap
-msgid "B<-d>I<\\ name=value>"
-msgstr "B<-d>I<\\ Name=Wert>"
+msgid "B<WITH-VALUE =>I<number>"
+msgstr "B<WITH-VALUE =>I<Zahl>"
 
-#. type: Plain text
-#: ipptool.man:155
-msgid "Defines the named variable."
-msgstr "Definiert die genannte Variable."
+#. type: TP
+#: ipptoolfile.5:368
+#, no-wrap
+msgid "B<WITH-VALUE E<gt>>I<number>"
+msgstr "B<WITH-VALUE E<gt>>I<Zahl>"
 
 #. type: TP
-#: ipptool.man:155
+#: ipptoolfile.5:370
 #, no-wrap
-msgid "B<-f>I<\\ filename>"
-msgstr "B<-f>I<\\ Dateiname>"
+msgid "B<WITH-VALUE >I<number>[I<,...,number>]"
+msgstr "B<WITH-VALUE >I<Zahl>[I<,…,Zahl>]"
 
 #. type: Plain text
-#: ipptool.man:158
-msgid "Defines the default request filename for tests."
-msgstr "Definiert den Standardanfragedateinamen für Tests."
+#: ipptoolfile.5:373
+msgid ""
+"Requires that at least one value of the B<EXPECT> attribute matches the "
+"number(s) or numeric comparison. When comparing rangeOfInteger values, the "
+"\"E<lt>\" and \"E<gt>\" operators only check the upper bound of the range."
+msgstr ""
+"Verlangt, dass mindestens ein Wert des B<EXPECT>-Attributs auf die Zahl(en) "
+"passt oder den numerischen Vergleich erfüllt. Beim Vergleich von "
+"rangeOfInteger-Werten prüfen die Operatoren »E<lt>« und »E<gt>« nur die "
+"obere Grenze der Bereiche."
 
-#. type: Plain text
-#: ipptool.man:161
-msgid "Validate HTTP response headers."
-msgstr "Validiert HTTP-Antwort-Kopfzeilen."
+#. type: TP
+#: ipptoolfile.5:373
+#, no-wrap
+msgid "B<WITH-VALUE \"false\">"
+msgstr "B<WITH-VALUE \"false\">"
 
 #. type: TP
-#: ipptool.man:161
+#: ipptoolfile.5:375
 #, no-wrap
-msgid "B<-i>I<\\ seconds>"
-msgstr "B<-i>I<\\ Sekunden>"
+msgid "B<WITH-VALUE \"true\">"
+msgstr "B<WITH-VALUE \"true\">"
 
 #. type: Plain text
-#: ipptool.man:167
+#: ipptoolfile.5:378
 msgid ""
-"Specifies that the (last)  I<testfile> should be repeated at the specified "
-"interval.  This option is incompatible with the B<-X> (XML plist output) "
-"option."
+"Requires that at least one value of the B<EXPECT> attribute matches the "
+"boolean value given."
 msgstr ""
-"Legt fest, dass die (letzte) I<Testdatei> mit dem angegebenen Intervall "
-"wiederholt werden soll. Diese Option ist inkompatibel zu der Option B<-X> "
-"(XML-Plist-Ausgabe)."
-
-#. type: Plain text
-#: ipptool.man:170
-msgid "Specifies that plain text output is desired."
-msgstr "Legt fest, dass die Ausgabe als einfacher Text erwünscht ist."
+"Verlangt, dass mindestens ein Wert des B<EXPECT>-Attributs auf den "
+"übergebenen logischen Wert passt."
 
 #. type: TP
-#: ipptool.man:170
+#: ipptoolfile.5:378
 #, no-wrap
-msgid "B<-n>I<\\ repeat-count>"
-msgstr "B<-n>I<\\ Anzahl-Wiederholungen>"
+msgid "B<WITH-VALUE \"/>I<regular expression>B</\">"
+msgstr "B<WITH-VALUE \"/>I<regulärer Ausdruck>B</\">"
 
 #. type: Plain text
-#: ipptool.man:176
+#: ipptoolfile.5:381
 msgid ""
-"Specifies that the (last)  I<testfile> should be repeated the specified "
-"number of times.  This option is incompatible with the I<-X> (XML plist "
-"output) option."
+"Requires that at least one value of the B<EXPECT> attribute matches the "
+"regular expression, which must conform to the POSIX regular expression "
+"syntax. Comparisons are case-sensitive."
 msgstr ""
-"Legt fest, dass die (letzte) I<Testdatei> entsprechend der angegeben Zahl "
-"wiederholt werden soll. Diese Option ist inkompatibel zu der Option I<-X> "
-"(XML-Plist-Ausgabe)."
+"Verlangt, dass mindestens ein Wert des B<EXPECT>-Attributes auf den "
+"regulären Ausdruck passt. Dieser muss die Syntax regulärer POSIX-Ausdrücke "
+"erfüllen. Vergleiche berücksichtigen Groß- und Kleinschreibung."
+
+#. type: TP
+#: ipptoolfile.5:381
+#, no-wrap
+msgid "B<WITH-VALUE-FROM >I<attribute-name>"
+msgstr "B<WITH-VALUE-FROM >I<Attributname>"
 
 #. type: Plain text
-#: ipptool.man:179
-msgid "Be quiet and produce no output."
-msgstr "Still sein und keine Ausgabe erzeugen."
+#: ipptoolfile.5:385
+msgid ""
+"Requires that the value(s) of the B<EXPECT> attribute matches the value(s) "
+"in the specified attribute.  For example, \"EXPECT job-sheets WITH-VALUE-"
+"FROM job-sheets-supported\" requires that the \"job-sheets\" value is listed "
+"as a value of the \"job-sheets-supported\" attribute."
+msgstr ""
+"Verlangt, dass der Wert/die Werte des Attributes B<EXPECT> auf den Wert/die "
+"Werte in dem angegebenen Attribut passt/passen. Beispielsweise verlangt "
+"»EXPECT job-sheets WITH-VALUE-FROM job-sheets-supported«, dass der Wert »job-"
+"sheets« als Wert im Attribut »job-sheets-supported« aufgeführt ist."
+
+#. type: SS
+#: ipptoolfile.5:385
+#, no-wrap
+msgid "STATUS PREDICATES"
+msgstr "STATUS-EIGENSCHAFTEN"
 
 #. type: Plain text
-#: ipptool.man:182
+#: ipptoolfile.5:387
 msgid ""
-"Specifies that CUPS test report output is desired instead of the plain text "
-"output."
+"The following predicates are understood following the B<STATUS> test "
+"directive:"
 msgstr ""
-"Legt fest, dass CUPS-Testberichtausgabe statt einfache Textausgabe erwünscht "
-"ist."
+"Die folgenden Eigenschaften werden nach der B<STATUS>-Testdirektive "
+"verstanden:"
 
 #. type: Plain text
-#: ipptool.man:186
+#: ipptoolfile.5:390
 msgid ""
-"Specifies that all request and response attributes should be output in CUPS "
-"test mode (B<-t>).  This is the default for XML output."
+"Defines the variable to \"1\" when the B<STATUS> matches. A side-effect of "
+"this predicate is that this B<STATUS> will never fail a test."
 msgstr ""
-"Legt fest, dass alle Anfrage- und Antwort-Attribute im CUPS-Testmodus (B<-"
-"t>) ausgegeben werden sollen. Dies ist die Vorgabe für XML-Ausgabe."
+"Setzt die Variable auf »1« wenn der B<STATUS> passt. Ein Seiteneffekt dieser "
+"Eigenschaft ist, dass dieser B<STATUS> niemals bei einem Test fehlschlägt."
 
 #. type: Plain text
-#: ipptool.man:190
+#: ipptoolfile.5:393
 msgid ""
-"The B<ipptool> program returns 0 if all tests were successful and 1 "
-"otherwise."
+"Defines the variable to \"1\" when the B<STATUS> does not match. A side-"
+"effect of this predicate is that this B<STATUS> will never fail a test."
 msgstr ""
-"Das Programm B<ipptool> liefert 0 zurück, falls alle Tests erfolgreich waren "
-"und ansonsten 1."
+"Setzt die Variable auf »1« wenn der B<STATUS> nicht passt. Ein Seiteneffekt "
+"dieser Eigenschaft ist, dass dieser B<STATUS> niemals bei einem Test "
+"fehlschlägt."
 
 #. type: Plain text
-#: ipptool.man:192
-msgid "The following standard files are available:"
-msgstr "Die folgenden Standarddateien sind verfügbar:"
+#: ipptoolfile.5:396
+msgid "Makes the B<STATUS> apply only if the specified variable is defined."
+msgstr ""
+"Führt dazu, dass der B<STATUS> nur angewandt wird, falls die angegebene "
+"Variable definiert ist."
+
+#. type: Plain text
+#: ipptoolfile.5:399
+msgid ""
+"Makes the B<STATUS> apply only if the specified variable is not defined."
+msgstr ""
+"Führt dazu, dass der B<STATUS> nur angewandt wird, falls die angegebene "
+"Variable nicht definiert ist."
+
+#. type: Plain text
+#: ipptoolfile.5:403
+msgid ""
+"Specifies the maximum number of times to repeat. The default value is 1000."
+msgstr "Legt die maximale Anzahl an Wiederholungen fest. Die Vorgabe ist 1000."
 
 #. type: Plain text
-#: ipptool.man:223
+#: ipptoolfile.5:408
+msgid ""
+"Specifies that the current test should be repeated when the response status-"
+"code matches or does not match the value specified by the STATUS directive."
+msgstr ""
+"Legt fest, dass der aktuelle Test wiederholt werden soll, wenn der "
+"Rückgabestatuscode (nicht) auf den durch die STATUS-Direktive angegebenen "
+"Wert passt."
+
+#. type: SS
+#: ipptoolfile.5:408
 #, no-wrap
+msgid "OPERATION CODES"
+msgstr "VORGANGSCODES"
+
+#. type: Plain text
+#: ipptoolfile.5:411
 msgid ""
-"I<color.jpg>\n"
-"I<create-printer-subscription.test>\n"
-"I<document-a4.pdf>\n"
-"I<document-a4.ps>\n"
-"I<document-letter.pdf>\n"
-"I<document-letter.ps>\n"
-"I<get-completed-jobs.test>\n"
-"I<get-jobs.test>\n"
-"I<get-notifications.test>\n"
-"I<get-printer-attributes.test>\n"
-"I<get-subscriptions.test>\n"
-"I<gray.jpg>\n"
-"I<ipp-1.1.test>\n"
-"I<ipp-2.0.test>\n"
-"I<ipp-2.1.test>\n"
-"I<ipp-2.2.test>\n"
-"I<ipp-everywhere.test>\n"
-"I<onepage-a4.pdf>\n"
-"I<onepage-a4.ps>\n"
-"I<onepage-letter.pdf>\n"
-"I<onepage-letter.ps>\n"
-"I<print-job.test>\n"
-"I<print-job-deflate.test>\n"
-"I<print-job-gzip.test>\n"
-"I<testfile.jpg>\n"
-"I<testfile.pcl>\n"
-"I<testfile.pdf>\n"
-"I<testfile.ps>\n"
-"I<testfile.txt>\n"
-"I<validate-job.test>\n"
+"Operation codes correspond to the hexadecimal numbers (0xHHHH) and names "
+"from RFC 8011 and other IPP extension specifications. Here is a complete "
+"list of names supported by B<ipptool>(8):"
 msgstr ""
-"I<color.jpg>\n"
-"I<create-printer-subscription.test>\n"
-"I<document-a4.pdf>\n"
-"I<document-a4.ps>\n"
-"I<document-letter.pdf>\n"
-"I<document-letter.ps>\n"
-"I<get-completed-jobs.test>\n"
-"I<get-jobs.test>\n"
-"I<get-notifications.test>\n"
-"I<get-printer-attributes.test>\n"
-"I<get-subscriptions.test>\n"
-"I<gray.jpg>\n"
-"I<ipp-1.1.test>\n"
-"I<ipp-2.0.test>\n"
-"I<ipp-2.1.test>\n"
-"I<ipp-2.2.test>\n"
-"I<ipp-everywhere.test>\n"
-"I<onepage-a4.pdf>\n"
-"I<onepage-a4.ps>\n"
-"I<onepage-letter.pdf>\n"
-"I<onepage-letter.ps>\n"
-"I<print-job.test>\n"
-"I<print-job-deflate.test>\n"
-"I<print-job-gzip.test>\n"
-"I<testfile.jpg>\n"
-"I<testfile.pcl>\n"
-"I<testfile.pdf>\n"
-"I<testfile.ps>\n"
-"I<testfile.txt>\n"
-"I<validate-job.test>\n"
+"Vorgangscodes entsprechen hexadezimalen Zahlen (0xHHHH) und Namen aus RFC "
+"8011 und anderen IPP-Erweiterungsspezifikationen. Hier ist die komplette "
+"Liste der von B<ipptool>(8) unterstützten Namen:"
 
 #. type: Plain text
-#: ipptool.man:228
+#: ipptoolfile.5:480
+#, no-wrap
 msgid ""
-"The B<ipptool> program is unique to CUPS and conforms to the Internet "
-"Printing Protocol up to version 2.2."
+"    Activate-Printer\n"
+"    CUPS-Accept-Jobs\n"
+"    CUPS-Add-Modify-Class\n"
+"    CUPS-Add-Modify-Printer\n"
+"    CUPS-Authenticate-Job\n"
+"    CUPS-Delete-Class\n"
+"    CUPS-Delete-Printer\n"
+"    CUPS-Get-Classes\n"
+"    CUPS-Get-Default\n"
+"    CUPS-Get-Devices\n"
+"    CUPS-Get-Document\n"
+"    CUPS-Get-PPD\n"
+"    CUPS-Get-PPDs\n"
+"    CUPS-Get-Printers\n"
+"    CUPS-Move-Job\n"
+"    CUPS-Reject-Jobs\n"
+"    CUPS-Set-Default\n"
+"    Cancel-Current-Job\n"
+"    Cancel-Job\n"
+"    Cancel-Jobs\n"
+"    Cancel-My-Jobs\n"
+"    Cancel-Subscription\n"
+"    Close-Job\n"
+"    Create-Job\n"
+"    Create-Job-Subscriptions\n"
+"    Create-Printer-Subscriptions\n"
+"    Deactivate-Printer\n"
+"    Disable-Printer\n"
+"    Enable-Printer\n"
+"    Get-Job-Attributes\n"
+"    Get-Jobs\n"
+"    Get-Notifications\n"
+"    Get-Printer-Attributes\n"
+"    Get-Printer-Support-Files\n"
+"    Get-Printer-Supported-Values\n"
+"    Get-Subscription-Attributes\n"
+"    Get-Subscriptions\n"
+"    Hold-Job\n"
+"    Hold-New-Jobs\n"
+"    Identify-Printer\n"
+"    Pause-Printer\n"
+"    Pause-Printer-After-Current-Job\n"
+"    Print-Job\n"
+"    Print-URI\n"
+"    Promote-Job\n"
+"    Purge-Jobs\n"
+"    Release-Held-New-Jobs\n"
+"    Release-Job\n"
+"    Renew-Subscription\n"
+"    Reprocess-Job\n"
+"    Restart-Job\n"
+"    Restart-Printer\n"
+"    Resubmit-Job\n"
+"    Resume-Job\n"
+"    Resume-Printer\n"
+"    Schedule-Job-After\n"
+"    Send-Document\n"
+"    Send-Hardcopy-Document\n"
+"    Send-Notifications\n"
+"    Send-URI\n"
+"    Set-Job-Attributes\n"
+"    Set-Printer-Attributes\n"
+"    Shutdown-Printer\n"
+"    Startup-Printer\n"
+"    Suspend-Current-Job\n"
+"    Validate-Document\n"
+"    Validate-Job\n"
 msgstr ""
-"Das Programm B<ipptool> ist eine Besonderheit von CUPS und konform zu der "
-"Spezifikation »Internet Printing Protocol« bis zu Version 2.2."
+"    Activate-Printer\n"
+"    CUPS-Accept-Jobs\n"
+"    CUPS-Add-Modify-Class\n"
+"    CUPS-Add-Modify-Printer\n"
+"    CUPS-Authenticate-Job\n"
+"    CUPS-Delete-Class\n"
+"    CUPS-Delete-Printer\n"
+"    CUPS-Get-Classes\n"
+"    CUPS-Get-Default\n"
+"    CUPS-Get-Devices\n"
+"    CUPS-Get-Document\n"
+"    CUPS-Get-PPD\n"
+"    CUPS-Get-PPDs\n"
+"    CUPS-Get-Printers\n"
+"    CUPS-Move-Job\n"
+"    CUPS-Reject-Jobs\n"
+"    CUPS-Set-Default\n"
+"    Cancel-Current-Job\n"
+"    Cancel-Job\n"
+"    Cancel-Jobs\n"
+"    Cancel-My-Jobs\n"
+"    Cancel-Subscription\n"
+"    Close-Job\n"
+"    Create-Job\n"
+"    Create-Job-Subscriptions\n"
+"    Create-Printer-Subscriptions\n"
+"    Deactivate-Printer\n"
+"    Disable-Printer\n"
+"    Enable-Printer\n"
+"    Get-Job-Attributes\n"
+"    Get-Jobs\n"
+"    Get-Notifications\n"
+"    Get-Printer-Attributes\n"
+"    Get-Printer-Support-Files\n"
+"    Get-Printer-Supported-Values\n"
+"    Get-Subscription-Attributes\n"
+"    Get-Subscriptions\n"
+"    Hold-Job\n"
+"    Hold-New-Jobs\n"
+"    Identify-Printer\n"
+"    Pause-Printer\n"
+"    Pause-Printer-After-Current-Job\n"
+"    Print-Job\n"
+"    Print-URI\n"
+"    Promote-Job\n"
+"    Purge-Jobs\n"
+"    Release-Held-New-Jobs\n"
+"    Release-Job\n"
+"    Renew-Subscription\n"
+"    Reprocess-Job\n"
+"    Restart-Job\n"
+"    Restart-Printer\n"
+"    Resubmit-Job\n"
+"    Resume-Job\n"
+"    Resume-Printer\n"
+"    Schedule-Job-After\n"
+"    Send-Document\n"
+"    Send-Hardcopy-Document\n"
+"    Send-Notifications\n"
+"    Send-URI\n"
+"    Set-Job-Attributes\n"
+"    Set-Printer-Attributes\n"
+"    Shutdown-Printer\n"
+"    Startup-Printer\n"
+"    Suspend-Current-Job\n"
+"    Validate-Document\n"
+"    Validate-Job\n"
+
+#. type: SS
+#: ipptoolfile.5:481
+#, no-wrap
+msgid "STATUS CODES"
+msgstr "STATUS-CODES"
+
+#. type: Plain text
+#: ipptoolfile.5:484
+msgid ""
+"Status codes correspond to the hexadecimal numbers (0xHHHH) and names from "
+"RFC 8011 and other IPP extension specifications. Here is a complete list of "
+"the names supported by B<ipptool>(8):"
+msgstr ""
+"Status-Codes entsprechend den hexadezimalen Zahlen (0xHHHH) und Namen aus "
+"RFC 8011 und anderen IPP-Erweiterungsspezifikationen. Hier ist die komplette "
+"Liste der von B<ipptool>(8) unterstützten Namen:"
+
+#. type: Plain text
+#: ipptoolfile.5:543
+#, no-wrap
+msgid ""
+"    client-error-account-authorization-failed\n"
+"    client-error-account-closed\n"
+"    client-error-account-info-needed\n"
+"    client-error-account-limit-reached\n"
+"    client-error-attributes-not-settable\n"
+"    client-error-attributes-or-values-not-supported\n"
+"    client-error-bad-request\n"
+"    client-error-charset-not-supported\n"
+"    client-error-compression-error\n"
+"    client-error-compression-not-supported\n"
+"    client-error-conflicting-attributes\n"
+"    client-error-document-access-error\n"
+"    client-error-document-format-error\n"
+"    client-error-document-format-not-supported\n"
+"    client-error-document-password-error\n"
+"    client-error-document-permission-error\n"
+"    client-error-document-security-error\n"
+"    client-error-document-unprintable-error\n"
+"    client-error-forbidden\n"
+"    client-error-gone\n"
+"    client-error-ignored-all-notifications\n"
+"    client-error-ignored-all-subscriptions\n"
+"    client-error-not-authenticated\n"
+"    client-error-not-authorized\n"
+"    client-error-not-found\n"
+"    client-error-not-possible\n"
+"    client-error-print-support-file-not-found\n"
+"    client-error-request-entity-too-large\n"
+"    client-error-request-value-too-long\n"
+"    client-error-timeout\n"
+"    client-error-too-many-subscriptions\n"
+"    client-error-uri-scheme-not-supported\n"
+"    cups-error-account-authorization-failed\n"
+"    cups-error-account-closed\n"
+"    cups-error-account-info-needed\n"
+"    cups-error-account-limit-reached\n"
+"    cups-see-other\n"
+"    redirection-other-site\n"
+"    server-error-busy\n"
+"    server-error-device-error\n"
+"    server-error-internal-error\n"
+"    server-error-job-canceled\n"
+"    server-error-multiple-document-jobs-not-supported\n"
+"    server-error-not-accepting-jobs\n"
+"    server-error-operation-not-supported\n"
+"    server-error-printer-is-deactivated\n"
+"    server-error-service-unavailable\n"
+"    server-error-temporary-error\n"
+"    server-error-version-not-supported\n"
+"    successful-ok\n"
+"    successful-ok-but-cancel-subscription\n"
+"    successful-ok-conflicting-attributes\n"
+"    successful-ok-events-complete\n"
+"    successful-ok-ignored-notifications\n"
+"    successful-ok-ignored-or-substituted-attributes\n"
+"    successful-ok-ignored-subscriptions\n"
+"    successful-ok-too-many-events\n"
+msgstr ""
+"    client-error-account-authorization-failed\n"
+"    client-error-account-closed\n"
+"    client-error-account-info-needed\n"
+"    client-error-account-limit-reached\n"
+"    client-error-attributes-not-settable\n"
+"    client-error-attributes-or-values-not-supported\n"
+"    client-error-bad-request\n"
+"    client-error-charset-not-supported\n"
+"    client-error-compression-error\n"
+"    client-error-compression-not-supported\n"
+"    client-error-conflicting-attributes\n"
+"    client-error-document-access-error\n"
+"    client-error-document-format-error\n"
+"    client-error-document-format-not-supported\n"
+"    client-error-document-password-error\n"
+"    client-error-document-permission-error\n"
+"    client-error-document-security-error\n"
+"    client-error-document-unprintable-error\n"
+"    client-error-forbidden\n"
+"    client-error-gone\n"
+"    client-error-ignored-all-notifications\n"
+"    client-error-ignored-all-subscriptions\n"
+"    client-error-not-authenticated\n"
+"    client-error-not-authorized\n"
+"    client-error-not-found\n"
+"    client-error-not-possible\n"
+"    client-error-print-support-file-not-found\n"
+"    client-error-request-entity-too-large\n"
+"    client-error-request-value-too-long\n"
+"    client-error-timeout\n"
+"    client-error-too-many-subscriptions\n"
+"    client-error-uri-scheme-not-supported\n"
+"    cups-error-account-authorization-failed\n"
+"    cups-error-account-closed\n"
+"    cups-error-account-info-needed\n"
+"    cups-error-account-limit-reached\n"
+"    cups-see-other\n"
+"    redirection-other-site\n"
+"    server-error-busy\n"
+"    server-error-device-error\n"
+"    server-error-internal-error\n"
+"    server-error-job-canceled\n"
+"    server-error-multiple-document-jobs-not-supported\n"
+"    server-error-not-accepting-jobs\n"
+"    server-error-operation-not-supported\n"
+"    server-error-printer-is-deactivated\n"
+"    server-error-service-unavailable\n"
+"    server-error-temporary-error\n"
+"    server-error-version-not-supported\n"
+"    successful-ok\n"
+"    successful-ok-but-cancel-subscription\n"
+"    successful-ok-conflicting-attributes\n"
+"    successful-ok-events-complete\n"
+"    successful-ok-ignored-notifications\n"
+"    successful-ok-ignored-or-substituted-attributes\n"
+"    successful-ok-ignored-subscriptions\n"
+"    successful-ok-too-many-events\n"
+
+#. type: SS
+#: ipptoolfile.5:544
+#, no-wrap
+msgid "TAGS"
+msgstr "MARKIERUNGEN"
+
+#. type: Plain text
+#: ipptoolfile.5:546
+msgid ""
+"Value and group tags correspond to the names from RFC 8011 and other IPP "
+"extension specifications. Here are the group tags:"
+msgstr ""
+"Werte- und Gruppenmarkierungen entsprechen den Namen aus RFC 8011 und "
+"anderen IPP-Erweiterungsspezifikationen. Hier sind die Gruppenmarkierungen:"
+
+#. type: Plain text
+#: ipptoolfile.5:555
+#, no-wrap
+msgid ""
+"    document-attributes-tag\n"
+"    event-notification-attributes-tag\n"
+"    job-attributes-tag\n"
+"    operation-attributes-tag\n"
+"    printer-attributes-tag\n"
+"    subscription-attributes-tag\n"
+"    unsupported-attributes-tag\n"
+msgstr ""
+"    document-attributes-tag\n"
+"    event-notification-attributes-tag\n"
+"    job-attributes-tag\n"
+"    operation-attributes-tag\n"
+"    printer-attributes-tag\n"
+"    subscription-attributes-tag\n"
+"    unsupported-attributes-tag\n"
+
+#. type: Plain text
+#: ipptoolfile.5:558
+msgid "Here are the value tags:"
+msgstr "Hier sind die Wertemarkierungen:"
+
+#. type: Plain text
+#: ipptoolfile.5:585
+#, no-wrap
+msgid ""
+"    admin-define\n"
+"    boolean\n"
+"    charset\n"
+"    collection\n"
+"    dateTime\n"
+"    default\n"
+"    delete-attribute\n"
+"    enum\n"
+"    integer\n"
+"    keyword\n"
+"    mimeMediaType\n"
+"    nameWithLanguage\n"
+"    nameWithoutLanguage\n"
+"    naturalLanguage\n"
+"    no-value\n"
+"    not-settable\n"
+"    octetString\n"
+"    rangeOfInteger\n"
+"    resolution\n"
+"    textWithLanguage\n"
+"    textWithoutLanguage\n"
+"    unknown\n"
+"    unsupported\n"
+"    uri\n"
+"    uriScheme\n"
+msgstr ""
+"    admin-define\n"
+"    boolean\n"
+"    charset\n"
+"    collection\n"
+"    dateTime\n"
+"    default\n"
+"    delete-attribute\n"
+"    enum\n"
+"    integer\n"
+"    keyword\n"
+"    mimeMediaType\n"
+"    nameWithLanguage\n"
+"    nameWithoutLanguage\n"
+"    naturalLanguage\n"
+"    no-value\n"
+"    not-settable\n"
+"    octetString\n"
+"    rangeOfInteger\n"
+"    resolution\n"
+"    textWithLanguage\n"
+"    textWithoutLanguage\n"
+"    unknown\n"
+"    unsupported\n"
+"    uri\n"
+"    uriScheme\n"
+
+#. type: SS
+#: ipptoolfile.5:586
+#, no-wrap
+msgid "VARIABLES"
+msgstr "VARIABLEN"
 
 #. type: Plain text
-#: ipptool.man:230
-msgid "Get a list of completed jobs for \"myprinter\":"
-msgstr "Eine Liste von abgeschlossenen Aufträgen für »MeinDrucker« ermitteln:"
+#: ipptoolfile.5:590
+msgid ""
+"The B<ipptool>(8)  program maintains a list of variables that can be used in "
+"any literal string or attribute value by specifying \"I<$variable-name>\". "
+"Aside from variables defined using the I<-d> option or B<DEFINE> directive, "
+"the following pre-defined variables are available:"
+msgstr ""
+"Das Programm B<ipptool>(8) verwaltet eine Liste von Variablen, die in jeder "
+"Zeichenkette oder jedem Attributswert über Angabe von »I<$variable-name>« "
+"verwandt werden können. Neben den durch die Option I<-d> oder der Direktiven "
+"B<DEFINE> angegebenen Variablen sind folgende vordefinierte Variablen "
+"verfügbar:"
+
+#. type: TP
+#: ipptoolfile.5:590
+#, no-wrap
+msgid "B<$$>"
+msgstr "B<$$>"
 
 #. type: Plain text
-#: ipptool.man:233
+#: ipptoolfile.5:593
+msgid "Inserts a single \"$\" character."
+msgstr "Fügt ein einzelnes »$«-Zeichen ein."
+
+#. type: TP
+#: ipptoolfile.5:593
 #, no-wrap
-msgid "    ipptool ipp://localhost/printers/myprinter get-completed-jobs.test\n"
-msgstr "    ipptool ipp://localhost/printers/MeinDrucker get-completed-jobs.test\n"
+msgid "B<$ENV[>I<name>B<]>"
+msgstr "B<$ENV[>I<Name>B<]>"
 
 #. type: Plain text
-#: ipptool.man:236
+#: ipptoolfile.5:596
 msgid ""
-"Send email notifications to \"user@example.com\" when \"myprinter\" changes:"
+"Inserts the value of the named environment variable, or an empty string if "
+"the environment variable is not defined."
 msgstr ""
-"Eine E-Mail-Benachrichtigung an »user@example.com« senden, wenn sich "
-"»MeinDrucker« ändert:"
+"Fügt den Wert der benannten Umgebungsvariablen oder eine leere Zeichenkette, "
+"falls die Umgebungsvariable nicht definiert ist, ein."
+
+#. type: TP
+#: ipptoolfile.5:596
+#, fuzzy, no-wrap
+msgid "B<$date-current>"
+msgstr "B<-H restart>"
 
 #. type: Plain text
-#: ipptool.man:240
-#, no-wrap
+#: ipptoolfile.5:599
 msgid ""
-"    ipptool -d recipient=mailto:user@example.com \\e\n"
-"        ipp://localhost/printers/myprinter create-printer-subscription.test\n"
+"Inserts the current date and time using the ISO-8601 format (\"yyyy-mm-ddThh:"
+"mm:ssZ\")."
 msgstr ""
-"    ipptool -d recipient=mailto:user@example.com \\e\n"
-"        ipp://localhost/printers/myprinter create-printer-subscription.test\n"
+
+#. type: TP
+#: ipptoolfile.5:599
+#, fuzzy, no-wrap
+msgid "B<$date-start>"
+msgstr "B<-H restart>"
 
 #. type: Plain text
-#: ipptool.man:246
+#: ipptoolfile.5:602
 msgid ""
-"B<ipptoolfile>(5), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
-"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
-"ipp)  RFC 8011 (http://tools.ietf.org/html/rfc8011),"
+"Inserts the starting date and time using the ISO-8601 format (\"yyyy-mm-"
+"ddThh:mm:ssZ\")."
 msgstr ""
-"B<ipptoolfile>(5), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
-"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
-"ipp)  RFC 8011 (http://tools.ietf.org/html/rfc8011),"
-
-#. type: TH
-#: lpadmin.man:13
-#, no-wrap
-msgid "lpadmin"
-msgstr "lpadmin"
 
-#. type: TH
-#: lpadmin.man:13
+#. type: TP
+#: ipptoolfile.5:602
 #, no-wrap
-msgid "19 August 2018"
-msgstr "19. August 2018"
-
-#. type: Plain text
-#: lpadmin.man:16
-msgid "lpadmin - configure cups printers and classes"
-msgstr "lpadmin - CUPS-Treiber und -Klassen konfigurieren"
+msgid "B<$filename>"
+msgstr "B<$filename>"
 
 #. type: Plain text
-#: lpadmin.man:28
-msgid ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
-"B<-d> I<destination>"
+#: ipptoolfile.5:607
+msgid "Inserts the filename provided to B<ipptool>(8)  with the I<-f> option."
 msgstr ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-h >I<Server>[B<:"
-">I<Port>] ] B<-d> I<Ziel>"
+"Fügt den mit der Option I<-f> an B<ipptool>(8) bereitgestellten Dateinamen "
+"ein."
 
-#. type: Plain text
-#: lpadmin.man:45
-msgid ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
-"B<-p> I<destination> [ B<-R> I<name-default> ] I<option(s)>"
-msgstr ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-h >I<Server>[B<:"
-">I<Port>] ] B<-p> I<Ziel> [ B<-R> I<Standardname> ] I<Option(en)>"
+#. type: TP
+#: ipptoolfile.5:607
+#, no-wrap
+msgid "B<$filetype>"
+msgstr "B<$filetype>"
 
 #. type: Plain text
-#: lpadmin.man:57
+#: ipptoolfile.5:612
 msgid ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
-"B<-x> I<destination>"
+"Inserts the MIME media type for the filename provided to B<ipptool>(8)  with "
+"the I<-f> option."
 msgstr ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-h >I<Server>[B<:"
-">I<Port>] ] B<-x> I<Ziel>"
+"Fügt den MIME-Medientyp für den mit der Option I<-f> an B<ipptool>(8) "
+"bereitgestellten Dateinamen ein."
+
+#. type: TP
+#: ipptoolfile.5:612
+#, no-wrap
+msgid "B<$hostname>"
+msgstr "B<$hostname>"
 
 #. type: Plain text
-#: lpadmin.man:60
-msgid ""
-"B<lpadmin> configures printer and class queues provided by CUPS.  It can "
-"also be used to set the server default printer or class."
-msgstr ""
-"B<lpadmin> konfiguriert von CUPS bereitgestellte Warteschlangen für Drucker "
-"und Druckerklassen. Es kann auch zur Einstellung des Standarddruckers oder "
-"der Standardklasse verwandt werden."
+#: ipptoolfile.5:616
+msgid "Inserts the hostname from the URI provided to B<ipptool>(8)."
+msgstr "Fügt den Rechnernamen aus der B<ipptool>(8) bereitgestellten URI ein."
+
+#. type: TP
+#: ipptoolfile.5:616
+#, no-wrap
+msgid "B<$job-id>"
+msgstr "B<$job-id>"
 
 #. type: Plain text
-#: lpadmin.man:62
+#: ipptoolfile.5:619
 msgid ""
-"When specified before the I<-d>, I<-p>, or I<-x> options, the I<-E> option "
-"forces encryption when connecting to the server."
+"Inserts the last \"job-id\" attribute value returned in a test response or 0 "
+"if no \"job-id\" attribute has been seen."
 msgstr ""
-"Wird die Option I<-E> vor den Optionen I<-d>, I<-p> oder I<-x> verwandt, so "
-"erzwingt sie die Verschlüsselung bei Verbindungen zum Server."
+"Fügt den letzten in einer Testantwort zurückgelieferten »job-id«-"
+"Attributwert oder 0, falls kein Attribut »job-id« gesehen wurde, ein."
+
+#. type: TP
+#: ipptoolfile.5:619
+#, no-wrap
+msgid "B<$job-uri>"
+msgstr "B<$job-uri>"
 
 #. type: Plain text
-#: lpadmin.man:71
+#: ipptoolfile.5:622
 msgid ""
-"The first form of the command (I<-d>) sets the default printer or class to "
-"I<destination>.  Subsequent print jobs submitted via the B<lp>(1)  or "
-"B<lpr>(1)  commands will use this destination unless the user specifies "
-"otherwise with the B<lpoptions>(1)  command."
+"Inserts the last \"job-uri\" attribute value returned in a test response or "
+"an empty string if no \"job-uri\" attribute has been seen."
 msgstr ""
-"Die erste Form des Befehls (I<-d>) setzt den Standarddrucker oder Klasse auf "
-"I<Ziel>. Folgende Druckaufträge, die mit den Befehlen B<lp>(1) oder "
-"B<lpr>(1) eingereicht werden, verwenden dieses Ziel solange der Benutzer "
-"nichts anderes mit dem Befehl B<lpoptions>(1) festgelegt hat."
+"Fügt den letzten in einer Testantwort zurückgelieferten »job-uri«-"
+"Attributwert oder eine leere Zeichenkette, falls kein Attribut »job-uri« "
+"gesehen wurde, ein."
+
+#. type: TP
+#: ipptoolfile.5:622
+#, no-wrap
+msgid "B<$notify-subscription-id>"
+msgstr "B<$notify-subscription-id>"
 
 #. type: Plain text
-#: lpadmin.man:73
+#: ipptoolfile.5:625
 msgid ""
-"The second form of the command (I<-p>) configures the named printer or "
-"class.  The additional options are described below."
+"Inserts the last \"notify-subscription-id\" attribute value returned in a "
+"test response or 0 if no \"notify-subscription-id\" attribute has been seen."
 msgstr ""
-"Die zweite Form des Befehls (I<-p>) konfiguriert den benannten Drucker oder "
-"Klasse. Die zusätzlichen Optionen sind unten beschrieben."
+"Fügt den letzten in einer Testantwort zurückgelieferten »notify-subscription-"
+"id«-Attributwert oder 0, falls kein Attribut »notify-subscription-id« "
+"gesehen wurde, ein."
+
+#. type: TP
+#: ipptoolfile.5:625
+#, no-wrap
+msgid "B<$port>"
+msgstr "B<$port>"
 
 #. type: Plain text
-#: lpadmin.man:76
-msgid ""
-"The third form of the command (I<-x>) deletes the printer or class "
-"I<destination>.  Any jobs that are pending for the destination will be "
-"removed and any job that is currently printed will be aborted."
-msgstr ""
-"Die dritte Form des Befehls (I<-x>) löscht den Drucker oder Klasse I<Ziel>. "
-"Alle Aufträge, die für dieses Ziel noch warten, werden entfernt und im Druck "
-"befindliche Aufträge werden abgebrochen."
+#: ipptoolfile.5:629
+msgid "Inserts the port number from the URI provided to B<ipptool>(8)."
+msgstr "Fügt die Portnummer aus der an B<ipptool>(8) übergebenen URI ein."
+
+#. type: TP
+#: ipptoolfile.5:629
+#, no-wrap
+msgid "B<$resource>"
+msgstr "B<$resource>"
 
 #. type: Plain text
-#: lpadmin.man:78
-msgid "The following options are recognized when configuring a printer queue:"
-msgstr ""
-"Die folgenden Optionen werden bei der Konfiguration einer "
-"Druckerwarteschlange verstanden:"
+#: ipptoolfile.5:633
+msgid "Inserts the resource path from the URI provided to B<ipptool>(8)."
+msgstr "Fügt den Ressourcenpfad aus der an B<ipptool>(8) übergebenen URI ein."
 
 #. type: TP
-#: lpadmin.man:78
+#: ipptoolfile.5:633
 #, no-wrap
-msgid "B<-c >I<class>"
-msgstr "B<-c >I<Klasse>"
+msgid "B<$scheme>"
+msgstr "B<$scheme>"
 
 #. type: Plain text
-#: lpadmin.man:82
-msgid ""
-"Adds the named I<printer> to I<class>.  If I<class> does not exist it is "
-"created automatically."
-msgstr ""
-"Fügt den benannten I<Drucker> zu der I<Klasse> hinzu. Falls I<Klasse> nicht "
-"existiert, so wird sie automatisch erstellt."
+#: ipptoolfile.5:637
+msgid "Inserts the scheme from the URI provided to B<ipptool>(8)."
+msgstr "Fügt das Schema aus der B<ipptool>(8) übergebenen URI ein."
 
 #. type: TP
-#: lpadmin.man:82
+#: ipptoolfile.5:637
 #, no-wrap
-msgid "B<-i >I<ppd-file>"
-msgstr "B<-i >I<PPD-Datei>"
+msgid "B<$uri>"
+msgstr "B<$uri>"
+
+#. type: Plain text
+#: ipptoolfile.5:641
+msgid "Inserts the URI provided to B<ipptool>(8)."
+msgstr "Fügt die an B<ipptool>(8) übergebene URI ein."
 
 #. type: TP
-#: lpadmin.man:84
+#: ipptoolfile.5:641
 #, no-wrap
-msgid "B<-P >I<ppd-file>"
-msgstr "B<-P >I<PPD-Datei>"
+msgid "B<$uriuser>"
+msgstr "B<$uriuser>"
 
 #. type: Plain text
-#: lpadmin.man:87
-msgid ""
-"Specifies a PostScript Printer Description (PPD) file to use with the "
-"printer."
+#: ipptoolfile.5:646
+msgid "Inserts the username from the URI provided to B<ipptool>(8), if any."
 msgstr ""
-"Legt eine mit diesem Drucker zu verwendende PostScript-Printer-Description-"
-"(PPD)-Datei fest."
+"Fügt den Benutzernamen aus der B<ipptool>(8) übergebenen URI ein, falls "
+"vorhanden."
+
+#. type: TP
+#: ipptoolfile.5:646
+#, no-wrap
+msgid "B<$user>"
+msgstr "B<$user>"
 
 #. type: Plain text
-#: lpadmin.man:95
-#, fuzzy
+#: ipptoolfile.5:649
+msgid "Inserts the current user's login name."
+msgstr "Fügt den Anmeldenamen des aktuellen Benutzers ein."
+
+#. type: Plain text
+#: ipptoolfile.5:654
 msgid ""
-"Sets a standard PPD file for the printer from the I<model> directory or "
-"using one of the driver interfaces.  Use the I<-m> option with the "
-"B<lpinfo>(8)  command to get a list of supported models.  The model \"raw\" "
-"clears any existing PPD file and the model \"everywhere\" queries the "
-"printer referred to by the specified IPP I<device-uri>.  Note: The \"raw\" "
-"model is deprecated and will not be supported in a future version of CUPS."
+"B<ipptool>(1), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
+"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
+"ipp), RFC 8011 (http://tools.ietf.org/html/rfc8011)"
 msgstr ""
-"Setzt eine Standard-PPD-Datei für den Drucker aus dem Verzeichnis I<Model> "
-"oder verwendet eine der Druckerschnittstellen. Verwenden Sie die Option I<-"
-"m> mit dem Befehl B<lpinfo>(8), um eine Liste der unterstützten Modelle zu "
-"erhalten. Das Modell »raw« bereinigt jede PPD-Datei und das Modell "
-"»everywhere« fragt die von der angegebenen IPP-I<Geräte-URI> referenzierten "
-"Drucker ab. Hinweis: Das Model »raw« ist veraltet und wird in einer "
-"zukünftigen Version von CUPS nicht mehr unterstützt."
+"B<ipptool>(1), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
+"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
+"ipp), RFC 8011 (http://tools.ietf.org/html/rfc8011)"
 
-#. type: TP
-#: lpadmin.man:95
+#. type: TH
+#: lp.1:10
 #, no-wrap
-msgid "B<-o cupsIPPSupplies=true>"
-msgstr "B<-o cupsIPPSupplies=true>"
+msgid "lp"
+msgstr "lp"
 
-#. type: TP
-#: lpadmin.man:97
-#, no-wrap
-msgid "B<-o cupsIPPSupplies=false>"
-msgstr "B<-o cupsIPPSupplies=false>"
+#. type: Plain text
+#: lp.1:13
+msgid "lp - print files"
+msgstr "lp - Dateien drucken"
+
+#. type: Plain text
+#: lp.1:52
+msgid ""
+"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-d >I<destination>[B</"
+">I<instance>] ] [ B<-h >I<hostname>[B<:>I<port>] ] [ B<-m> ] [ B<-n> I<num-"
+"copies> ] [ B<-o >I<option>[B<=>I<value>] ] [ B<-q> I<priority> ] [ B<-s> ] "
+"[ B<-t> I<title> ] [ B<-H> I<handling> ] [ B<-P> I<page-list> ] [ B<--> ] "
+"[ I<file(s)> ]"
+msgstr ""
+"B<lp> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-c> ] [ B<-d >I<Ziel>[B</"
+">I<Instanz>] ] [ B<-h >I<Rechnername>[B<:>I<Port>] ] [ B<-m> ] [ B<-n> I<Anz-"
+"Kopien> ] [ B<-o >I<Option>[B<=>I<Wert>] ] [ B<-q> I<Priorität> ] [ B<-s> ] "
+"[ B<-t> I<Titel> ] [ B<-H> I<Handhabung> ] [ B<-P> I<Seitenliste> ] [ B<--"
+"> ] [ I<Datei(en)> ]"
 
 #. type: Plain text
-#: lpadmin.man:100
-msgid "Specifies whether IPP supply level values should be reported."
-msgstr "Legt fest, ob IPP-Bereitstellungsstufen berichtet werden sollen."
-
-#. type: TP
-#: lpadmin.man:100
-#, no-wrap
-msgid "B<-o cupsSNMPSupplies=true>"
-msgstr "B<-o cupsSNMPSupplies=true>"
-
-#. type: TP
-#: lpadmin.man:102
-#, no-wrap
-msgid "B<-o cupsSNMPSupplies=false>"
-msgstr "B<-o cupsSNMPSupplies=false>"
+#: lp.1:84
+msgid ""
+"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h >I<hostname>[B<:"
+">I<port>] ] [ B<-i> I<job-id> ] [ B<-n> I<num-copies> ] [ B<-o "
+">I<option>[B<=>I<value>] ] [ B<-q> I<priority> ] [ B<-t> I<title> ] [ B<-H> "
+"I<handling> ] [ B<-P> I<page-list> ]"
+msgstr ""
+"B<lp> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-c> ] [ B<-h "
+">I<Rechnername>[B<:>I<Port>] ] [ B<-i> I<Auftrags-ID> ] [ B<-n> I<Anz-"
+"Kopien> ] [ B<-o >I<Option>[B<=>I<Wert>] ] [ B<-q> I<Priorität> ] [ B<-t> "
+"I<Titel> ] [ B<-H> I<Handhabung> ] [ B<-P> I<Seitenliste> ]"
 
 #. type: Plain text
-#: lpadmin.man:105
+#: lp.1:87
 msgid ""
-"Specifies whether SNMP supply level (RFC 3805) values should be reported."
+"B<lp> submits files for printing or alters a pending job.  Use a filename of "
+"\"-\" to force printing from the standard input."
 msgstr ""
-"Legt fest, ob SNMP-Bereitstellungsstufen (RFC 3805) berichtet werden sollen."
+"B<lp> reicht Dateien zum Druck ein oder ändert einen anhängenden "
+"Druckauftrag. Verwenden Sie als Dateinamen »-«, um das Drucken von der "
+"Standardeingabe zu erzwingen."
 
-#. type: TP
-#: lpadmin.man:105
+#. type: SS
+#: lp.1:87 lpr.1:57
 #, no-wrap
-msgid "B<-o job-k-limit=>I<value>"
-msgstr "B<-o job-k-limit=>I<Wert>"
+msgid "THE DEFAULT DESTINATION"
+msgstr "DAS VORGABEZIEL"
 
 #. type: Plain text
-#: lpadmin.man:109
+#: lp.1:94 lpr.1:64
 msgid ""
-"Sets the kilobyte limit for per-user quotas.  The value is an integer number "
-"of kilobytes; one kilobyte is 1024 bytes."
+"CUPS provides many ways to set the default destination. The B<LPDEST> and "
+"B<PRINTER> environment variables are consulted first.  If neither are set, "
+"the current default set using the B<lpoptions>(1)  command is used, followed "
+"by the default set using the B<lpadmin>(8)  command."
 msgstr ""
-"Setzt die Begrenzung in Kilobyte für pro-Benutzer-Quotas. Der Wert ist eine "
-"Ganzzahl von Kilobytes, ein Kilobyte ist 1024 Bytes."
+"CUPS stellt viele Möglichkeiten bereit, das Vorgabeziel zu setzen. Die "
+"Umgebungsvariablen B<LPDEST> und B<PRINTER> werden zuerst herangezogen. Wenn "
+"keine von beiden gesetzt ist, wird der aktuell unter Benutzung des Befehls "
+"B<lpoptions>(1) gesetzte benutzt, gefolgt von der durch den Befehl "
+"B<lpadmin>(8) gesetzten Vorgabe."
+
+#. type: Plain text
+#: lp.1:96
+msgid "The following options are recognized by I<lp>:"
+msgstr "Die folgenden Optionen werden von I<lp> erkannt:"
 
 #. type: TP
-#: lpadmin.man:109
+#: lp.1:96
 #, no-wrap
-msgid "B<-o job-page-limit=>I<value>"
-msgstr "B<-o job-page-limit=>I<Wert>"
+msgid "B<-->"
+msgstr "B<-->"
 
 #. type: Plain text
-#: lpadmin.man:113
+#: lp.1:99
 msgid ""
-"Sets the page limit for per-user quotas.  The value is the integer number of "
-"pages that can be printed; double-sided pages are counted as two pages."
+"Marks the end of options; use this to print a file whose name begins with a "
+"dash (-)."
 msgstr ""
-"Setzt eine Seitenbegrenzung für pro-Benutzer-Quotas. Der Wert ist eine "
-"Ganzzahl von Seiten, die gedruckt werden können. Doppelseitige Seiten werden "
-"als zwei Seiten gezählt."
-
-#. type: TP
-#: lpadmin.man:113
-#, no-wrap
-msgid "B<-o job-quota-period=>I<value>"
-msgstr "B<-o job-quota-period=>I<Wert>"
+"Markiert das Ende der Optionen; verwenden Sie dies, um eine Datei zu "
+"drucken, deren Namen mit einem Bindestrich (-) beginnt."
 
 #. type: Plain text
-#: lpadmin.man:117
+#: lp.1:109
 msgid ""
-"Sets the accounting period for per-user quotas.  The value is an integer "
-"number of seconds; 86,400 seconds are in one day."
+"This option is provided for backwards-compatibility only. On systems that "
+"support it, this option forces the print file to be copied to the spool "
+"directory before printing.  In CUPS, print files are always sent to the "
+"scheduler via IPP which has the same effect."
 msgstr ""
-"Setzt die Berechnungsperiode für Quotas je Benutzer. Der Wert ist eine "
-"Ganzzahl von Sekunden; 86.400 Sekunden sind ein Tag."
+"Diese Option wird nur zur Rückwärtskompatibilität bereitgestellt. Auf "
+"Systemen, die sie unterstützen, erzwingt die Option, dass die Druckdatei vor "
+"dem Drucken in das Spool-Verzeichnis kopiert wird. In CUPS werden die "
+"Dateien immer via IPP zum Auftragsplaner (Scheduler) geschickt, was den "
+"gleichen Effekt bewirkt."
 
 #. type: TP
-#: lpadmin.man:117
+#: lp.1:109
 #, no-wrap
-msgid "B<-o job-sheets-default=>I<banner>"
-msgstr "B<-o job-sheets-default=>I<Deckblatt>"
+msgid "B<-d >I<destination>"
+msgstr "B<-d >I<Ziel>"
+
+#. type: Plain text
+#: lp.1:112 lpr.1:82
+msgid "Prints files to the named printer."
+msgstr "Druckt Dateien auf den benannten Drucker."
 
 #. type: TP
-#: lpadmin.man:119
+#: lp.1:115
 #, no-wrap
-msgid "B<-o job-sheets-default=>I<banner>B<,>I<banner>"
-msgstr "B<-o job-sheets-default=>I<Deckblatt>B<,>I<Deckblatt>"
+msgid "B<-i >I<job-id>"
+msgstr "B<-i >I<Auftrags-ID>"
 
 #. type: Plain text
-#: lpadmin.man:122
-msgid "Sets the default banner page(s) to use for print jobs."
-msgstr "Legt das/die Standarddeckblätter für das Drucken von Aufträgen fest."
+#: lp.1:118
+msgid "Specifies an existing job to modify."
+msgstr "Legt einen existierenden Auftrag, der geändert werden soll, fest."
 
 #. type: TP
-#: lpadmin.man:122
+#: lp.1:118 lpr.1:95 ppdc.1:70
 #, no-wrap
-msgid "B<-o >I<name>B<=>I<value>"
-msgstr "B<-o >I<Name>B<=>I<Wert>"
+msgid "B<-m>"
+msgstr "B<-m>"
 
 #. type: Plain text
-#: lpadmin.man:128
-msgid ""
-"Sets a PPD option for the printer.  PPD options can be listed using the I<-"
-"l> option with the B<lpoptions>(1)  command."
-msgstr ""
-"Setzt eine PPD-Option für den Drucker. PPD-Optionen können mittels der "
-"Option I<-l> des Befehls B<lpoptions>(1) aufgelistet werden."
+#: lp.1:121
+msgid "Sends an email when the job is completed."
+msgstr "Schickt eine E-Mail, wenn der Auftrag ausgeführt ist."
+
+#. type: Plain text
+#: lp.1:124 lpr.1:88
+msgid "Sets the number of copies to print."
+msgstr "Setzt die Anzahl der zu druckenden Kopien."
 
 #. type: TP
-#: lpadmin.man:128
+#: lp.1:124
 #, no-wrap
-msgid "B<-o >I<name>B<-default=>I<value>"
-msgstr "B<-o >I<Name>B<-default=>I<Wert>"
+msgid "B<-o \">I<name>B<=>I<value >[ ... I<name>B<=>I<value >]B<\">"
+msgstr "B<-o \">I<Name>B<=>I<Wert >[ … I<Name>B<=>I<Wert >]B<\">"
 
 #. type: Plain text
-#: lpadmin.man:132
-msgid ""
-"Sets a default server-side option for the destination.  Any print-time "
-"option can be defaulted, e.g., \"-o number-up-default=2\" to set the default "
-"\"number-up\" option value to 2."
+#: lp.1:128
+msgid "Sets one or more job options.  See \"COMMON JOB OPTIONS\" below."
 msgstr ""
-"Setzt eine serverseitige Standardoption für das Ziel. Jede Option zur "
-"Druckzeit kann mit einem Standardwert belegt werden, z.B. »-o number-up-"
-"default=2«, um den Standard-»number-up«-Optionswert auf 2 zu setzen."
+"Setzt eine oder mehrere Optionen für den Auftrag. Siehe »HÄUFIGE "
+"DRUCKAUFTRAGSOPTIONEN« unten."
 
 #. type: TP
-#: lpadmin.man:132
+#: lp.1:128
 #, no-wrap
-msgid "B<-o port-monitor=>I<name>"
-msgstr "B<-o port-monitor=>I<Name>"
+msgid "B<-q >I<priority>"
+msgstr "B<-q >I<Priorität>"
 
 #. type: Plain text
-#: lpadmin.man:137
+#: lp.1:132
 msgid ""
-"Sets the binary communications program to use when printing, \"none\", \"bcp"
-"\", or \"tbcp\".  The default program is \"none\".  The specified port "
-"monitor must be listed in the printer's PPD file."
+"Sets the job priority from 1 (lowest) to 100 (highest).  The default "
+"priority is 50."
 msgstr ""
-"Setzt das binäre Kommunikationsprogramm, das benutzt wird, um »none«, »bcp« "
-"oder »tbcp« zu drucken. Das Standardprogramm ist »none«. Der angegebene "
-"Monitorport muss in der PPD-Datei des Druckers aufgelistet sein."
+"Setzt die Auftragspriorität von 1 (am niedrigsten) bis 100 (am höchsten). "
+"Die Standardpriorität beträgt 50."
+
+#. type: Plain text
+#: lp.1:135
+msgid "Do not report the resulting job IDs (silent mode.)"
+msgstr "Die sich ergebenden Druckauftrags-IDs nicht berichten (stiller Modus)."
 
 #. type: TP
-#: lpadmin.man:137
+#: lp.1:135
 #, no-wrap
-msgid "B<-o printer-error-policy=>I<name>"
-msgstr "B<-o printer-error-policy=>I<Name>"
+msgid "B<-t \">I<name>B<\">"
+msgstr "B<-t \">I<Name>B<\">"
 
 #. type: Plain text
-#: lpadmin.man:143
-#, fuzzy
-msgid ""
-"Sets the error policy to be used when the printer backend is unable to send "
-"the job to the printer.  The name must be one of \"abort-job\", \"retry-job"
-"\", \"retry-current-job\", or \"stop-printer\".  The default error policy is "
-"\"stop-printer\" for printers and \"retry-current-job\" for classes."
-msgstr ""
-"Setzt die Fehlerrichtlinie, die benutzt wird, wenn das Drucker-Backend den "
-"Druckauftrag nicht an den Drucker senden kann. Der Name muss entweder »abort-"
-"job«, »retry-job«, »retry-current-job« oder »stop-printer« sein. Die "
-"Standardfehlerrichtlinie ist »stop-printer« für Drucker und »retry-current-"
-"job« für Klassen."
+#: lp.1:138
+msgid "Sets the job name."
+msgstr "Setzt den Namen des Auftrags."
 
 #. type: TP
-#: lpadmin.man:143
+#: lp.1:138
 #, no-wrap
-msgid "B<-o printer-is-shared=true>"
-msgstr "B<-o printer-is-shared=true>"
+msgid "B<-H >I<hh:mm>"
+msgstr "B<-H >I<hh:mm>"
 
 #. type: TP
-#: lpadmin.man:145
+#: lp.1:140
 #, no-wrap
-msgid "B<-o printer-is-shared=false>"
-msgstr "B<-o printer-is-shared=false>"
-
-#. type: Plain text
-#: lpadmin.man:150
-msgid ""
-"Sets the destination to shared/published or unshared/unpublished.  Shared/"
-"published destinations are publicly announced by the server on the LAN based "
-"on the browsing configuration in I<cupsd.conf>, while unshared/unpublished "
-"destinations are not announced.  The default value is \"true\"."
-msgstr ""
-"Setzt, ob das Ziel freigegeben/veröffentlicht oder nicht freigegeben/"
-"unveröffentlicht ist. Freigegebene/Veröffentlichte Ziele werden öffentlich "
-"angezeigt durch den Server im LAN, der auf der Suchkonfiguration in I<cupsd."
-"conf> basiert, während nicht freigegebene/unveröffentlichte Ziele nicht "
-"angezeigt werden. Vorgabewert ist »true«."
+msgid "B<-H hold>"
+msgstr "B<-H hold>"
 
 #. type: TP
-#: lpadmin.man:150
+#: lp.1:142
 #, no-wrap
-msgid "B<-o printer-op-policy=>I<name>"
-msgstr "B<-o printer-op-policy=>I<Name>"
-
-#. type: Plain text
-#: lpadmin.man:155
-msgid ""
-"Sets the IPP operation policy associated with the destination.  The name "
-"must be defined in the I<cupsd.conf> in a Policy section.  The default "
-"operation policy is \"default\"."
-msgstr ""
-"Setzt die mit dem Ziel verbundene IPP-Vorgangsrichtlinie. Der Name muss in "
-"einem Richtlinienabschnitt der I<cupsd.conf> definiert sein. Die "
-"Standardvorgangsrichtlinie ist »default«."
+msgid "B<-H immediate>"
+msgstr "B<-H immediate>"
 
 #. type: TP
-#: lpadmin.man:155
+#: lp.1:144
 #, no-wrap
-msgid "B<-R >I<name>B<-default>"
-msgstr "B<-R >I<Name>B<-default>"
-
-#. type: Plain text
-#: lpadmin.man:158
-msgid "Deletes the named option from I<printer>."
-msgstr "Löscht die benannte Option aus I<Drucker>."
+msgid "B<-H restart>"
+msgstr "B<-H restart>"
 
 #. type: TP
-#: lpadmin.man:158
+#: lp.1:146
 #, no-wrap
-msgid "B<-r >I<class>"
-msgstr "B<-r >I<Klasse>"
+msgid "B<-H resume>"
+msgstr "B<-H resume>"
 
 #. type: Plain text
-#: lpadmin.man:162
+#: lp.1:152
 msgid ""
-"Removes the named I<printer> from I<class>.  If the resulting class becomes "
-"empty it is removed."
+"Specifies when the job should be printed.  A value of I<immediate> will "
+"print the file immediately, a value of I<hold> will hold the job "
+"indefinitely, and a UTC time value (HH:MM) will hold the job until the "
+"specified UTC (not local) time.  Use a value of I<resume> with the I<-i> "
+"option to resume a held job.  Use a value of I<restart> with the I<-i> "
+"option to restart a completed job."
 msgstr ""
-"Entfernt den benannten I<Drucker> aus der I<Klasse>. Falls die entstehende "
-"Klasse dadurch leer wird, wird sie entfernt."
-
-#. type: TP
-#: lpadmin.man:162
-#, no-wrap
-msgid "B<-u allow:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
-msgstr "B<-u allow:>{I<Benutzer>|B<@>I<Gruppe>}{B<,>I<Benutzer>|B<,@>I<Gruppe>}*"
+"Legt fest, wann der Druckauftrag gedruckt werden soll. Der Wert I<immediate> "
+"führt zum sofortigen Druck. Der Wert I<hold> hält den Druckauftrag auf "
+"unbestimmte Zeit an und ein UTC-Zeitwert (HH:MM) hält den Druckauftrag bis "
+"zur angegebenen UTC- (nicht lokalen) Uhrzeit an. Verwenden Sie den Wert "
+"I<resume> mit der Option I<-i>, um einen gehaltenen Druckauftrag wieder "
+"aufzunehmen. Verwenden Sie den Wert I<restart> mit der Option I<-i>, um "
+"einen abgeschlossenen Druckauftrag neu zu starten."
 
 #. type: TP
-#: lpadmin.man:164
+#: lp.1:152
 #, no-wrap
-msgid "B<-u deny:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
-msgstr "B<-u deny:>{I<Benutzer>|B<@>I<Gruppe>}{B<,>I<Benutzer>|B<,@>I<Gruppe>}*"
+msgid "B<-P >I<page-list>"
+msgstr "B<-P >I<Seitenliste>"
 
-#. type: TP
-#: lpadmin.man:166
-#, no-wrap
-msgid "B<-u allow:all>"
-msgstr "B<-u allow:all>"
+#. type: Plain text
+#: lp.1:157
+msgid ""
+"Specifies which pages to print in the document.  The list can contain a list "
+"of numbers and ranges (#-#) separated by commas, e.g., \"1,3-5,16\".  The "
+"page numbers refer to the output pages and not the document's original pages "
+"- options like \"number-up\" can affect the numbering of the pages."
+msgstr ""
+"Legt fest, welche Seiten im Dokument gedruckt werden. Die Liste kann eine "
+"durch Kommata getrennte Liste von Nummern und Bereichen (#-#) enthalten, z."
+"B. 1,3-5,16. Die Seitennummern beziehen sich auf die Ausgabeseiten und nicht "
+"auf die Originalseiten des Dokuments – Optionen wie »number-up« können die "
+"Nummerierung der Seiten beeinflussen."
 
-#. type: TP
-#: lpadmin.man:168
+#. type: SS
+#: lp.1:157 lpr.1:112
 #, no-wrap
-msgid "B<-u deny:none>"
-msgstr "B<-u deny:none>"
+msgid "COMMON JOB OPTIONS"
+msgstr "HÄUFIGE DRUCKAUFTRAGSOPTIONEN"
 
 #. type: Plain text
-#: lpadmin.man:174
+#: lp.1:161 lpr.1:116
 msgid ""
-"Sets user-level access control on a destination.  Names starting with \"@\" "
-"are interpreted as UNIX groups.  The latter two forms turn user-level access "
-"control off.  Note: The user 'root' is not granted special access - using \"-"
-"u allow:foo,bar\" will allow users 'foo' and 'bar' to access the printer but "
-"NOT 'root'."
+"Aside from the printer-specific options reported by the B<lpoptions>(1)  "
+"command, the following generic options are available:"
 msgstr ""
-"Setzt die Zugriffsteuerung auf Benutzerebene für ein Ziel. Namen, die mit "
-"»@« beginnen werden als UNIX-Gruppen interpretiert. Die beiden letzten "
-"Formen schalten die Zugriffsteuerung auf Benutzerebene aus. Hinweis: Dem "
-"Benutzer »root« wird kein besonderer Zugriff gewährt - mit »-u allow:foo,"
-"bar« wird den Benutzern »foo« und »bar« der Zugriff auf den Drucker erlaubt, "
-"aber NICHT »root«."
+"Abgesehen von druckerspezifischen Optionen, die vom Befehl B<lpoptions>(1) "
+"berichtet werden, sind die folgenden allgemeinen Optionen verfügbar:"
 
 #. type: TP
-#: lpadmin.man:174
+#: lp.1:161 lpr.1:116
 #, no-wrap
-msgid "B<-v \">I<device-uri>B<\">"
-msgstr "B<-v \">I<Geräte-URI>B<\">"
+msgid "B<-o job-sheets=>I<name>"
+msgstr "B<-o job-sheets-default=>I<Name>"
 
 #. type: Plain text
-#: lpadmin.man:180
+#: lp.1:165 lpr.1:120
 msgid ""
-"Sets the I<device-uri> attribute of the printer queue.  Use the I<-v> option "
-"with the B<lpinfo>(8)  command to get a list of supported device URIs and "
-"schemes."
+"Prints a cover page (banner) with the document.  The \"name\" can be "
+"\"classified\", \"confidential\", \"secret\", \"standard\", \"topsecret\", "
+"or \"unclassified\"."
 msgstr ""
-"Setzt das I<Geräte-URI>-Attribut der Druckerwarteschlange. Benutzen Sie den "
-"Befehl B<lpinfo>(8) mit der Option I<-v>, um eine Liste der unterstützten "
-"Geräte-URIs und -Schemen zu erhalten."
+"Druckt ein Deckblatt mit dem Dokument. Der »Name« kann »classified«, "
+"»confidential«, »secret«, »standard«, »topsecret« oder »unclassified« sein."
 
 #. type: TP
-#: lpadmin.man:180
+#: lp.1:165 lpr.1:120
 #, no-wrap
-msgid "B<-D \">I<info>B<\">"
-msgstr "B<-D \">I<Info>B<\">"
-
-#. type: Plain text
-#: lpadmin.man:183
-msgid "Provides a textual description of the destination."
-msgstr "Stellt eine textuelle Beschreibung des Ziels bereit."
+msgid "B<-o media=>I<size>"
+msgstr "B<-o media=>I<Größe>"
 
 #. type: Plain text
-#: lpadmin.man:191
+#: lp.1:168 lpr.1:123
 msgid ""
-"When specified before the B<-d>, B<-p>, or B<-x> options, forces the use of "
-"TLS encryption on the connection to the scheduler.  Otherwise, enables the "
-"destination and accepts jobs; this is the same as running the "
-"B<cupsaccept>(8)  and B<cupsenable>(8)  programs on the destination."
+"Sets the page size to I<size>. Most printers support at least the size names "
+"\"a4\", \"letter\", and \"legal\"."
 msgstr ""
-"Erzwingt die Verwendung von TLS-Verschlüsselung bei der Verbindung zum "
-"Auftragsplaner, wenn vor den Optionen B<-d>, B<-p> oder B<-x> angegeben "
-"wurde. Aktiviert andernfalls das Ziel und akzeptiert Aufträge. Dies ist "
-"identisch zur Ausführung der Programme B<cupsaccept>(8) und B<cupsenable>(8) "
-"für das Ziel."
+"Setzt die Seitengröße auf I<Größe>. Die meisten Drucker unterstützen "
+"mindestens die Seitennamen »a4«, »letter« und »legal«."
 
 #. type: TP
-#: lpadmin.man:191
+#: lp.1:168 lpr.1:123
 #, no-wrap
-msgid "B<-L \">I<location>B<\">"
-msgstr "B<-L \">I<Ort>B<\">"
-
-#. type: Plain text
-#: lpadmin.man:194
-msgid "Provides a textual location of the destination."
-msgstr "Stellt den Ort des Ziels textuell bereit."
+msgid "B<-o number-up=>{I<2|4|6|9|16>}"
+msgstr "B<-o number-up=>{I<2|4|6|9|16>}"
 
 #. type: Plain text
-#: lpadmin.man:199
-msgid ""
-"Unlike the System V printing system, CUPS allows printer names to contain "
-"any printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer "
-"and class names are I<not> case-sensitive.  Finally, the CUPS version of "
-"B<lpadmin> may ask the user for an access password depending on the printing "
-"system configuration.  This differs from the System V version which requires "
-"the root user to execute this command."
+#: lp.1:171 lpr.1:126
+msgid "Prints 2, 4, 6, 9, or 16 document (input) pages on each output page."
 msgstr ""
-"Anders als in einem System-V-Drucksystem erlaubt CUPS, dass Druckernamen "
-"jedes druckbare Zeichen außer LEERZEICHEN, TABULATOR, »/« oder »#« "
-"enthalten. Außerdem wird bei Drucker- und Klassennamen Groß- und "
-"Kleinschreibung nicht unterschieden. Zu guter Letzt könnte die CUPS-Version "
-"von B<lpadmin> den Benutzer abhängig von der Drucksystemkonfiguration nach "
-"einem Passwort fragen. Das unterscheidet es von der System-V-Version, die "
-"zur Ausführung dieses Befehls den Root-Benutzer benötigt."
+"Druckt 2, 4, 6, 9 oder 16 Dokumenten- (Eingabe-)Seiten auf jeder "
+"Ausgabeseite."
 
-#. type: Plain text
-#: lpadmin.man:201
-msgid ""
-"The CUPS version of B<lpadmin> does not support all of the System V or "
-"Solaris printing system configuration options."
-msgstr ""
-"Die CUPS-Version von B<lpadmin> unterstützt nicht alle Optionen der System-"
-"V- oder Solaris-Drucksystemkonfiguration."
+#. type: TP
+#: lp.1:171 lpr.1:126
+#, no-wrap
+msgid "B<-o orientation-requested=4>"
+msgstr "B<-o orientation-requested=4>"
 
 #. type: Plain text
-#: lpadmin.man:203
-msgid ""
-"The double meaning of the B<-E> option is an unfortunate historical oddity."
+#: lp.1:174 lpr.1:129
+msgid "Prints the job in landscape (rotated 90 degrees counter-clockwise)."
 msgstr ""
-"Die doppelte Bedeutung der Option B<-E> ist eine unglückliche historische "
-"Kuriosität."
-
-#. type: Plain text
-#: lpadmin.man:205
-msgid "Create an IPP Everywhere print queue:"
-msgstr "Eine IPP-Überall-Warteschlange erstellen:"
+"Druckt den Druckauftrag im Querformat (gedreht um 90 Grad gegen den "
+"Uhrzeigersinn)."
 
-#. type: Plain text
-#: lpadmin.man:208
+#. type: TP
+#: lp.1:174 lpr.1:129
 #, no-wrap
-msgid "    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere\n"
-msgstr "    lpadmin -p meinDrucker -E -v ipp://meinDrucker.local/ipp/print -m ueberall\n"
+msgid "B<-o orientation-requested=5>"
+msgstr "B<-o orientation-requested=5>"
 
 #. type: Plain text
-#: lpadmin.man:216
-msgid ""
-"B<cupsaccept>(8), B<cupsenable>(8), B<lpinfo>(8), B<lpoptions>(1), CUPS "
-"Online Help (http://localhost:631/help)"
+#: lp.1:177 lpr.1:132
+msgid "Prints the job in landscape (rotated 90 degrees clockwise)."
 msgstr ""
-"B<cupsaccept>(8), B<cupsenable>(8), B<lpinfo>(8), B<lpoptions>(1), CUPS-"
-"Online-Hilfe (http://localhost:631/help)"
+"Druckt den Druckauftrag im Querformat (gedreht um 90 Grad im Uhrzeigersinn)."
 
-#. type: TH
-#: lpc.man:13
+#. type: TP
+#: lp.1:177 lpr.1:132
 #, no-wrap
-msgid "lpc"
-msgstr "lpc"
+msgid "B<-o orientation-requested=6>"
+msgstr "B<-o orientation-requested=6>"
 
 #. type: Plain text
-#: lpc.man:16
-#, fuzzy
-msgid "lpc - line printer control program"
-msgstr "lpc - Zeilendrucker-Steuerprogramm (line printer control program)"
+#: lp.1:180 lpr.1:135
+msgid "Prints the job in reverse portrait (rotated 180 degrees)."
+msgstr "Druckt den Druckauftrag im inversen Hochformat (gedreht um 180 Grad)."
 
-#. type: Plain text
-#: lpc.man:23
-msgid "B<lpc> [ I<command> [ I<parameter(s)> ] ]"
-msgstr "B<lpc> [ I<Befehl> [ I<Parameter> ] ]"
+#. type: TP
+#: lp.1:180 lpr.1:135
+#, fuzzy, no-wrap
+msgid "B<-o print-quality=3>"
+msgstr "B<-o printer-op-policy=>I<Name>"
 
-#. type: Plain text
-#: lpc.man:25
-msgid ""
-"B<lpc> provides limited control over printer and class queues provided by "
-"CUPS. It can also be used to query the state of queues."
-msgstr ""
-"B<lpc> stellt eine eingeschränkte Steuerung von durch CUPS bereitgestellten "
-"Drucker- und Druckerklassen-Warteschlangen bereit. Es kann auch zur Abfrage "
-"der Zustände von Warteschlangen verwandt werden."
+#. type: TP
+#: lp.1:182 lpr.1:137
+#, fuzzy, no-wrap
+msgid "B<-o print-quality=4>"
+msgstr "B<-o orientation-requested=4>"
+
+#. type: TP
+#: lp.1:184 lpr.1:139
+#, fuzzy, no-wrap
+msgid "B<-o print-quality=5>"
+msgstr "B<-o orientation-requested=5>"
 
 #. type: Plain text
-#: lpc.man:27
-msgid ""
-"If no command is specified on the command-line, B<lpc> displays a prompt and "
-"accepts commands from the standard input."
+#: lp.1:187 lpr.1:142
+msgid "Specifies the output quality - draft (3), normal (4), or best (5)."
 msgstr ""
-"Falls auf der Befehlszeile kein Befehl angegeben ist, wird B<lpc> eine "
-"Eingabeaufforderung anzeigen und Befehle von der Standardeingabe akzeptieren."
 
-#. type: SS
-#: lpc.man:27
+#. type: TP
+#: lp.1:187 lpr.1:142
 #, no-wrap
-msgid "COMMANDS"
-msgstr "BEFEHLE"
+msgid "B<-o sides=one-sided>"
+msgstr "B<-o sides=one-sided>"
 
 #. type: Plain text
-#: lpc.man:29
-msgid ""
-"The B<lpc> program accepts a subset of commands accepted by the Berkeley "
-"B<lpc> program of the same name:"
-msgstr ""
-"Das Programm B<lpc> akzeptiert eine Teilmenge der Befehle, die vom Berkeley "
-"B<lpc>-Programm gleichen Namens akzeptiert werden:"
+#: lp.1:190 lpr.1:145
+msgid "Prints on one side of the paper."
+msgstr "Druckt auf einer Seite des Papiers."
 
 #. type: TP
-#: lpc.man:29
+#: lp.1:190 lpr.1:145
 #, no-wrap
-msgid "B<exit>"
-msgstr "B<exit>"
+msgid "B<-o sides=two-sided-long-edge>"
+msgstr "B<-o sides=two-sided-long-edge>"
 
 #. type: Plain text
-#: lpc.man:32 lpc.man:40
-msgid "Exits the command interpreter."
-msgstr "Beendet den Befehlsinterpreter."
+#: lp.1:193 lpr.1:148
+msgid "Prints on both sides of the paper for portrait output."
+msgstr "Druckt auf beiden Seiten des Papiers für Hochformat-Ausgabe."
 
 #. type: TP
-#: lpc.man:32
+#: lp.1:193 lpr.1:148
 #, no-wrap
-msgid "B<help >[I<command>]"
-msgstr "B<help >[I<Befehl>]"
+msgid "B<-o sides=two-sided-short-edge>"
+msgstr "B<-o sides=two-sided-short-edge>"
 
-#. type: TP
-#: lpc.man:34
-#, no-wrap
-msgid "B<? >[I<command>]"
-msgstr "B<?> [I<Befehl>]"
+#. type: Plain text
+#: lp.1:196 lpr.1:151
+msgid "Prints on both sides of the paper for landscape output."
+msgstr "Druckt auf beiden Seiten des Papiers für Querformat-Ausgabe."
 
 #. type: Plain text
-#: lpc.man:37
-msgid "Displays a short help message."
-msgstr "Zeigt eine kurze Hilfenachricht an."
+#: lp.1:201
+msgid ""
+"The I<-q> option accepts a different range of values than the Solaris lp "
+"command, matching the IPP job priority values (1-100, 100 is highest "
+"priority) instead of the Solaris values (0-39, 0 is highest priority)."
+msgstr ""
+"Die Option I<q> akzeptiert einen anderen Bereich von Werten als der Solaris-"
+"lp-Befehl, der den IPP-Druckauftragsprioritätswerten (1-100, 100 ist der "
+"höchste) anstelle der Solaris-Werte (0-39, 0 ist die höchste Priorität) "
+"entspricht."
 
-#. type: TP
-#: lpc.man:37
-#, no-wrap
-msgid "B<quit>"
-msgstr "B<quit>"
+#. type: Plain text
+#: lp.1:203 lpr.1:155
+msgid "Print two copies of a document to the default printer:"
+msgstr "Zwei Kopien eines Dokuments auf dem Vorgabedrucker ausdrucken:"
 
-#. type: TP
-#: lpc.man:40
+#. type: Plain text
+#: lp.1:206
 #, no-wrap
-msgid "B<status >[I<queue>]"
-msgstr "B<status >[I<Druckwarteschlange>]"
+msgid "    lp -n 2 filename\n"
+msgstr "    lp -n 2 Dateiname\n"
 
 #. type: Plain text
-#: lpc.man:43
-msgid "Displays the status of one or more printer or class queues."
+#: lp.1:209 lpr.1:161
+msgid "Print a double-sided legal document to a printer called \"foo\":"
 msgstr ""
-"Zeigt den Status von einer oder mehreren Drucker- oder Druckerklassen-"
-"Warteschlangen."
+"Druckt ein doppelseitiges Dokument im Format legal auf dem Drucker mit Namen "
+"»foo«:"
 
 #. type: Plain text
-#: lpc.man:48
-msgid ""
-"Since B<lpc> is geared towards the Berkeley printing system, it is "
-"impossible to use B<lpc> to configure printer or class queues provided by "
-"CUPS.  To configure printer or class queues you must use the B<lpadmin>(8)  "
-"command or another CUPS-compatible client with that functionality."
+#: lp.1:212
+#, no-wrap
+msgid "    lp -d foo -o media=legal -o sides=two-sided-long-edge filename\n"
+msgstr "    lp -d foo -o media=legal -o sides=two-sided-long-edge Dateiname\n"
+
+#. type: Plain text
+#: lp.1:215
+#, fuzzy
+msgid "Print a presentation document 2-up to a printer called \"bar\":"
 msgstr ""
-"Da B<lpc> auf das Berkeley-Drucksystems abzielt, ist es unmöglich, B<lpc> zu "
-"benutzen, um durch CUPS bereitgestellte Drucker- oder Druckerklassen-"
-"Warteschlangen zu konfigurieren. Um Drucker- oder Druckerklassen-"
-"Warteschlangen zu konfigurieren, müssen Sie den Befehl B<lpadmin>(8) oder "
-"einen anderen CUPS-kompatiblen Client mit dieser Funktionalität benutzen."
+"Druckt ein Präsentations-Dokument zweifach pro Seite auf dem Drucker mit "
+"Namen »foo«:"
 
 #. type: Plain text
-#: lpc.man:58
+#: lp.1:218
+#, fuzzy, no-wrap
+msgid "    lp -d bar -o number-up=2 filename\n"
+msgstr "    lp -d foo -o number-up=2 Dateiname\n"
+
+#. type: Plain text
+#: lp.1:228
 msgid ""
-"B<cancel>(1), B<cupsaccept>(8), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), "
-"B<lpr>(1), B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/"
-"help)"
+"B<cancel>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), B<lpr>(1), "
+"B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
-"B<cancel>(1), B<cupsaccept>(8), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), "
-"B<lpr>(1), B<lprm>(1), B<lpstat>(1), CUPS-Online-Hilfe (http://localhost:631/"
-"help)"
+"B<cancel>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), B<lpr>(1), "
+"B<lprm>(1), B<lpstat>(1), CUPS-Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: lpinfo.man:13
+#: lpadmin.8:10
 #, no-wrap
-msgid "lpinfo"
-msgstr "lpinfo"
+msgid "lpadmin"
+msgstr "lpadmin"
 
-#. type: TH
-#: lpinfo.man:13 lpq.man:13 mailto.conf.man:13 mime.types.man:13
-#: notifier.man:13 ppdc.man:13 ppdhtml.man:13 ppdi.man:13 ppdmerge.man:13
-#: ppdpo.man:13
-#, no-wrap
-msgid "12 June 2014"
-msgstr "12. Juni 2014"
+#. type: Plain text
+#: lpadmin.8:13
+msgid "lpadmin - configure cups printers and classes"
+msgstr "lpadmin - CUPS-Treiber und -Klassen konfigurieren"
+
+#. type: Plain text
+#: lpadmin.8:25
+msgid ""
+"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
+"B<-d> I<destination>"
+msgstr ""
+"B<lpadmin> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-h >I<Server>[B<:"
+">I<Port>] ] B<-d> I<Ziel>"
+
+#. type: Plain text
+#: lpadmin.8:42
+msgid ""
+"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
+"B<-p> I<destination> [ B<-R> I<name-default> ] I<option(s)>"
+msgstr ""
+"B<lpadmin> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-h >I<Server>[B<:"
+">I<Port>] ] B<-p> I<Ziel> [ B<-R> I<Standardname> ] I<Option(en)>"
 
 #. type: Plain text
-#: lpinfo.man:16
-#, fuzzy
-msgid "lpinfo - show available devices or drivers"
-msgstr "lpinfo - zeige verfügbare Geräte oder Drucker"
+#: lpadmin.8:54
+msgid ""
+"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
+"B<-x> I<destination>"
+msgstr ""
+"B<lpadmin> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-h >I<Server>[B<:"
+">I<Port>] ] B<-x> I<Ziel>"
 
 #. type: Plain text
-#: lpinfo.man:44
+#: lpadmin.8:57
 msgid ""
-"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ B<--device-"
-"id> I<device-id-string> ] [ B<--exclude-schemes> I<scheme-list> ] [ B<--"
-"include-schemes> I<scheme-list> ] [ B<--language> I<locale> ] [ B<--make-and-"
-"model> I<name> ] [ B<--product> I<name> ] B<-m>"
+"B<lpadmin> configures printer and class queues provided by CUPS.  It can "
+"also be used to set the server default printer or class."
 msgstr ""
-"B<lpinfo> [ B<-E> ] [ B<-h >I<Server>[B<:>I<Port>] ] [ B<-l> ] [ B<--device-"
-"id> I<Geräte-ID-Zeichenkette> ] [ B<--exclude-schemes> I<Schemenliste> ] "
-"[ B<--include-schemes> I<Schemenliste> ] [ B<--language> "
-"I<Standorteinstellung> ] [ B<--make-and-model> I<Name> ] [ B<--product> "
-"I<Name> ] B<-m>"
+"B<lpadmin> konfiguriert von CUPS bereitgestellte Warteschlangen für Drucker "
+"und Druckerklassen. Es kann auch zur Einstellung des Standarddruckers oder "
+"der Standardklasse verwandt werden."
 
 #. type: Plain text
-#: lpinfo.man:63
+#: lpadmin.8:59
 msgid ""
-"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ B<--exclude-"
-"schemes> I<scheme-list> ] [ B<--include-schemes> I<scheme-list> ] [ B<--"
-"timeout> I<seconds> ] B<-v>"
+"When specified before the I<-d>, I<-p>, or I<-x> options, the I<-E> option "
+"forces encryption when connecting to the server."
 msgstr ""
-"B<lpinfo> [ B<-E> ] [ B<-h >I<Server>[B<:>I<Port>] ] [ B<-l> ] [ B<--exclude-"
-"schemes> I<Schemenliste> ] [ B<--include-schemes> I<Schemenliste> ] [ B<--"
-"timeout> I<Sekunden> ] B<-v>"
+"Wird die Option I<-E> vor den Optionen I<-d>, I<-p> oder I<-x> verwandt, so "
+"erzwingt sie die Verschlüsselung bei Verbindungen zum Server."
 
 #. type: Plain text
-#: lpinfo.man:66
+#: lpadmin.8:68
 msgid ""
-"B<lpinfo> lists the available devices or drivers known to the CUPS server.  "
-"The first form (I<-m>) lists the available drivers, while the second form "
-"(I<-v>) lists the available devices."
+"The first form of the command (I<-d>) sets the default printer or class to "
+"I<destination>.  Subsequent print jobs submitted via the B<lp>(1)  or "
+"B<lpr>(1)  commands will use this destination unless the user specifies "
+"otherwise with the B<lpoptions>(1)  command."
 msgstr ""
-"B<lpinfo> listet die dem CUPS-Server bekannten verfügbaren Geräte oder "
-"Treiber auf. Die erste Form (I<-m>) listet alle verfügbaren Treiber, während "
-"die zweite Form (I<-v>) alle verfügbaren Geräte auflistet."
+"Die erste Form des Befehls (I<-d>) setzt den Standarddrucker oder Klasse auf "
+"I<Ziel>. Folgende Druckaufträge, die mit den Befehlen B<lp>(1) oder "
+"B<lpr>(1) eingereicht werden, verwenden dieses Ziel solange der Benutzer "
+"nichts anderes mit dem Befehl B<lpoptions>(1) festgelegt hat."
 
 #. type: Plain text
-#: lpinfo.man:68
-msgid "B<lpinfo> accepts the following options:"
-msgstr "B<lpinfo> akzeptiert die folgenden Optionen:"
+#: lpadmin.8:70
+msgid ""
+"The second form of the command (I<-p>) configures the named printer or "
+"class.  The additional options are described below."
+msgstr ""
+"Die zweite Form des Befehls (I<-p>) konfiguriert den benannten Drucker oder "
+"Klasse. Die zusätzlichen Optionen sind unten beschrieben."
 
 #. type: Plain text
-#: lpinfo.man:74
-msgid "Selects an alternate server."
-msgstr "Wählt einen alternativen Server aus."
+#: lpadmin.8:73
+msgid ""
+"The third form of the command (I<-x>) deletes the printer or class "
+"I<destination>.  Any jobs that are pending for the destination will be "
+"removed and any job that is currently printed will be aborted."
+msgstr ""
+"Die dritte Form des Befehls (I<-x>) löscht den Drucker oder Klasse I<Ziel>. "
+"Alle Aufträge, die für dieses Ziel noch warten, werden entfernt und im Druck "
+"befindliche Aufträge werden abgebrochen."
 
 #. type: Plain text
-#: lpinfo.man:77
-msgid "Shows a \"long\" listing of devices or drivers."
-msgstr "Zeigt eine »lange« Auflistung von Geräten oder Treibern."
+#: lpadmin.8:75
+msgid "The following options are recognized when configuring a printer queue:"
+msgstr ""
+"Die folgenden Optionen werden bei der Konfiguration einer "
+"Druckerwarteschlange verstanden:"
 
 #. type: TP
-#: lpinfo.man:77
+#: lpadmin.8:75
 #, no-wrap
-msgid "B<--device-id >I<device-id-string>"
-msgstr "B<--device-id >I<Geräte-ID-Zeichenkette>"
+msgid "B<-c >I<class>"
+msgstr "B<-c >I<Klasse>"
 
 #. type: Plain text
-#: lpinfo.man:80
+#: lpadmin.8:79
 msgid ""
-"Specifies the IEEE-1284 device ID to match when listing drivers with the I<-"
-"m> option."
+"Adds the named I<printer> to I<class>.  If I<class> does not exist it is "
+"created automatically."
 msgstr ""
-"Legt die IEEE-1284-Geräte-ID, die übereinstimmen muss, wenn Gerätetreiber "
-"mit der Option I<-m> aufgelistet werden, fest."
-
-#. type: TP
-#: lpinfo.man:80
-#, no-wrap
-msgid "B<--exclude-schemes >I<scheme-list>"
-msgstr "B<--exclude-schemes >I<Schemenliste>"
+"Fügt den benannten I<Drucker> zu der I<Klasse> hinzu. Falls I<Klasse> nicht "
+"existiert, so wird sie automatisch erstellt."
 
 #. type: Plain text
-#: lpinfo.man:84
+#: lpadmin.8:87
+#, fuzzy
 msgid ""
-"Specifies a comma-delimited list of device or PPD schemes that should be "
-"excluded from the results.  Static PPD files use the \"file\" scheme."
+"Sets a standard PPD file for the printer from the I<model> directory or "
+"using one of the driver interfaces.  Use the I<-m> option with the "
+"B<lpinfo>(8)  command to get a list of supported models.  The model \"raw\" "
+"clears any existing PPD file and the model \"everywhere\" queries the "
+"printer referred to by the specified IPP I<device-uri>.  Note: Models other "
+"than \"everywhere\" are deprecated and will not be supported in a future "
+"version of CUPS."
 msgstr ""
-"Gibt eine kommabegrenzte Liste von Geräte- oder PPD-Schemen an, die aus den "
-"Ergebnissen ausgeschlossen werden sollten. Statische PPD-Dateien benutzen "
-"das »file«-Schema."
+"Setzt eine Standard-PPD-Datei für den Drucker aus dem Verzeichnis I<Model> "
+"oder verwendet eine der Druckerschnittstellen. Verwenden Sie die Option I<-"
+"m> mit dem Befehl B<lpinfo>(8), um eine Liste der unterstützten Modelle zu "
+"erhalten. Das Modell »raw« bereinigt jede PPD-Datei und das Modell "
+"»everywhere« fragt die von der angegebenen IPP-I<Geräte-URI> referenzierten "
+"Drucker ab. Hinweis: Das Model »raw« ist veraltet und wird in einer "
+"zukünftigen Version von CUPS nicht mehr unterstützt."
 
 #. type: TP
-#: lpinfo.man:84
+#: lpadmin.8:87
 #, no-wrap
-msgid "B<--include-schemes >I<scheme-list>"
-msgstr "B<--include-schemes >I<Schemenliste>"
+msgid "B<-o cupsIPPSupplies=true>"
+msgstr "B<-o cupsIPPSupplies=true>"
+
+#. type: TP
+#: lpadmin.8:89
+#, no-wrap
+msgid "B<-o cupsIPPSupplies=false>"
+msgstr "B<-o cupsIPPSupplies=false>"
 
 #. type: Plain text
-#: lpinfo.man:88
-msgid ""
-"Specifies a comma-delimited list of device or PPD schemes that should be "
-"included in the results.  Static PPD files use the \"file\" scheme."
-msgstr ""
-"Legt eine kommabegrenzte Liste von PPD-Schemata, die in den Ergebnissen "
-"enthalten sein sollen, fest. Statische PPD-Dateien benutzen das »file«-"
-"Schema."
+#: lpadmin.8:92
+msgid "Specifies whether IPP supply level values should be reported."
+msgstr "Legt fest, ob IPP-Bereitstellungsstufen berichtet werden sollen."
 
 #. type: TP
-#: lpinfo.man:88
+#: lpadmin.8:92
 #, no-wrap
-msgid "B<--language >I<locale>"
-msgstr "B<--language >I<Standorteinstellung>"
+msgid "B<-o cupsSNMPSupplies=true>"
+msgstr "B<-o cupsSNMPSupplies=true>"
+
+#. type: TP
+#: lpadmin.8:94
+#, no-wrap
+msgid "B<-o cupsSNMPSupplies=false>"
+msgstr "B<-o cupsSNMPSupplies=false>"
 
 #. type: Plain text
-#: lpinfo.man:91
+#: lpadmin.8:97
 msgid ""
-"Specifies the language to match when listing drivers with the I<-m> option."
+"Specifies whether SNMP supply level (RFC 3805) values should be reported."
 msgstr ""
-"Legt die Sprache, die übereinstimmen muss, wenn Treiber mit der Option I<-m> "
-"aufgelistet werden, fest."
+"Legt fest, ob SNMP-Bereitstellungsstufen (RFC 3805) berichtet werden sollen."
 
 #. type: TP
-#: lpinfo.man:91
+#: lpadmin.8:97
 #, no-wrap
-msgid "B<--make-and-model >I<name>"
-msgstr "B<--make-and-model >I<Name>"
+msgid "B<-o job-k-limit=>I<value>"
+msgstr "B<-o job-k-limit=>I<Wert>"
 
 #. type: Plain text
-#: lpinfo.man:94
+#: lpadmin.8:101
 msgid ""
-"Specifies the make and model to match when listing drivers with the I<-m> "
-"option."
+"Sets the kilobyte limit for per-user quotas.  The value is an integer number "
+"of kilobytes; one kilobyte is 1024 bytes."
 msgstr ""
-"Legt die Marke und Modell, die übereinstimmen müssen, wenn Treiber mit der "
-"Option I<-m> aufgelistet werden, fest."
+"Setzt die Begrenzung in Kilobyte für pro-Benutzer-Quotas. Der Wert ist eine "
+"Ganzzahl von Kilobytes, ein Kilobyte ist 1024 Bytes."
 
 #. type: TP
-#: lpinfo.man:94
+#: lpadmin.8:101
 #, no-wrap
-msgid "B<--product >I<name>"
-msgstr "B<--product >I<Name>"
+msgid "B<-o job-page-limit=>I<value>"
+msgstr "B<-o job-page-limit=>I<Wert>"
 
 #. type: Plain text
-#: lpinfo.man:97
+#: lpadmin.8:105
 msgid ""
-"Specifies the product to match when listing drivers with the I<-m> option."
+"Sets the page limit for per-user quotas.  The value is the integer number of "
+"pages that can be printed; double-sided pages are counted as two pages."
 msgstr ""
-"Legt das Produkt, das übereinstimmen muss, wenn Treiber mit der Option I<-m> "
-"aufgelistet werden, fest."
+"Setzt eine Seitenbegrenzung für pro-Benutzer-Quotas. Der Wert ist eine "
+"Ganzzahl von Seiten, die gedruckt werden können. Doppelseitige Seiten werden "
+"als zwei Seiten gezählt."
 
 #. type: TP
-#: lpinfo.man:97
+#: lpadmin.8:105
 #, no-wrap
-msgid "B<--timeout >I<seconds>"
-msgstr "B<--timeout >I<Sekunden>"
+msgid "B<-o job-quota-period=>I<value>"
+msgstr "B<-o job-quota-period=>I<Wert>"
 
 #. type: Plain text
-#: lpinfo.man:100
-msgid "Specifies the timeout when listing devices with the I<-v> option."
+#: lpadmin.8:109
+msgid ""
+"Sets the accounting period for per-user quotas.  The value is an integer "
+"number of seconds; 86,400 seconds are in one day."
 msgstr ""
-"Legt die Zeitüberschreitung, wenn Geräte mit der Option I<-v> aufgelistet "
-"werden, fest."
+"Setzt die Berechnungsperiode für Quotas je Benutzer. Der Wert ist eine "
+"Ganzzahl von Sekunden; 86.400 Sekunden sind ein Tag."
 
-#. type: Plain text
-#: lpinfo.man:102
-msgid "The I<lpinfo> command is unique to CUPS."
-msgstr "Der Befehl I<lpinfo> ist eine Besonderheit von CUPS."
+#. type: TP
+#: lpadmin.8:109
+#, no-wrap
+msgid "B<-o job-sheets-default=>I<banner>"
+msgstr "B<-o job-sheets-default=>I<Deckblatt>"
 
-#. type: Plain text
-#: lpinfo.man:104
-msgid "List all devices:"
-msgstr "Alle Geräte auflisten:"
+#. type: TP
+#: lpadmin.8:111
+#, no-wrap
+msgid "B<-o job-sheets-default=>I<banner>B<,>I<banner>"
+msgstr "B<-o job-sheets-default=>I<Deckblatt>B<,>I<Deckblatt>"
 
 #. type: Plain text
-#: lpinfo.man:107
+#: lpadmin.8:114
+msgid "Sets the default banner page(s) to use for print jobs."
+msgstr "Legt das/die Standarddeckblätter für das Drucken von Aufträgen fest."
+
+#. type: TP
+#: lpadmin.8:114
 #, no-wrap
-msgid "    lpinfo -v\n"
-msgstr "    lpinfo -v\n"
+msgid "B<-o >I<name>B<=>I<value>"
+msgstr "B<-o >I<Name>B<=>I<Wert>"
 
 #. type: Plain text
-#: lpinfo.man:110
-msgid "List all drivers:"
-msgstr "Alle Treiber auflisten:"
+#: lpadmin.8:120
+msgid ""
+"Sets a PPD option for the printer.  PPD options can be listed using the I<-"
+"l> option with the B<lpoptions>(1)  command."
+msgstr ""
+"Setzt eine PPD-Option für den Drucker. PPD-Optionen können mittels der "
+"Option I<-l> des Befehls B<lpoptions>(1) aufgelistet werden."
 
-#. type: Plain text
-#: lpinfo.man:113
+#. type: TP
+#: lpadmin.8:120
 #, no-wrap
-msgid "    lpinfo -m\n"
-msgstr "    lpinfo -m\n"
+msgid "B<-o >I<name>B<-default=>I<value>"
+msgstr "B<-o >I<Name>B<-default=>I<Wert>"
 
 #. type: Plain text
-#: lpinfo.man:116
-msgid "List drivers matching \"HP LaserJet\":"
-msgstr "Alle auf »HP LaserJet« passenden Treiber auflisten:"
+#: lpadmin.8:124
+msgid ""
+"Sets a default server-side option for the destination.  Any print-time "
+"option can be defaulted, e.g., \"-o number-up-default=2\" to set the default "
+"\"number-up\" option value to 2."
+msgstr ""
+"Setzt eine serverseitige Standardoption für das Ziel. Jede Option zur "
+"Druckzeit kann mit einem Standardwert belegt werden, z.B. »-o number-up-"
+"default=2«, um den Standard-»number-up«-Optionswert auf 2 zu setzen."
 
-#. type: Plain text
-#: lpinfo.man:119
+#. type: TP
+#: lpadmin.8:124
 #, no-wrap
-msgid "    lpinfo --make-and-model \"HP LaserJet\" -m\n"
-msgstr "    lpinfo --make-and-model \"HP LaserJet\" -m\n"
+msgid "B<-o port-monitor=>I<name>"
+msgstr "B<-o port-monitor=>I<Name>"
 
 #. type: Plain text
-#: lpinfo.man:123
-msgid "B<lpadmin>(8), CUPS Online Help (http://localhost:631/help)"
-msgstr "B<lpadmin>(8), CUPS-Online-Hilfe (http://localhost:631/help)"
+#: lpadmin.8:129
+msgid ""
+"Sets the binary communications program to use when printing, \"none\", \"bcp"
+"\", or \"tbcp\".  The default program is \"none\".  The specified port "
+"monitor must be listed in the printer's PPD file."
+msgstr ""
+"Setzt das binäre Kommunikationsprogramm, das benutzt wird, um »none«, »bcp« "
+"oder »tbcp« zu drucken. Das Standardprogramm ist »none«. Der angegebene "
+"Monitorport muss in der PPD-Datei des Druckers aufgelistet sein."
 
-#. type: TH
-#: lp.man:13
+#. type: TP
+#: lpadmin.8:129
 #, no-wrap
-msgid "lp"
-msgstr "lp"
+msgid "B<-o printer-error-policy=>I<name>"
+msgstr "B<-o printer-error-policy=>I<Name>"
+
+#. type: Plain text
+#: lpadmin.8:135
+#, fuzzy
+msgid ""
+"Sets the policy for errors such as printers that cannot be found or "
+"accessed, don't support the format being printed, fail during submission of "
+"the print data, or cause one or more filters to crash.  The name must be one "
+"of \"abort-job\" (abort the job on error), \"retry-job\" (retry the job at a "
+"future time), \"retry-current-job\" (retry the current job immediately), or "
+"\"stop-printer\" (stop the printer on error).  The default error policy is "
+"\"stop-printer\" for printers and \"retry-current-job\" for classes."
+msgstr ""
+"Setzt die Fehlerrichtlinie, die benutzt wird, wenn das Drucker-Backend den "
+"Druckauftrag nicht an den Drucker senden kann. Der Name muss entweder »abort-"
+"job«, »retry-job«, »retry-current-job« oder »stop-printer« sein. Die "
+"Standardfehlerrichtlinie ist »stop-printer« für Drucker und »retry-current-"
+"job« für Klassen."
 
-#. type: TH
-#: lp.man:13 lpr.man:13
+#. type: TP
+#: lpadmin.8:135
 #, no-wrap
-msgid "2 May 2016"
-msgstr "2. Mai 2016"
+msgid "B<-o printer-is-shared=true>"
+msgstr "B<-o printer-is-shared=true>"
 
-#. type: Plain text
-#: lp.man:16
-msgid "lp - print files"
-msgstr "lp - Dateien drucken"
+#. type: TP
+#: lpadmin.8:137
+#, no-wrap
+msgid "B<-o printer-is-shared=false>"
+msgstr "B<-o printer-is-shared=false>"
 
 #. type: Plain text
-#: lp.man:55
+#: lpadmin.8:142
 msgid ""
-"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-d >I<destination>[B</"
-">I<instance>] ] [ B<-h >I<hostname>[B<:>I<port>] ] [ B<-m> ] [ B<-n> I<num-"
-"copies> ] [ B<-o >I<option>[B<=>I<value>] ] [ B<-q> I<priority> ] [ B<-s> ] "
-"[ B<-t> I<title> ] [ B<-H> I<handling> ] [ B<-P> I<page-list> ] [ B<--> ] "
-"[ I<file(s)> ]"
+"Sets the destination to shared/published or unshared/unpublished.  Shared/"
+"published destinations are publicly announced by the server on the LAN based "
+"on the browsing configuration in I<cupsd.conf>, while unshared/unpublished "
+"destinations are not announced.  The default value is \"true\"."
 msgstr ""
-"B<lp> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-c> ] [ B<-d >I<Ziel>[B</"
-">I<Instanz>] ] [ B<-h >I<Rechnername>[B<:>I<Port>] ] [ B<-m> ] [ B<-n> I<Anz-"
-"Kopien> ] [ B<-o >I<Option>[B<=>I<Wert>] ] [ B<-q> I<Priorität> ] [ B<-s> ] "
-"[ B<-t> I<Titel> ] [ B<-H> I<Handhabung> ] [ B<-P> I<Seitenliste> ] [ B<--"
-"> ] [ I<Datei(en)> ]"
+"Setzt, ob das Ziel freigegeben/veröffentlicht oder nicht freigegeben/"
+"unveröffentlicht ist. Freigegebene/Veröffentlichte Ziele werden öffentlich "
+"angezeigt durch den Server im LAN, der auf der Suchkonfiguration in I<cupsd."
+"conf> basiert, während nicht freigegebene/unveröffentlichte Ziele nicht "
+"angezeigt werden. Vorgabewert ist »true«."
+
+#. type: TP
+#: lpadmin.8:142
+#, no-wrap
+msgid "B<-o printer-op-policy=>I<name>"
+msgstr "B<-o printer-op-policy=>I<Name>"
 
 #. type: Plain text
-#: lp.man:87
+#: lpadmin.8:147
 msgid ""
-"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h >I<hostname>[B<:"
-">I<port>] ] [ B<-i> I<job-id> ] [ B<-n> I<num-copies> ] [ B<-o "
-">I<option>[B<=>I<value>] ] [ B<-q> I<priority> ] [ B<-t> I<title> ] [ B<-H> "
-"I<handling> ] [ B<-P> I<page-list> ]"
+"Sets the IPP operation policy associated with the destination.  The name "
+"must be defined in the I<cupsd.conf> in a Policy section.  The default "
+"operation policy is \"default\"."
 msgstr ""
-"B<lp> [ B<-E> ] [ B<-U> I<Benutzername> ] [ B<-c> ] [ B<-h "
-">I<Rechnername>[B<:>I<Port>] ] [ B<-i> I<Auftrags-ID> ] [ B<-n> I<Anz-"
-"Kopien> ] [ B<-o >I<Option>[B<=>I<Wert>] ] [ B<-q> I<Priorität> ] [ B<-t> "
-"I<Titel> ] [ B<-H> I<Handhabung> ] [ B<-P> I<Seitenliste> ]"
+"Setzt die mit dem Ziel verbundene IPP-Vorgangsrichtlinie. Der Name muss in "
+"einem Richtlinienabschnitt der I<cupsd.conf> definiert sein. Die "
+"Standardvorgangsrichtlinie ist »default«."
+
+#. type: TP
+#: lpadmin.8:147
+#, no-wrap
+msgid "B<-R >I<name>B<-default>"
+msgstr "B<-R >I<Name>B<-default>"
 
 #. type: Plain text
-#: lp.man:90
-msgid ""
-"B<lp> submits files for printing or alters a pending job.  Use a filename of "
-"\"-\" to force printing from the standard input."
-msgstr ""
-"B<lp> reicht Dateien zum Druck ein oder ändert einen anhängenden "
-"Druckauftrag. Verwenden Sie als Dateinamen »-«, um das Drucken von der "
-"Standardeingabe zu erzwingen."
+#: lpadmin.8:150
+msgid "Deletes the named option from I<printer>."
+msgstr "Löscht die benannte Option aus I<Drucker>."
 
-#. type: SS
-#: lp.man:90 lpr.man:60
+#. type: TP
+#: lpadmin.8:150
 #, no-wrap
-msgid "THE DEFAULT DESTINATION"
-msgstr "DAS VORGABEZIEL"
+msgid "B<-r >I<class>"
+msgstr "B<-r >I<Klasse>"
 
 #. type: Plain text
-#: lp.man:97 lpr.man:67
+#: lpadmin.8:154
 msgid ""
-"CUPS provides many ways to set the default destination. The B<LPDEST> and "
-"B<PRINTER> environment variables are consulted first.  If neither are set, "
-"the current default set using the B<lpoptions>(1)  command is used, followed "
-"by the default set using the B<lpadmin>(8)  command."
+"Removes the named I<printer> from I<class>.  If the resulting class becomes "
+"empty it is removed."
 msgstr ""
-"CUPS stellt viele Möglichkeiten bereit, das Vorgabeziel zu setzen. Die "
-"Umgebungsvariablen B<LPDEST> und B<PRINTER> werden zuerst herangezogen. Wenn "
-"keine von beiden gesetzt ist, wird der aktuell unter Benutzung des Befehls "
-"B<lpoptions>(1) gesetzte benutzt, gefolgt von der durch den Befehl "
-"B<lpadmin>(8) gesetzten Vorgabe."
+"Entfernt den benannten I<Drucker> aus der I<Klasse>. Falls die entstehende "
+"Klasse dadurch leer wird, wird sie entfernt."
 
-#. type: Plain text
-#: lp.man:99
-msgid "The following options are recognized by I<lp>:"
-msgstr "Die folgenden Optionen werden von I<lp> erkannt:"
+#. type: TP
+#: lpadmin.8:154
+#, no-wrap
+msgid "B<-u allow:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
+msgstr "B<-u allow:>{I<Benutzer>|B<@>I<Gruppe>}{B<,>I<Benutzer>|B<,@>I<Gruppe>}*"
 
 #. type: TP
-#: lp.man:99
+#: lpadmin.8:156
 #, no-wrap
-msgid "B<-->"
-msgstr "B<-->"
+msgid "B<-u deny:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
+msgstr "B<-u deny:>{I<Benutzer>|B<@>I<Gruppe>}{B<,>I<Benutzer>|B<,@>I<Gruppe>}*"
 
-#. type: Plain text
-#: lp.man:102
-msgid ""
-"Marks the end of options; use this to print a file whose name begins with a "
-"dash (-)."
-msgstr ""
-"Markiert das Ende der Optionen; verwenden Sie dies, um eine Datei zu "
-"drucken, deren Namen mit einem Bindestrich (-) beginnt."
+#. type: TP
+#: lpadmin.8:158
+#, no-wrap
+msgid "B<-u allow:all>"
+msgstr "B<-u allow:all>"
+
+#. type: TP
+#: lpadmin.8:160
+#, no-wrap
+msgid "B<-u deny:none>"
+msgstr "B<-u deny:none>"
 
 #. type: Plain text
-#: lp.man:112
+#: lpadmin.8:166
 msgid ""
-"This option is provided for backwards-compatibility only. On systems that "
-"support it, this option forces the print file to be copied to the spool "
-"directory before printing.  In CUPS, print files are always sent to the "
-"scheduler via IPP which has the same effect."
+"Sets user-level access control on a destination.  Names starting with \"@\" "
+"are interpreted as UNIX groups.  The latter two forms turn user-level access "
+"control off.  Note: The user 'root' is not granted special access - using \"-"
+"u allow:foo,bar\" will allow users 'foo' and 'bar' to access the printer but "
+"NOT 'root'."
 msgstr ""
-"Diese Option wird nur zur Rückwärtskompatibilität bereitgestellt. Auf "
-"Systemen, die sie unterstützen, erzwingt die Option, dass die Druckdatei vor "
-"dem Drucken in das Spool-Verzeichnis kopiert wird. In CUPS werden die "
-"Dateien immer via IPP zum Auftragsplaner (Scheduler) geschickt, was den "
-"gleichen Effekt bewirkt."
+"Setzt die Zugriffsteuerung auf Benutzerebene für ein Ziel. Namen, die mit "
+"»@« beginnen werden als UNIX-Gruppen interpretiert. Die beiden letzten "
+"Formen schalten die Zugriffsteuerung auf Benutzerebene aus. Hinweis: Dem "
+"Benutzer »root« wird kein besonderer Zugriff gewährt - mit »-u allow:foo,"
+"bar« wird den Benutzern »foo« und »bar« der Zugriff auf den Drucker erlaubt, "
+"aber NICHT »root«."
 
 #. type: TP
-#: lp.man:112
+#: lpadmin.8:166
 #, no-wrap
-msgid "B<-d >I<destination>"
-msgstr "B<-d >I<Ziel>"
+msgid "B<-v \">I<device-uri>B<\">"
+msgstr "B<-v \">I<Geräte-URI>B<\">"
 
 #. type: Plain text
-#: lp.man:115 lpr.man:85
-msgid "Prints files to the named printer."
-msgstr "Druckt Dateien auf den benannten Drucker."
+#: lpadmin.8:172
+msgid ""
+"Sets the I<device-uri> attribute of the printer queue.  Use the I<-v> option "
+"with the B<lpinfo>(8)  command to get a list of supported device URIs and "
+"schemes."
+msgstr ""
+"Setzt das I<Geräte-URI>-Attribut der Druckerwarteschlange. Benutzen Sie den "
+"Befehl B<lpinfo>(8) mit der Option I<-v>, um eine Liste der unterstützten "
+"Geräte-URIs und -Schemen zu erhalten."
 
 #. type: TP
-#: lp.man:118
+#: lpadmin.8:172
 #, no-wrap
-msgid "B<-i >I<job-id>"
-msgstr "B<-i >I<Auftrags-ID>"
+msgid "B<-D \">I<info>B<\">"
+msgstr "B<-D \">I<Info>B<\">"
 
 #. type: Plain text
-#: lp.man:121
-msgid "Specifies an existing job to modify."
-msgstr "Legt einen existierenden Auftrag, der geändert werden soll, fest."
+#: lpadmin.8:175
+msgid "Provides a textual description of the destination."
+msgstr "Stellt eine textuelle Beschreibung des Ziels bereit."
+
+#. type: Plain text
+#: lpadmin.8:183
+msgid ""
+"When specified before the B<-d>, B<-p>, or B<-x> options, forces the use of "
+"TLS encryption on the connection to the scheduler.  Otherwise, enables the "
+"destination and accepts jobs; this is the same as running the "
+"B<cupsaccept>(8)  and B<cupsenable>(8)  programs on the destination."
+msgstr ""
+"Erzwingt die Verwendung von TLS-Verschlüsselung bei der Verbindung zum "
+"Auftragsplaner, wenn vor den Optionen B<-d>, B<-p> oder B<-x> angegeben "
+"wurde. Aktiviert andernfalls das Ziel und akzeptiert Aufträge. Dies ist "
+"identisch zur Ausführung der Programme B<cupsaccept>(8) und B<cupsenable>(8) "
+"für das Ziel."
 
 #. type: TP
-#: lp.man:121 lpr.man:98 ppdc.man:73
+#: lpadmin.8:183
 #, no-wrap
-msgid "B<-m>"
-msgstr "B<-m>"
+msgid "B<-L \">I<location>B<\">"
+msgstr "B<-L \">I<Ort>B<\">"
 
 #. type: Plain text
-#: lp.man:124
-msgid "Sends an email when the job is completed."
-msgstr "Schickt eine E-Mail, wenn der Auftrag ausgeführt ist."
+#: lpadmin.8:186
+msgid "Provides a textual location of the destination."
+msgstr "Stellt den Ort des Ziels textuell bereit."
 
 #. type: Plain text
-#: lp.man:127 lpr.man:91
-msgid "Sets the number of copies to print."
-msgstr "Setzt die Anzahl der zu druckenden Kopien."
+#: lpadmin.8:188
+#, fuzzy
+msgid "The following B<lpadmin> options are deprecated:"
+msgstr "Die folgenden Optionen werden erkannt:"
 
 #. type: TP
-#: lp.man:127
-#, no-wrap
-msgid "B<-o \">I<name>B<=>I<value >[ ... I<name>B<=>I<value >]B<\">"
-msgstr "B<-o \">I<Name>B<=>I<Wert >[ … I<Name>B<=>I<Wert >]B<\">"
+#: lpadmin.8:188
+#, fuzzy, no-wrap
+msgid "B<-i >I<filename>"
+msgstr "B<-f>I<\\ Dateiname>"
 
 #. type: Plain text
-#: lp.man:131
-msgid "Sets one or more job options.  See \"COMMON JOB OPTIONS\" below."
+#: lpadmin.8:193
+#, fuzzy
+msgid ""
+"This option historically has been used to provide either a System V "
+"interface script or (as an implementation side-effect) a PPD file.  Note: "
+"Interface scripts are not supported by CUPS.  PPD files and printer drivers "
+"are deprecated and will not be supported in a future version of CUPS."
 msgstr ""
-"Setzt eine oder mehrere Optionen für den Auftrag. Siehe »HÄUFIGE "
-"DRUCKAUFTRAGSOPTIONEN« unten."
+"Legt eine PostScript-Printer-Description-Datei für die Verwendung mit dem "
+"Drucker fest. Falls angegeben überschreibt diese Option die Option I<-i> "
+"(Schnittstellenskript)."
 
 #. type: TP
-#: lp.man:131
+#: lpadmin.8:193
 #, no-wrap
-msgid "B<-q >I<priority>"
-msgstr "B<-q >I<Priorität>"
+msgid "B<-P >I<ppd-file>"
+msgstr "B<-P >I<PPD-Datei>"
 
 #. type: Plain text
-#: lp.man:135
+#: lpadmin.8:197
+#, fuzzy
 msgid ""
-"Sets the job priority from 1 (lowest) to 100 (highest).  The default "
-"priority is 50."
+"Specifies a PostScript Printer Description (PPD) file to use with the "
+"printer.  Note: PPD files and printer drivers are deprecated and will not be "
+"supported in a future version of CUPS."
 msgstr ""
-"Setzt die Auftragspriorität von 1 (am niedrigsten) bis 100 (am höchsten). "
-"Die Standardpriorität beträgt 50."
+"Legt eine PostScript-Printer-Description-Datei für die Verwendung mit dem "
+"Drucker fest. Falls angegeben überschreibt diese Option die Option I<-i> "
+"(Schnittstellenskript)."
 
 #. type: Plain text
-#: lp.man:138
-msgid "Do not report the resulting job IDs (silent mode.)"
-msgstr "Die sich ergebenden Druckauftrags-IDs nicht berichten (stiller Modus)."
+#: lpadmin.8:203
+#, fuzzy
+msgid ""
+"Finally, the CUPS version of B<lpadmin> may ask the user for an access "
+"password depending on the printing system configuration.  This differs from "
+"the System V version which requires the root user to execute this command."
+msgstr ""
+"Die CUPS-Versionen von B<disable> und B<enable> könnten den Benutzer, "
+"abhängig von der Konfiguration des Drucksystems, nach einem Zugriffspasswort "
+"fragen. Dies unterscheidet sich von der System-V-Version, die verlangt, dass "
+"der Benutzer »root« diese Befehle ausführt."
 
-#. type: TP
-#: lp.man:138
-#, no-wrap
-msgid "B<-t \">I<name>B<\">"
-msgstr "B<-t \">I<Name>B<\">"
+#. type: Plain text
+#: lpadmin.8:209
+msgid ""
+"The CUPS version of B<lpadmin> does not support all of the System V or "
+"Solaris printing system configuration options."
+msgstr ""
+"Die CUPS-Version von B<lpadmin> unterstützt nicht alle Optionen der System-"
+"V- oder Solaris-Drucksystemkonfiguration."
 
 #. type: Plain text
-#: lp.man:141
-msgid "Sets the job name."
-msgstr "Setzt den Namen des Auftrags."
+#: lpadmin.8:211
+msgid "Interface scripts are not supported for security reasons."
+msgstr ""
 
-#. type: TP
-#: lp.man:141
-#, no-wrap
-msgid "B<-H >I<hh:mm>"
-msgstr "B<-H >I<hh:mm>"
+#. type: Plain text
+#: lpadmin.8:213
+msgid ""
+"The double meaning of the B<-E> option is an unfortunate historical oddity."
+msgstr ""
+"Die doppelte Bedeutung der Option B<-E> ist eine unglückliche historische "
+"Kuriosität."
 
-#. type: TP
-#: lp.man:143
-#, no-wrap
-msgid "B<-H hold>"
-msgstr "B<-H hold>"
+#. type: Plain text
+#: lpadmin.8:217
+msgid ""
+"The B<lpadmin> command communicates with the scheduler (B<cupsd>) to make "
+"changes to the printing system configuration.  This configuration "
+"information is stored in several files including I<printers.conf> and "
+"I<classes.conf>.  These files should not be edited directly and are an "
+"implementation detail of CUPS that is subject to change at any time."
+msgstr ""
 
-#. type: TP
-#: lp.man:145
+#. type: Plain text
+#: lpadmin.8:219
+msgid "Create an IPP Everywhere print queue:"
+msgstr "Eine IPP-Überall-Warteschlange erstellen:"
+
+#. type: Plain text
+#: lpadmin.8:222
 #, no-wrap
-msgid "B<-H immediate>"
-msgstr "B<-H immediate>"
+msgid "    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere\n"
+msgstr "    lpadmin -p meinDrucker -E -v ipp://meinDrucker.local/ipp/print -m ueberall\n"
+
+#. type: Plain text
+#: lpadmin.8:230
+msgid ""
+"B<cupsaccept>(8), B<cupsenable>(8), B<lpinfo>(8), B<lpoptions>(1), CUPS "
+"Online Help (http://localhost:631/help)"
+msgstr ""
+"B<cupsaccept>(8), B<cupsenable>(8), B<lpinfo>(8), B<lpoptions>(1), CUPS-"
+"Online-Hilfe (http://localhost:631/help)"
 
-#. type: TP
-#: lp.man:147
+#. type: TH
+#: lpc.8:10
 #, no-wrap
-msgid "B<-H restart>"
-msgstr "B<-H restart>"
+msgid "lpc"
+msgstr "lpc"
 
-#. type: TP
-#: lp.man:149
-#, no-wrap
-msgid "B<-H resume>"
-msgstr "B<-H resume>"
+#. type: Plain text
+#: lpc.8:13
+#, fuzzy
+msgid "lpc - line printer control program (deprecated)"
+msgstr "lpc - Zeilendrucker-Steuerprogramm (line printer control program)"
+
+#. type: Plain text
+#: lpc.8:20
+msgid "B<lpc> [ I<command> [ I<parameter(s)> ] ]"
+msgstr "B<lpc> [ I<Befehl> [ I<Parameter> ] ]"
 
 #. type: Plain text
-#: lp.man:155
+#: lpc.8:22
 msgid ""
-"Specifies when the job should be printed.  A value of I<immediate> will "
-"print the file immediately, a value of I<hold> will hold the job "
-"indefinitely, and a UTC time value (HH:MM) will hold the job until the "
-"specified UTC (not local) time.  Use a value of I<resume> with the I<-i> "
-"option to resume a held job.  Use a value of I<restart> with the I<-i> "
-"option to restart a completed job."
+"B<lpc> provides limited control over printer and class queues provided by "
+"CUPS. It can also be used to query the state of queues."
 msgstr ""
-"Legt fest, wann der Druckauftrag gedruckt werden soll. Der Wert I<immediate> "
-"führt zum sofortigen Druck. Der Wert I<hold> hält den Druckauftrag auf "
-"unbestimmte Zeit an und ein UTC-Zeitwert (HH:MM) hält den Druckauftrag bis "
-"zur angegebenen UTC- (nicht lokalen) Uhrzeit an. Verwenden Sie den Wert "
-"I<resume> mit der Option I<-i>, um einen gehaltenen Druckauftrag wieder "
-"aufzunehmen. Verwenden Sie den Wert I<restart> mit der Option I<-i>, um "
-"einen abgeschlossenen Druckauftrag neu zu starten."
-
-#. type: TP
-#: lp.man:155
-#, no-wrap
-msgid "B<-P >I<page-list>"
-msgstr "B<-P >I<Seitenliste>"
+"B<lpc> stellt eine eingeschränkte Steuerung von durch CUPS bereitgestellten "
+"Drucker- und Druckerklassen-Warteschlangen bereit. Es kann auch zur Abfrage "
+"der Zustände von Warteschlangen verwandt werden."
 
 #. type: Plain text
-#: lp.man:160 lp.man:223 lpr.man:178
+#: lpc.8:24
 msgid ""
-"Specifies which pages to print in the document.  The list can contain a list "
-"of numbers and ranges (#-#) separated by commas, e.g., \"1,3-5,16\".  The "
-"page numbers refer to the output pages and not the document's original pages "
-"- options like \"number-up\" can affect the numbering of the pages."
+"If no command is specified on the command-line, B<lpc> displays a prompt and "
+"accepts commands from the standard input."
 msgstr ""
-"Legt fest, welche Seiten im Dokument gedruckt werden. Die Liste kann eine "
-"durch Kommata getrennte Liste von Nummern und Bereichen (#-#) enthalten, z."
-"B. 1,3-5,16. Die Seitennummern beziehen sich auf die Ausgabeseiten und nicht "
-"auf die Originalseiten des Dokuments – Optionen wie »number-up« können die "
-"Nummerierung der Seiten beeinflussen."
+"Falls auf der Befehlszeile kein Befehl angegeben ist, wird B<lpc> eine "
+"Eingabeaufforderung anzeigen und Befehle von der Standardeingabe akzeptieren."
 
 #. type: SS
-#: lp.man:160 lpr.man:115
+#: lpc.8:24
 #, no-wrap
-msgid "COMMON JOB OPTIONS"
-msgstr "HÄUFIGE DRUCKAUFTRAGSOPTIONEN"
+msgid "COMMANDS"
+msgstr "BEFEHLE"
 
 #. type: Plain text
-#: lp.man:164 lpr.man:119
+#: lpc.8:26
 msgid ""
-"Aside from the printer-specific options reported by the B<lpoptions>(1)  "
-"command, the following generic options are available:"
+"The B<lpc> program accepts a subset of commands accepted by the Berkeley "
+"B<lpc> program of the same name:"
 msgstr ""
-"Abgesehen von druckerspezifischen Optionen, die vom Befehl B<lpoptions>(1) "
-"berichtet werden, sind die folgenden allgemeinen Optionen verfügbar:"
+"Das Programm B<lpc> akzeptiert eine Teilmenge der Befehle, die vom Berkeley "
+"B<lpc>-Programm gleichen Namens akzeptiert werden:"
 
 #. type: TP
-#: lp.man:164 lpr.man:119
+#: lpc.8:26
 #, no-wrap
-msgid "B<-o collate=true>"
-msgstr "B<-o collate=true>"
+msgid "B<exit>"
+msgstr "B<exit>"
 
 #. type: Plain text
-#: lp.man:167 lpr.man:122
-msgid "Prints collated copies."
-msgstr "Druckt sortierte Kopien."
+#: lpc.8:29 lpc.8:37
+msgid "Exits the command interpreter."
+msgstr "Beendet den Befehlsinterpreter."
 
 #. type: TP
-#: lp.man:167 lpr.man:122
+#: lpc.8:29
 #, no-wrap
-msgid "B<-o fit-to-page>"
-msgstr "B<-o fit-to-page>"
-
-#. type: Plain text
-#: lp.man:170 lpr.man:125
-msgid "Scales the print file to fit on the page."
-msgstr "Skaliert die Druckdatei auf Seitengröße."
+msgid "B<help >[I<command>]"
+msgstr "B<help >[I<Befehl>]"
 
 #. type: TP
-#: lp.man:170 lpr.man:125
+#: lpc.8:31
 #, no-wrap
-msgid "B<-o job-hold-until=>I<when>"
-msgstr "B<-o job-hold-until=>I<wann>"
+msgid "B<? >[I<command>]"
+msgstr "B<?> [I<Befehl>]"
 
 #. type: Plain text
-#: lp.man:174 lpr.man:129
-msgid ""
-"Holds the job until the specified local time.  \"when\" can be \"indefinite"
-"\" to hold the until released, \"day-time\" to print the job between 6am and "
-"6pm local time, \"night\" to print the job between 6pm and 6am local time, "
-"\"second-shift\" to print the job between 4pm and 12am local time, \"third-"
-"shift\" to print the job between 12am and 8am local time, or \"weekend\" to "
-"print the job on Saturday or Sunday."
-msgstr ""
-"Hält den Auftrag bis zur angegebenen lokalen Uhrzeit. »wann« kann "
-"»indefinite« enthalten, um das Halten bis zur Freigabe durchzuführen, »day-"
-"time«, um den Auftrag zwischen 6:00 Uhr und 18:00 Uhr lokale Zeit zu "
-"drucken, »night«, um den Auftrag zwischen 4:00 Uhr und 12:00 Uhr lokale Zeit "
-"zu drucken, »third-shift«, um den Auftrag zwischen 12:00 Uhr und 08:00 Uhr "
-"lokale Zeit zu drucken oder »weekend«, um den Auftrag am Samstag oder "
-"Sonntag zu drucken."
+#: lpc.8:34
+msgid "Displays a short help message."
+msgstr "Zeigt eine kurze Hilfenachricht an."
 
 #. type: TP
-#: lp.man:174 lpr.man:129
+#: lpc.8:34
 #, no-wrap
-msgid "B<-o job-hold-until=>I<hh:mm>"
-msgstr "B<-o job-hold-until=>I<hh:mm>"
-
-#. type: Plain text
-#: lp.man:177 lpr.man:132
-msgid "Holds the job until the specified time in hours and minutes UTC."
-msgstr "Hält den Auftrag bis zur angegeben Zeit in Stunden und Minuten UTC."
+msgid "B<quit>"
+msgstr "B<quit>"
 
 #. type: TP
-#: lp.man:177 lpr.man:132
+#: lpc.8:37
 #, no-wrap
-msgid "B<-o job-priority=>I<priority>"
-msgstr "B<-o job-priority=>I<Priorität>"
+msgid "B<status >[I<queue>]"
+msgstr "B<status >[I<Druckwarteschlange>]"
 
 #. type: Plain text
-#: lp.man:181 lpr.man:136
-msgid ""
-"Set the priority to a value from 1 (lowest) to 100 (highest), which "
-"influences when a job is scheduled for printing.  The default priority is "
-"typically 50."
+#: lpc.8:40
+msgid "Displays the status of one or more printer or class queues."
 msgstr ""
-"Setzt die Priorität auf einen Wert zwischen 1 (niedrigste) und 100 "
-"(höchste). Dies beeinflusst, wann ein Auftrag für den Druck eingeplant wird. "
-"Die Vorgabepriorität ist typischerweise 50."
-
-#. type: TP
-#: lp.man:181 lpr.man:136
-#, no-wrap
-msgid "B<-o job-sheets=>I<name>"
-msgstr "B<-o job-sheets-default=>I<Name>"
+"Zeigt den Status von einer oder mehreren Drucker- oder Druckerklassen-"
+"Warteschlangen."
 
 #. type: Plain text
-#: lp.man:185 lpr.man:140
+#: lpc.8:42
+#, fuzzy
 msgid ""
-"Prints a cover page (banner) with the document.  The \"name\" can be "
-"\"classified\", \"confidential\", \"secret\", \"standard\", \"topsecret\", "
-"or \"unclassified\"."
+"This program is deprecated and will be removed in a future feature release "
+"of CUPS."
 msgstr ""
-"Druckt ein Deckblatt mit dem Dokument. Der »Name« kann »classified«, "
-"»confidential«, »secret«, »standard«, »topsecret« oder »unclassified« sein."
-
-#. type: TP
-#: lp.man:185 lpr.man:140
-#, no-wrap
-msgid "B<-o job-sheets=>I<start-name,end-name>"
-msgstr "B<-o job-sheets=>I<Startname,Endname>"
+"I<Dieses Programm ist veraltet und wird in einer zukünftigen "
+"Veröffentlichung von CUPS entfernt werden.>"
 
 #. type: Plain text
-#: lp.man:188 lpr.man:143
-msgid "Prints cover pages (banners) with the document."
-msgstr "Druckt Deckblätter mit dem Dokument."
-
-#. type: TP
-#: lp.man:188 lpr.man:143
-#, no-wrap
-msgid "B<-o media=>I<size>"
-msgstr "B<-o media=>I<Größe>"
+#: lpc.8:47
+msgid ""
+"Since B<lpc> is geared towards the Berkeley printing system, it is "
+"impossible to use B<lpc> to configure printer or class queues provided by "
+"CUPS.  To configure printer or class queues you must use the B<lpadmin>(8)  "
+"command or another CUPS-compatible client with that functionality."
+msgstr ""
+"Da B<lpc> auf das Berkeley-Drucksystems abzielt, ist es unmöglich, B<lpc> zu "
+"benutzen, um durch CUPS bereitgestellte Drucker- oder Druckerklassen-"
+"Warteschlangen zu konfigurieren. Um Drucker- oder Druckerklassen-"
+"Warteschlangen zu konfigurieren, müssen Sie den Befehl B<lpadmin>(8) oder "
+"einen anderen CUPS-kompatiblen Client mit dieser Funktionalität benutzen."
 
 #. type: Plain text
-#: lp.man:191 lpr.man:146
+#: lpc.8:57
 msgid ""
-"Sets the page size to I<size>. Most printers support at least the size names "
-"\"a4\", \"letter\", and \"legal\"."
+"B<cancel>(1), B<cupsaccept>(8), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), "
+"B<lpr>(1), B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/"
+"help)"
 msgstr ""
-"Setzt die Seitengröße auf I<Größe>. Die meisten Drucker unterstützen "
-"mindestens die Seitennamen »a4«, »letter« und »legal«."
+"B<cancel>(1), B<cupsaccept>(8), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), "
+"B<lpr>(1), B<lprm>(1), B<lpstat>(1), CUPS-Online-Hilfe (http://localhost:631/"
+"help)"
 
-#. type: TP
-#: lp.man:191 lpr.man:146
+#. type: TH
+#: lpinfo.8:10
 #, no-wrap
-msgid "B<-o mirror>"
-msgstr "B<-o mirror>"
+msgid "lpinfo"
+msgstr "lpinfo"
 
 #. type: Plain text
-#: lp.man:194 lpr.man:149
-msgid "Mirrors each page."
-msgstr "Spiegelt jede Seite."
-
-#. type: TP
-#: lp.man:194 lpr.man:149
-#, no-wrap
-msgid "B<-o number-up=>{I<2|4|6|9|16>}"
-msgstr "B<-o number-up=>{I<2|4|6|9|16>}"
+#: lpinfo.8:13
+#, fuzzy
+msgid "lpinfo - show available devices or drivers (deprecated)"
+msgstr "lpinfo - zeige verfügbare Geräte oder Drucker"
 
 #. type: Plain text
-#: lp.man:197 lpr.man:152
-msgid "Prints 2, 4, 6, 9, or 16 document (input) pages on each output page."
+#: lpinfo.8:41
+msgid ""
+"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ B<--device-"
+"id> I<device-id-string> ] [ B<--exclude-schemes> I<scheme-list> ] [ B<--"
+"include-schemes> I<scheme-list> ] [ B<--language> I<locale> ] [ B<--make-and-"
+"model> I<name> ] [ B<--product> I<name> ] B<-m>"
 msgstr ""
-"Druckt 2, 4, 6, 9 oder 16 Dokumenten- (Eingabe-)Seiten auf jeder "
-"Ausgabeseite."
+"B<lpinfo> [ B<-E> ] [ B<-h >I<Server>[B<:>I<Port>] ] [ B<-l> ] [ B<--device-"
+"id> I<Geräte-ID-Zeichenkette> ] [ B<--exclude-schemes> I<Schemenliste> ] "
+"[ B<--include-schemes> I<Schemenliste> ] [ B<--language> "
+"I<Standorteinstellung> ] [ B<--make-and-model> I<Name> ] [ B<--product> "
+"I<Name> ] B<-m>"
 
-#. type: TP
-#: lp.man:197 lpr.man:152
-#, no-wrap
-msgid "B<-o number-up-layout=>I<layout>"
-msgstr "B<-o number-up-layout=>I<Layout>"
+#. type: Plain text
+#: lpinfo.8:60
+msgid ""
+"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ B<--exclude-"
+"schemes> I<scheme-list> ] [ B<--include-schemes> I<scheme-list> ] [ B<--"
+"timeout> I<seconds> ] B<-v>"
+msgstr ""
+"B<lpinfo> [ B<-E> ] [ B<-h >I<Server>[B<:>I<Port>] ] [ B<-l> ] [ B<--exclude-"
+"schemes> I<Schemenliste> ] [ B<--include-schemes> I<Schemenliste> ] [ B<--"
+"timeout> I<Sekunden> ] B<-v>"
 
 #. type: Plain text
-#: lp.man:202 lpr.man:157
+#: lpinfo.8:63
 msgid ""
-"Specifies the layout of pages with the \"number-up\" option.  The \"layout\" "
-"string can be \"btlr\", \"btrl\", \"lrbt\", \"lrtb\", \"rlbt\", \"rltb\", "
-"\"tblr\", or \"tbrl\" - the first two letters determine the column order "
-"while the second two letters determine the row order.  \"bt\" is bottom-to-"
-"top, \"lr\" is left-to-right, \"rl\" is right-to-left, and \"tb\" is top-to-"
-"bottom."
+"B<lpinfo> lists the available devices or drivers known to the CUPS server.  "
+"The first form (I<-m>) lists the available drivers, while the second form "
+"(I<-v>) lists the available devices."
 msgstr ""
-"Legt das Layout der Seiten mit der Option »number-up« fest. Die Zeichenkette "
-"»Layout« kann »btlr«, »btrl«, »lrbt«, »lrtb«, »rlbt«, »rltb«, »tblr« oder "
-"»tbrl« sein. Die ersten zwei Buchstaben bestimmen die Spaltenreihenfolge, "
-"während die zweiten zwei Buchstaben die Zeilenreihenfolge bestimmen. »bt« "
-"ist von unten nach oben, »lr« ist links nach rechts, »rl« ist rechts nach "
-"links und »tb« ist oben nach unten."
+"B<lpinfo> listet die dem CUPS-Server bekannten verfügbaren Geräte oder "
+"Treiber auf. Die erste Form (I<-m>) listet alle verfügbaren Treiber, während "
+"die zweite Form (I<-v>) alle verfügbaren Geräte auflistet."
 
-#. type: TP
-#: lp.man:202 lpr.man:157
-#, no-wrap
-msgid "B<-o orientation-requested=4>"
-msgstr "B<-o orientation-requested=4>"
+#. type: Plain text
+#: lpinfo.8:65
+msgid "B<lpinfo> accepts the following options:"
+msgstr "B<lpinfo> akzeptiert die folgenden Optionen:"
 
 #. type: Plain text
-#: lp.man:205 lpr.man:160
-msgid "Prints the job in landscape (rotated 90 degrees counter-clockwise)."
-msgstr ""
-"Druckt den Druckauftrag im Querformat (gedreht um 90 Grad gegen den "
-"Uhrzeigersinn)."
+#: lpinfo.8:71
+msgid "Selects an alternate server."
+msgstr "Wählt einen alternativen Server aus."
+
+#. type: Plain text
+#: lpinfo.8:74
+msgid "Shows a \"long\" listing of devices or drivers."
+msgstr "Zeigt eine »lange« Auflistung von Geräten oder Treibern."
 
 #. type: TP
-#: lp.man:205 lpr.man:160
+#: lpinfo.8:74
 #, no-wrap
-msgid "B<-o orientation-requested=5>"
-msgstr "B<-o orientation-requested=5>"
+msgid "B<--device-id >I<device-id-string>"
+msgstr "B<--device-id >I<Geräte-ID-Zeichenkette>"
 
 #. type: Plain text
-#: lp.man:208 lpr.man:163
-msgid "Prints the job in landscape (rotated 90 degrees clockwise)."
+#: lpinfo.8:77
+msgid ""
+"Specifies the IEEE-1284 device ID to match when listing drivers with the I<-"
+"m> option."
 msgstr ""
-"Druckt den Druckauftrag im Querformat (gedreht um 90 Grad im Uhrzeigersinn)."
+"Legt die IEEE-1284-Geräte-ID, die übereinstimmen muss, wenn Gerätetreiber "
+"mit der Option I<-m> aufgelistet werden, fest."
 
 #. type: TP
-#: lp.man:208 lpr.man:163
+#: lpinfo.8:77
 #, no-wrap
-msgid "B<-o orientation-requested=6>"
-msgstr "B<-o orientation-requested=6>"
+msgid "B<--exclude-schemes >I<scheme-list>"
+msgstr "B<--exclude-schemes >I<Schemenliste>"
 
 #. type: Plain text
-#: lp.man:211 lpr.man:166
-msgid "Prints the job in reverse portrait (rotated 180 degrees)."
-msgstr "Druckt den Druckauftrag im inversen Hochformat (gedreht um 180 Grad)."
+#: lpinfo.8:81
+msgid ""
+"Specifies a comma-delimited list of device or PPD schemes that should be "
+"excluded from the results.  Static PPD files use the \"file\" scheme."
+msgstr ""
+"Gibt eine kommabegrenzte Liste von Geräte- oder PPD-Schemen an, die aus den "
+"Ergebnissen ausgeschlossen werden sollten. Statische PPD-Dateien benutzen "
+"das »file«-Schema."
 
 #. type: TP
-#: lp.man:211 lpr.man:166
+#: lpinfo.8:81
 #, no-wrap
-msgid "B<-o outputorder=reverse>"
-msgstr "B<-o outputorder=reverse>"
+msgid "B<--include-schemes >I<scheme-list>"
+msgstr "B<--include-schemes >I<Schemenliste>"
 
 #. type: Plain text
-#: lp.man:214 lpr.man:169
-msgid "Prints pages in reverse order."
-msgstr "Druckt Seiten in umgekehrter Reihenfolge"
+#: lpinfo.8:85
+msgid ""
+"Specifies a comma-delimited list of device or PPD schemes that should be "
+"included in the results.  Static PPD files use the \"file\" scheme."
+msgstr ""
+"Legt eine kommabegrenzte Liste von PPD-Schemata, die in den Ergebnissen "
+"enthalten sein sollen, fest. Statische PPD-Dateien benutzen das »file«-"
+"Schema."
 
 #. type: TP
-#: lp.man:214 lpr.man:169
+#: lpinfo.8:85
 #, no-wrap
-msgid "B<-o page-border=>I<border>"
-msgstr "B<-o page-border=>I<Rand>"
+msgid "B<--language >I<locale>"
+msgstr "B<--language >I<Standorteinstellung>"
 
 #. type: Plain text
-#: lp.man:218 lpr.man:173
+#: lpinfo.8:88
 msgid ""
-"Prints a border around each document page.  \"border\" is \"double\", "
-"\"double-thick\", \"single\", or \"single-thick\"."
+"Specifies the language to match when listing drivers with the I<-m> option."
 msgstr ""
-"Druckt einen Rand um jede Dokumentenseite. »Rand« ist »double«, »double-"
-"thick«, »single« oder »single-thick«."
-
-#. type: TP
-#: lp.man:218 lpr.man:173
-#, no-wrap
-msgid "B<-o page-ranges=>I<page-list>"
-msgstr "B<-o page-ranges=>I<Seitenliste>"
+"Legt die Sprache, die übereinstimmen muss, wenn Treiber mit der Option I<-m> "
+"aufgelistet werden, fest."
 
 #. type: TP
-#: lp.man:223 lpr.man:178
+#: lpinfo.8:88
 #, no-wrap
-msgid "B<-o sides=one-sided>"
-msgstr "B<-o sides=one-sided>"
+msgid "B<--make-and-model >I<name>"
+msgstr "B<--make-and-model >I<Name>"
 
 #. type: Plain text
-#: lp.man:226 lpr.man:181
-msgid "Prints on one side of the paper."
-msgstr "Druckt auf einer Seite des Papiers."
+#: lpinfo.8:91
+msgid ""
+"Specifies the make and model to match when listing drivers with the I<-m> "
+"option."
+msgstr ""
+"Legt die Marke und Modell, die übereinstimmen müssen, wenn Treiber mit der "
+"Option I<-m> aufgelistet werden, fest."
 
 #. type: TP
-#: lp.man:226 lpr.man:181
+#: lpinfo.8:91
 #, no-wrap
-msgid "B<-o sides=two-sided-long-edge>"
-msgstr "B<-o sides=two-sided-long-edge>"
+msgid "B<--product >I<name>"
+msgstr "B<--product >I<Name>"
 
 #. type: Plain text
-#: lp.man:229 lpr.man:184
-msgid "Prints on both sides of the paper for portrait output."
-msgstr "Druckt auf beiden Seiten des Papiers für Hochformat-Ausgabe."
+#: lpinfo.8:94
+msgid ""
+"Specifies the product to match when listing drivers with the I<-m> option."
+msgstr ""
+"Legt das Produkt, das übereinstimmen muss, wenn Treiber mit der Option I<-m> "
+"aufgelistet werden, fest."
 
 #. type: TP
-#: lp.man:229 lpr.man:184
+#: lpinfo.8:94
 #, no-wrap
-msgid "B<-o sides=two-sided-short-edge>"
-msgstr "B<-o sides=two-sided-short-edge>"
+msgid "B<--timeout >I<seconds>"
+msgstr "B<--timeout >I<Sekunden>"
 
 #. type: Plain text
-#: lp.man:232 lpr.man:187
-msgid "Prints on both sides of the paper for landscape output."
-msgstr "Druckt auf beiden Seiten des Papiers für Querformat-Ausgabe."
+#: lpinfo.8:97
+msgid "Specifies the timeout when listing devices with the I<-v> option."
+msgstr ""
+"Legt die Zeitüberschreitung, wenn Geräte mit der Option I<-v> aufgelistet "
+"werden, fest."
 
 #. type: Plain text
-#: lp.man:237
-msgid ""
-"The I<-q> option accepts a different range of values than the Solaris lp "
-"command, matching the IPP job priority values (1-100, 100 is highest "
-"priority) instead of the Solaris values (0-39, 0 is highest priority)."
-msgstr ""
-"Die Option I<q> akzeptiert einen anderen Bereich von Werten als der Solaris-"
-"lp-Befehl, der den IPP-Druckauftragsprioritätswerten (1-100, 100 ist der "
-"höchste) anstelle der Solaris-Werte (0-39, 0 ist die höchste Priorität) "
-"entspricht."
+#: lpinfo.8:99
+msgid "The I<lpinfo> command is unique to CUPS."
+msgstr "Der Befehl I<lpinfo> ist eine Besonderheit von CUPS."
 
 #. type: Plain text
-#: lp.man:239 lpr.man:191
-msgid "Print two copies of a document to the default printer:"
-msgstr "Zwei Kopien eines Dokuments auf dem Vorgabedrucker ausdrucken:"
+#: lpinfo.8:101
+msgid "List all devices:"
+msgstr "Alle Geräte auflisten:"
 
 #. type: Plain text
-#: lp.man:242
+#: lpinfo.8:104
 #, no-wrap
-msgid "    lp -n 2 filename\n"
-msgstr "    lp -n 2 Dateiname\n"
+msgid "    lpinfo -v\n"
+msgstr "    lpinfo -v\n"
 
 #. type: Plain text
-#: lp.man:245 lpr.man:197
-msgid "Print a double-sided legal document to a printer called \"foo\":"
-msgstr ""
-"Druckt ein doppelseitiges Dokument im Format legal auf dem Drucker mit Namen "
-"»foo«:"
+#: lpinfo.8:107
+msgid "List all drivers:"
+msgstr "Alle Treiber auflisten:"
 
 #. type: Plain text
-#: lp.man:248
+#: lpinfo.8:110
 #, no-wrap
-msgid "    lp -d foo -o media=legal -o sides=two-sided-long-edge filename\n"
-msgstr "    lp -d foo -o media=legal -o sides=two-sided-long-edge Dateiname\n"
+msgid "    lpinfo -m\n"
+msgstr "    lpinfo -m\n"
 
 #. type: Plain text
-#: lp.man:251 lpr.man:203
-msgid "Print a presentation document 2-up to a printer called \"foo\":"
-msgstr ""
-"Druckt ein Präsentations-Dokument zweifach pro Seite auf dem Drucker mit "
-"Namen »foo«:"
+#: lpinfo.8:113
+msgid "List drivers matching \"HP LaserJet\":"
+msgstr "Alle auf »HP LaserJet« passenden Treiber auflisten:"
 
 #. type: Plain text
-#: lp.man:254
+#: lpinfo.8:116
 #, no-wrap
-msgid "    lp -d foo -o number-up=2 filename\n"
-msgstr "    lp -d foo -o number-up=2 Dateiname\n"
+msgid "    lpinfo --make-and-model \"HP LaserJet\" -m\n"
+msgstr "    lpinfo --make-and-model \"HP LaserJet\" -m\n"
 
 #. type: Plain text
-#: lp.man:264
-msgid ""
-"B<cancel>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), B<lpr>(1), "
-"B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
-msgstr ""
-"B<cancel>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), B<lpr>(1), "
-"B<lprm>(1), B<lpstat>(1), CUPS-Online-Hilfe (http://localhost:631/help)"
+#: lpinfo.8:124
+msgid "B<lpadmin>(8), CUPS Online Help (http://localhost:631/help)"
+msgstr "B<lpadmin>(8), CUPS-Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: lpmove.man:13
+#: lpmove.8:10
 #, no-wrap
 msgid "lpmove"
 msgstr "lpmove"
 
-#. type: TH
-#: lpmove.man:13
-#, no-wrap
-msgid "26 May 2016"
-msgstr "26. Mai 2016"
-
 #. type: Plain text
-#: lpmove.man:16
+#: lpmove.8:13
 msgid "lpmove - move a job or all jobs to a new destination"
 msgstr "lpmove - verschiebe einen oder alle Aufträge zu einem neuen Ziel"
 
 #. type: Plain text
-#: lpmove.man:28
+#: lpmove.8:25
 msgid ""
 "B<lpmove> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-U> I<username> ] "
 "I<job> I<destination>"
@@ -14611,7 +14615,7 @@ msgstr ""
 "I<Benutzername> ] I<Auftrag> I<Ziel>"
 
 #. type: Plain text
-#: lpmove.man:40
+#: lpmove.8:37
 msgid ""
 "B<lpmove> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-U> I<username> ] "
 "I<source> I<destination>"
@@ -14620,7 +14624,7 @@ msgstr ""
 "I<Benutzername> ] I<Quelle> I<Ziel>"
 
 #. type: Plain text
-#: lpmove.man:42
+#: lpmove.8:39
 msgid ""
 "B<lpmove> moves the specified I<job> or all jobs from I<source> to "
 "I<destination>. I<job> can be the job ID number or the old destination and "
@@ -14631,73 +14635,67 @@ msgstr ""
 "Ziel und die Auftrags-ID sein."
 
 #. type: Plain text
-#: lpmove.man:44
+#: lpmove.8:41
 msgid "The B<lpmove> command supports the following options:"
 msgstr "Der Befehl B<lpmove> unterstützt die folgenden Optionen:"
 
 #. type: Plain text
-#: lpmove.man:50 lpq.man:50 lpr.man:88 lprm.man:52 lpstat.man:86
+#: lpmove.8:47 lpq.1:47 lpr.1:85 lprm.1:49 lpstat.1:82
 msgid "Specifies an alternate username."
 msgstr "Legt einen alternativen Benutzernamen fest."
 
 #. type: Plain text
-#: lpmove.man:55
+#: lpmove.8:52
 msgid "Move job 123 from \"oldprinter\" to \"newprinter\":"
 msgstr "Auftrag 123 von »Alterdrucker« nach »Neuerdrucker« verschieben:"
 
 #. type: Plain text
-#: lpmove.man:58
+#: lpmove.8:55
 #, no-wrap
 msgid "    lpmove 123 newprinter\n"
 msgstr "    lpmove 123 Neuerdrucker\n"
 
 #. type: Plain text
-#: lpmove.man:60
+#: lpmove.8:57
 #, no-wrap
 msgid "            I<or>\n"
 msgstr "            I<oder>\n"
 
 #. type: Plain text
-#: lpmove.man:62
+#: lpmove.8:59
 #, no-wrap
 msgid "    lpmove oldprinter-123 newprinter\n"
 msgstr "    lpmove Alterdrucker-123 Neuerdrucker\n"
 
 #. type: Plain text
-#: lpmove.man:65
+#: lpmove.8:62
 msgid "Move all jobs from \"oldprinter\" to \"newprinter\":"
 msgstr "Alle Aufträge von »Alterdrucker« nach »Neuerdrucker« verschieben:"
 
 #. type: Plain text
-#: lpmove.man:68
+#: lpmove.8:65
 #, no-wrap
 msgid "    lpmove oldprinter newprinter\n"
 msgstr "   lpmove Alterdrucker Neuerdrucker\n"
 
 #. type: Plain text
-#: lpmove.man:74
+#: lpmove.8:71
 msgid "B<cancel>(1), B<lp>(1), B<lpr>(1), B<lprm>(1),"
 msgstr "B<cancel>(1), B<lp>(1), B<lpr>(1), B<lprm>(1),"
 
 #. type: TH
-#: lpoptions.man.in:13
+#: lpoptions.1:10
 #, no-wrap
 msgid "lpoptions"
 msgstr "lpoptions"
 
-#. type: TH
-#: lpoptions.man.in:13
-#, no-wrap
-msgid "10 April 2018"
-msgstr "10. April 2018"
-
 #. type: Plain text
-#: lpoptions.man.in:16
+#: lpoptions.1:13
 msgid "lpoptions - display or set printer options and defaults"
 msgstr "lpoptions - zeigt oder setzt Druckeroptionen und -voreinstellungen"
 
 #. type: Plain text
-#: lpoptions.man.in:27
+#: lpoptions.1:24
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] B<-d "
 ">I<destination>[B</>I<instance>] [ B<-l> ]"
@@ -14706,7 +14704,7 @@ msgstr ""
 "Instanz>] [ B<-l> ]"
 
 #. type: Plain text
-#: lpoptions.man.in:37
+#: lpoptions.1:34
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-p "
 ">I<destination>[B</>I<instance>] ] B<-o >I<option>[B<=>I<value>] ..."
@@ -14715,7 +14713,7 @@ msgstr ""
 ">I</Instanz>] ] B<-o >I<Option>[B<=>I<Wert>] …"
 
 #. type: Plain text
-#: lpoptions.man.in:48
+#: lpoptions.1:45
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-p "
 ">I<destination>[B</>I<instance>] ] B<-r> I<option>"
@@ -14724,7 +14722,7 @@ msgstr ""
 ">I</Instanz>] ] B<-r> I<Option>"
 
 #. type: Plain text
-#: lpoptions.man.in:56
+#: lpoptions.1:53
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] B<-x "
 ">I<destination>[B</>I<instance>]"
@@ -14733,7 +14731,7 @@ msgstr ""
 "Instanz>]"
 
 #. type: Plain text
-#: lpoptions.man.in:60
+#: lpoptions.1:57
 msgid ""
 "B<lpoptions> displays or sets printer options and defaults.  If no printer "
 "is specified using the I<-p> option, the default printer is used as "
@@ -14744,7 +14742,7 @@ msgstr ""
 "B<lp>(1) beschrieben, verwandt."
 
 #. type: Plain text
-#: lpoptions.man.in:62
+#: lpoptions.1:59
 msgid ""
 "If no I<-l>, I<-o>, or I<-r> options are specified, the current options are "
 "reported on the standard output."
@@ -14753,7 +14751,7 @@ msgstr ""
 "aktuellen Optionen auf der Standardausgabe berichtet."
 
 #. type: Plain text
-#: lpoptions.man.in:68
+#: lpoptions.1:65
 msgid ""
 "Options set with the B<lpoptions> command are used by the B<lp>(1)  and "
 "B<lpr>(1)  commands when submitting jobs."
@@ -14762,7 +14760,7 @@ msgstr ""
 "Befehlen I<lp>(1) und I<lpr>(1) beim Einreichen von Druckaufträgen verwandt."
 
 #. type: Plain text
-#: lpoptions.man.in:71
+#: lpoptions.1:68
 msgid ""
 "When run by the root user, B<lpoptions> gets and sets default options and "
 "instances for all users in the I</etc/cups/lpoptions> file.  Otherwise, the "
@@ -14774,23 +14772,23 @@ msgstr ""
 "Datei I<~/.cups/lpoptions> verwaltet."
 
 #. type: Plain text
-#: lpoptions.man.in:73
+#: lpoptions.1:70
 msgid "B<lpoptions> supports the following options:"
 msgstr "I<lpoptions> unterstützt die folgenden Optionen:"
 
 #. type: Plain text
-#: lpoptions.man.in:76
+#: lpoptions.1:73
 msgid "Enables encryption when communicating with the CUPS server."
 msgstr "Aktiviert Verschlüsselung für die Kommunikation mit dem CUPS-Server."
 
 #. type: TP
-#: lpoptions.man.in:76
+#: lpoptions.1:73
 #, no-wrap
 msgid "B<-d >I<destination>[B</>I<instance>]"
 msgstr "B<-d >I<Ziel>[B</>I</Instanz>]"
 
 #. type: Plain text
-#: lpoptions.man.in:81
+#: lpoptions.1:78
 msgid ""
 "Sets the user default printer to I<destination>.  If I<instance> is supplied "
 "then that particular instance is used.  This option overrides the system "
@@ -14801,35 +14799,35 @@ msgstr ""
 "Standarddrucker für den aktuellen Benutzer."
 
 #. type: Plain text
-#: lpoptions.man.in:84
+#: lpoptions.1:81
 msgid "Uses an alternate server."
 msgstr "Verwendet einen alternativen Server."
 
 #. type: Plain text
-#: lpoptions.man.in:87
+#: lpoptions.1:84
 msgid "Lists the printer specific options and their current settings."
 msgstr ""
 "Listet die druckerspezifischen Optionen und ihre aktuellen Einstellungen auf."
 
 #. type: TP
-#: lpoptions.man.in:87 lpr.man:101
+#: lpoptions.1:84 lpr.1:98
 #, no-wrap
 msgid "B<-o >I<option>[B<=>I<value>]"
 msgstr "B<-o >I<Option>[B<=>I<Wert>]"
 
 #. type: Plain text
-#: lpoptions.man.in:90
+#: lpoptions.1:87
 msgid "Specifies a new option for the named destination."
 msgstr "Legt eine neue Option für das benannte Ziel fest."
 
 #. type: TP
-#: lpoptions.man.in:90
+#: lpoptions.1:87
 #, no-wrap
 msgid "B<-p >I<destination>[B</>I<instance>]"
 msgstr "B<-p >I<Ziel>[B</>I</Instanz>]"
 
 #. type: Plain text
-#: lpoptions.man.in:97
+#: lpoptions.1:94
 msgid ""
 "Sets the destination and instance, if specified, for any options that "
 "follow.  If the named instance does not exist then it is created.  "
@@ -14840,24 +14838,24 @@ msgstr ""
 "nur mit dem Programm B<lpadmin>(8) erstellt werden."
 
 #. type: TP
-#: lpoptions.man.in:97
+#: lpoptions.1:94
 #, no-wrap
 msgid "B<-r >I<option>"
 msgstr "B<-r >I<Option>"
 
 #. type: Plain text
-#: lpoptions.man.in:100
+#: lpoptions.1:97
 msgid "Removes the specified option from the named destination."
 msgstr "Entfernt die festgelegte Option aus dem benannten Ziel."
 
 #. type: TP
-#: lpoptions.man.in:100
+#: lpoptions.1:97
 #, no-wrap
 msgid "B<-x >I<destination>[B</>I<instance>]"
 msgstr "B<-x >I<Ziel>[B</>I</Instanz>]"
 
 #. type: Plain text
-#: lpoptions.man.in:107
+#: lpoptions.1:104
 msgid ""
 "Removes the options for the named destination and instance, if specified.  "
 "If the named instance does not exist then this does nothing.  Destinations "
@@ -14868,7 +14866,7 @@ msgstr ""
 "Ziele können nur mit dem Befehl B<lpadmin>(8) entfernt werden."
 
 #. type: Plain text
-#: lpoptions.man.in:109
+#: lpoptions.1:106
 msgid ""
 "I<~/.cups/lpoptions> - user defaults and instances created by non-root users."
 msgstr ""
@@ -14876,7 +14874,7 @@ msgstr ""
 "erstellte Instanzen."
 
 #. type: Plain text
-#: lpoptions.man.in:111
+#: lpoptions.1:108
 msgid ""
 "I</etc/cups/lpoptions> - system-wide defaults and instances created by the "
 "root user."
@@ -14885,12 +14883,12 @@ msgstr ""
 "Benutzer erstellt wurden."
 
 #. type: Plain text
-#: lpoptions.man.in:113
+#: lpoptions.1:110
 msgid "The B<lpoptions> command is unique to CUPS."
 msgstr "Der Befehl B<lpoptions> ist eine Besonderheit von CUPS."
 
 #. type: Plain text
-#: lpoptions.man.in:120
+#: lpoptions.1:117
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpadmin>(8), B<lpr>(1), B<lprm>(1), CUPS Online "
 "Help (http://localhost:631/help)"
@@ -14899,18 +14897,18 @@ msgstr ""
 "Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: lpq.man:13
+#: lpq.1:10
 #, no-wrap
 msgid "lpq"
 msgstr "lpq"
 
 #. type: Plain text
-#: lpq.man:16
+#: lpq.1:13
 msgid "lpq - show printer queue status"
 msgstr "lpq - zeigt den Status von Druckerwarteschlangen"
 
 #. type: Plain text
-#: lpq.man:34
+#: lpq.1:31
 msgid ""
 "B<lpq> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-"
 "P >I<destination>[B</>I<instance>] ] [ B<-a> ] [ B<-l> ] [ B<+>I<interval> ]"
@@ -14919,7 +14917,7 @@ msgstr ""
 "[ B<-P >I<Ziel>[B</>I<Instanz>] ] [ B<-a> ] [ B<-l> ] [ B<+>I<Intervall> ]"
 
 #. type: Plain text
-#: lpq.man:37
+#: lpq.1:34
 msgid ""
 "B<lpq> shows the current print queue status on the named printer.  Jobs "
 "queued on the default destination will be shown if no printer or class is "
@@ -14931,7 +14929,7 @@ msgstr ""
 "angegeben ist."
 
 #. type: Plain text
-#: lpq.man:39
+#: lpq.1:36
 msgid ""
 "The I<+interval> option allows you to continuously report the jobs in the "
 "queue until the queue is empty; the list of jobs is shown once every "
@@ -14942,33 +14940,33 @@ msgstr ""
 "wird einmal alle I<Intervall> Sekunden angezeigt."
 
 #. type: Plain text
-#: lpq.man:41
+#: lpq.1:38
 msgid "B<lpq> supports the following options:"
 msgstr "B<lpq> unterstützt die folgenden Optionen:"
 
 #. type: TP
-#: lpq.man:44 lpr.man:82
+#: lpq.1:41 lpr.1:79
 #, no-wrap
 msgid "B<-P >I<destination>[B</>I<instance>]"
 msgstr "B<-P >I<Ziel>[B</>I</Instanz>]"
 
 #. type: Plain text
-#: lpq.man:47
+#: lpq.1:44
 msgid "Specifies an alternate printer or class name."
 msgstr "Legt einen alternativen Drucker- oder Klassennamen fest."
 
 #. type: Plain text
-#: lpq.man:53
+#: lpq.1:50
 msgid "Reports jobs on all printers."
 msgstr "Berichtet Aufträge auf allen Druckern."
 
 #. type: Plain text
-#: lpq.man:59
+#: lpq.1:56
 msgid "Requests a more verbose (long) reporting format."
 msgstr "Erbittet ein ausführlicheres (langes) Berichtsformat."
 
 #. type: Plain text
-#: lpq.man:66
+#: lpq.1:63
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpr>(1), B<lprm>(1), B<lpstat>(1), CUPS Online "
 "Help (http://localhost:631/help)"
@@ -14977,18 +14975,18 @@ msgstr ""
 "Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: lpr.man:13
+#: lpr.1:10
 #, no-wrap
 msgid "lpr"
 msgstr "lpr"
 
 #. type: Plain text
-#: lpr.man:16
+#: lpr.1:13
 msgid "lpr - print files"
 msgstr "lpr - druckt Dateien"
 
 #. type: Plain text
-#: lpr.man:56
+#: lpr.1:53
 msgid ""
 "B<lpr> [ B<-E> ] [ B<-H >I<server>[B<:>I<port>] ] [ B<-U> I<username> ] [ B<-"
 "P >I<destination>[B</>I<instance>] ] [ B<-#> I<num-copies> [ B<-h> ] [ B<-"
@@ -15002,7 +15000,7 @@ msgstr ""
 "[ I<Datei(en)> ]"
 
 #. type: Plain text
-#: lpr.man:60
+#: lpr.1:57
 msgid ""
 "B<lpr> submits files for printing.  Files named on the command line are sent "
 "to the named printer or the default destination if no destination is "
@@ -15015,47 +15013,47 @@ msgstr ""
 "sind, liest B<lpr> die zu druckenden Dateien von der Standardeingabe."
 
 #. type: Plain text
-#: lpr.man:69
+#: lpr.1:66
 msgid "The following options are recognized by I<lpr>:"
 msgstr "Die folgenden Optionen werden von I<lpr> erkannt:"
 
 #. type: TP
-#: lpr.man:72
+#: lpr.1:69
 #, no-wrap
 msgid "B<-H >I<server>[B<:>I<port>]"
 msgstr "B<-H >I<Server>[B<:>I<Port>]"
 
 #. type: TP
-#: lpr.man:75
+#: lpr.1:72
 #, no-wrap
 msgid "B<-C \">I<name>B<\">"
 msgstr "B<-C \">I<Name>B<\">"
 
 #. type: TP
-#: lpr.man:77
+#: lpr.1:74
 #, no-wrap
 msgid "B<-J \">I<name>B<\">"
 msgstr "B<-J \">I<Name>B<\">"
 
 #. type: TP
-#: lpr.man:79
+#: lpr.1:76
 #, no-wrap
 msgid "B<-T \">I<name>B<\">"
 msgstr "B<-T \">I<Name>B<\">"
 
 #. type: Plain text
-#: lpr.man:82
+#: lpr.1:79
 msgid "Sets the job name/title."
 msgstr "Setzt den Namen/Titel des Auftrags."
 
 #. type: TP
-#: lpr.man:88
+#: lpr.1:85
 #, no-wrap
 msgid "B<-# >I<copies>"
 msgstr "B<-# >I<Kopien>"
 
 #. type: Plain text
-#: lpr.man:94
+#: lpr.1:91
 msgid ""
 "Disables banner printing. This option is equivalent to I<-o job-sheets=none>."
 msgstr ""
@@ -15063,7 +15061,7 @@ msgstr ""
 "o job-sheets=none>."
 
 #. type: Plain text
-#: lpr.man:98
+#: lpr.1:95
 msgid ""
 "Specifies that the print file is already formatted for the destination and "
 "should be sent without filtering.  This option is equivalent to I<-o raw>."
@@ -15072,19 +15070,19 @@ msgstr ""
 "Filtern gesendet werden soll. Diese Option ist äquivalent zu I<-o raw>."
 
 #. type: Plain text
-#: lpr.man:101
+#: lpr.1:98
 msgid "Send an email on job completion."
 msgstr "Schickt eine E-Mail nach Erledigung des Auftrags."
 
 #. type: Plain text
-#: lpr.man:105
+#: lpr.1:102
 msgid "Sets a job option.  See \"COMMON JOB OPTIONS\" below."
 msgstr ""
 "Setzt eine Auftragsoption. Siehe »HÄUFIGE DRUCKAUFTRAGSOPTIONEN« weiter "
 "unten."
 
 #. type: Plain text
-#: lpr.man:109
+#: lpr.1:106
 msgid ""
 "Specifies that the print file should be formatted with a shaded header with "
 "the date, time, job name, and page number.  This option is equivalent to I<-"
@@ -15096,12 +15094,12 @@ msgstr ""
 "nützlich."
 
 #. type: Plain text
-#: lpr.man:112
+#: lpr.1:109
 msgid "Hold job for printing."
 msgstr "Druckauftrag zum Drucken anhalten."
 
 #. type: Plain text
-#: lpr.man:115
+#: lpr.1:112
 msgid ""
 "Specifies that the named print files should be deleted after submitting them."
 msgstr ""
@@ -15109,7 +15107,7 @@ msgstr ""
 "soll."
 
 #. type: Plain text
-#: lpr.man:189
+#: lpr.1:153
 msgid ""
 "The I<-c>, I<-d>, I<-f>, I<-g>, I<-i>, I<-n>, I<-t>, I<-v>, and I<-w> "
 "options are not supported by CUPS and produce a warning message if used."
@@ -15119,25 +15117,32 @@ msgstr ""
 "Warnmeldung."
 
 #. type: Plain text
-#: lpr.man:194
+#: lpr.1:158
 #, no-wrap
 msgid "    lpr -# 2 filename\n"
 msgstr "    lpr -# 2 Dateiname\n"
 
 #. type: Plain text
-#: lpr.man:200
+#: lpr.1:164
 #, no-wrap
 msgid "    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename\n"
 msgstr "    lpr -P foo -o media=legal -o sides=two-sided-long-edge Dateiname\n"
 
 #. type: Plain text
-#: lpr.man:206
+#: lpr.1:167
+msgid "Print a presentation document 2-up to a printer called \"foo\":"
+msgstr ""
+"Druckt ein Präsentations-Dokument zweifach pro Seite auf dem Drucker mit "
+"Namen »foo«:"
+
+#. type: Plain text
+#: lpr.1:170
 #, no-wrap
 msgid "    lpr -P foo -o number-up=2 filename\n"
 msgstr "    lpr -P foo -o number-up=2 Dateiname\n"
 
 #. type: Plain text
-#: lpr.man:216
+#: lpr.1:180
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), "
 "B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
@@ -15146,24 +15151,18 @@ msgstr ""
 "B<lprm>(1), B<lpstat>(1), CUPS-Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: lprm.man:13
+#: lprm.1:10
 #, no-wrap
 msgid "lprm"
 msgstr "lprm"
 
-#. type: TH
-#: lprm.man:13
-#, no-wrap
-msgid "22 May 2014"
-msgstr "22. Mai 2014"
-
 #. type: Plain text
-#: lprm.man:16
+#: lprm.1:13
 msgid "lprm - cancel print jobs"
 msgstr "lprm - Druckaufträge abbrechen"
 
 #. type: Plain text
-#: lprm.man:34
+#: lprm.1:31
 msgid ""
 "B<lprm> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<server>[I<:port>] ] [ B<-"
 "P> I<destination>[I</instance>] ] [ B<-> ] [ I<job-id(s)> ]"
@@ -15172,7 +15171,7 @@ msgstr ""
 "[ B<-P> I<Ziel>[I</Instanz>] ] [ B<-> ] [ I<Auftrags-ID(s)> ]"
 
 #. type: Plain text
-#: lprm.man:39
+#: lprm.1:36
 msgid ""
 "B<lprm> cancels print jobs that have been queued for printing.  If no "
 "arguments are supplied, the current job on the default destination is "
@@ -15186,29 +15185,29 @@ msgstr ""
 "alle Aufträge abzubrechen."
 
 #. type: Plain text
-#: lprm.man:43
+#: lprm.1:40
 msgid "The B<lprm> command supports the following options:"
 msgstr "Der Befehl B<lprm> unterstützt die folgenden Optionen:"
 
 #. type: TP
-#: lprm.man:46
+#: lprm.1:43
 #, no-wrap
 msgid "B<-P >I<destination>[I</instance>]"
 msgstr "B<-P >I<Ziel>[I</Instanz>]"
 
 #. type: Plain text
-#: lprm.man:49
+#: lprm.1:46
 msgid "Specifies the destination printer or class."
 msgstr "Legt den Zieldrucker oder die Zielklasse fest."
 
 #. type: TP
-#: lprm.man:52
+#: lprm.1:49
 #, no-wrap
 msgid "B<-h >I<server>[I<:port>]"
 msgstr "B<-h >I<Server>[I<:Port>]"
 
 #. type: Plain text
-#: lprm.man:59
+#: lprm.1:56
 msgid ""
 "The CUPS version of B<lprm> is compatible with the standard Berkeley command "
 "of the same name."
@@ -15217,35 +15216,35 @@ msgstr ""
 "gleichen Namen kompatibel."
 
 #. type: Plain text
-#: lprm.man:61
+#: lprm.1:58
 msgid "Cancel the current job on the default printer:"
 msgstr "Den aktuellen Auftrag auf dem Standarddrucker abbrechen:"
 
 #. type: Plain text
-#: lprm.man:64
+#: lprm.1:61
 #, no-wrap
 msgid "    lprm\n"
 msgstr "    lprm\n"
 
 #. type: Plain text
-#: lprm.man:67
+#: lprm.1:64
 msgid "Cancel job 1234:"
 msgstr "Auftrag 1234 abbrechen:"
 
 #. type: Plain text
-#: lprm.man:70
+#: lprm.1:67
 #, no-wrap
 msgid "    lprm 1234\n"
 msgstr "    lprm 1234\n"
 
 #. type: Plain text
-#: lprm.man:76
+#: lprm.1:73
 #, no-wrap
 msgid "    lprm -\n"
 msgstr "    lprm -\n"
 
 #. type: Plain text
-#: lprm.man:84
+#: lprm.1:81
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpq>(1), B<lpr>(1), B<lpstat>(1), CUPS Online Help "
 "(http://localhost:631/help)"
@@ -15254,24 +15253,18 @@ msgstr ""
 "Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: lpstat.man:13
+#: lpstat.1:9
 #, no-wrap
 msgid "lpstat"
 msgstr "lpstat"
 
-#. type: TH
-#: lpstat.man:13
-#, no-wrap
-msgid "26 May 2017"
-msgstr "26. Mai 2017"
-
 #. type: Plain text
-#: lpstat.man:16
+#: lpstat.1:12
 msgid "lpstat - print cups status information"
 msgstr "lpstat - gibt CUPS-Statusinformationen aus"
 
 #. type: Plain text
-#: lpstat.man:69
+#: lpstat.1:65
 msgid ""
 "B<lpstat> [ B<-E> ] [ B<-H> ] [ B<-U> I<username> ] [ B<-h >I<hostname>[B<:"
 ">I<port>] ] [ B<-l> ] [ B<-W> I<which-jobs> ] [ B<-a> "
@@ -15286,7 +15279,7 @@ msgstr ""
 "[ B<-t> ] [ B<-u> [ I<Benutzer> ] ] [ B<-v> [ I<Drucker> ] ]"
 
 #. type: Plain text
-#: lpstat.man:72
+#: lpstat.1:68
 msgid ""
 "B<lpstat> displays status information about the current classes, jobs, and "
 "printers.  When run with no arguments, B<lpstat> will list active jobs "
@@ -15297,40 +15290,40 @@ msgstr ""
 "aktiven, vom aktuellen Benutzer eingereichten Druckaufträge auf."
 
 #. type: Plain text
-#: lpstat.man:74
+#: lpstat.1:70
 msgid "The B<lpstat> command supports the following options:"
 msgstr "Der Befehl B<lpstat> unterstützt die folgenden Optionen:"
 
 #. type: TP
-#: lpstat.man:77
+#: lpstat.1:73
 #, no-wrap
 msgid "B<-H>"
 msgstr "B<-H>"
 
 #. type: Plain text
-#: lpstat.man:80
+#: lpstat.1:76
 msgid "Shows the server hostname and port."
 msgstr "Zeigt den Rechnernamen und Port des Servers."
 
 #. type: TP
-#: lpstat.man:80
+#: lpstat.1:76
 #, no-wrap
 msgid "B<-R>"
 msgstr "B<-R>"
 
 #. type: Plain text
-#: lpstat.man:83
+#: lpstat.1:79
 msgid "Shows the ranking of print jobs."
 msgstr "Zeigt die Rangordnung der Druckaufträge."
 
 #. type: TP
-#: lpstat.man:86
+#: lpstat.1:82
 #, no-wrap
 msgid "B<-W >I<which-jobs>"
 msgstr "B<-W >I<welche-Aufträge>"
 
 #. type: Plain text
-#: lpstat.man:90
+#: lpstat.1:86
 msgid ""
 "Specifies which jobs to show, \"completed\" or \"not-completed\" (the "
 "default).  This option I<must> appear before the I<-o> option and/or any "
@@ -15345,13 +15338,13 @@ msgstr ""
 "(Scheduler) verwandt wird."
 
 #. type: TP
-#: lpstat.man:90
+#: lpstat.1:86
 #, no-wrap
 msgid "B<-a >[I<printer(s)>]"
 msgstr "B<-a >[I<Drucker>]"
 
 #. type: Plain text
-#: lpstat.man:94
+#: lpstat.1:90
 msgid ""
 "Shows the accepting state of printer queues.  If no printers are specified "
 "then all printers are listed."
@@ -15360,13 +15353,13 @@ msgstr ""
 "angegeben sind, werden alle Drucker aufgeführt."
 
 #. type: TP
-#: lpstat.man:94
+#: lpstat.1:90
 #, no-wrap
 msgid "B<-c >[I<class(es)>]"
 msgstr "B<-c >[I<Klasse(n)>]"
 
 #. type: Plain text
-#: lpstat.man:98
+#: lpstat.1:94
 msgid ""
 "Shows the printer classes and the printers that belong to them.  If no "
 "classes are specified then all classes are listed."
@@ -15375,34 +15368,34 @@ msgstr ""
 "angegeben sind, werden alle Klassen aufgeführt."
 
 #. type: TP
-#: lpstat.man:98
+#: lpstat.1:94
 #, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
 
 #. type: Plain text
-#: lpstat.man:101
+#: lpstat.1:97
 msgid "Shows the current default destination."
 msgstr "Zeigt das aktuelle Standardziel."
 
 #. type: Plain text
-#: lpstat.man:104
+#: lpstat.1:100
 msgid "Shows all available destinations on the local network."
 msgstr "Zeigt alle verfügbaren Ziele im lokalen Netz an."
 
 #. type: Plain text
-#: lpstat.man:110
+#: lpstat.1:106
 msgid "Shows a long listing of printers, classes, or jobs."
 msgstr "Zeigt eine lange Auflistung von Druckern, Klassen oder Aufträgen."
 
 #. type: TP
-#: lpstat.man:110
+#: lpstat.1:106
 #, no-wrap
 msgid "B<-o >[I<destination(s)>]"
 msgstr "B<-o >[I<Ziel(e)>]"
 
 #. type: Plain text
-#: lpstat.man:114
+#: lpstat.1:110
 msgid ""
 "Shows the jobs queued on the specified destinations.  If no destinations are "
 "specified all jobs are shown."
@@ -15411,13 +15404,13 @@ msgstr ""
 "angegeben sind, werden alle Aufträge gezeigt."
 
 #. type: TP
-#: lpstat.man:114
+#: lpstat.1:110
 #, no-wrap
 msgid "B<-p >[I<printer(s)>]"
 msgstr "B<-p >[I<Drucker>]"
 
 #. type: Plain text
-#: lpstat.man:118
+#: lpstat.1:114
 msgid ""
 "Shows the printers and whether they are enabled for printing.  If no "
 "printers are specified then all printers are listed."
@@ -15426,12 +15419,12 @@ msgstr ""
 "angegeben wurden, werden alle Drucker aufgeführt."
 
 #. type: Plain text
-#: lpstat.man:121
+#: lpstat.1:117
 msgid "Shows whether the CUPS server is running."
 msgstr "Zeigt, ob der CUPS-Server läuft."
 
 #. type: Plain text
-#: lpstat.man:125
+#: lpstat.1:121
 msgid ""
 "Shows a status summary, including the default destination, a list of classes "
 "and their member printers, and a list of printers and their associated "
@@ -15443,7 +15436,7 @@ msgstr ""
 "I<-c> und I<-v>."
 
 #. type: Plain text
-#: lpstat.man:129
+#: lpstat.1:125
 msgid ""
 "Shows all status information.  This is equivalent to using the I<-r>, I<-d>, "
 "I<-c>, I<-v>, I<-a>, I<-p>, and I<-o> options."
@@ -15452,13 +15445,13 @@ msgstr ""
 "Optionen I<-r>, I<-d>, I<-c>, I<-v>, I<-a>, I<-p> und I<-o>."
 
 #. type: TP
-#: lpstat.man:129
+#: lpstat.1:125
 #, no-wrap
 msgid "B<-u >[I<user(s)>]"
 msgstr "B<-u >[I<Benutzer>]"
 
 #. type: Plain text
-#: lpstat.man:133
+#: lpstat.1:129
 msgid ""
 "Shows a list of print jobs queued by the specified users.  If no users are "
 "specified, lists the jobs queued by the current user."
@@ -15468,13 +15461,13 @@ msgstr ""
 "aktuellen Benutzers aufgelistet."
 
 #. type: TP
-#: lpstat.man:133
+#: lpstat.1:129
 #, no-wrap
 msgid "B<-v >[I<printer(s)>]"
 msgstr "B<-v >[I<Drucker>]"
 
 #. type: Plain text
-#: lpstat.man:137
+#: lpstat.1:133
 msgid ""
 "Shows the printers and what device they are attached to.  If no printers are "
 "specified then all printers are listed."
@@ -15483,7 +15476,7 @@ msgstr ""
 "angegeben sind, werden alle Drucker aufgelistet."
 
 #. type: Plain text
-#: lpstat.man:140
+#: lpstat.1:136
 msgid ""
 "Unlike the System V printing system, CUPS allows printer names to contain "
 "any printable character except SPACE, TAB, \"/\", and \"#\".  Also, printer "
@@ -15495,20 +15488,20 @@ msgstr ""
 "Kleinschreibung nicht unterschieden."
 
 #. type: Plain text
-#: lpstat.man:142
+#: lpstat.1:138
 msgid "The I<-h>, I<-e>, I<-E>, I<-U>, and I<-W> options are unique to CUPS."
 msgstr ""
 "Die Optionen I<-h>, I<-e>, I<-E>, I<-U> und I<-W> sind eine Besonderheit von "
 "CUPS."
 
 #. type: Plain text
-#: lpstat.man:144
+#: lpstat.1:140
 msgid "The Solaris I<-f>, I<-P>, and I<-S> options are silently ignored."
 msgstr ""
 "Die Solaris-Optionen I<-f>, I<-P> und I<-S> werden stillschweigend ignoriert."
 
 #. type: Plain text
-#: lpstat.man:151
+#: lpstat.1:147
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpq>(1), B<lpr>(1), B<lprm>(1), CUPS Online Help "
 "(http://localhost:631/help)"
@@ -15517,18 +15510,18 @@ msgstr ""
 "(http://localhost:631/help)"
 
 #. type: TH
-#: mailto.conf.man:13
+#: mailto.conf.5:10
 #, no-wrap
 msgid "mailto.conf"
 msgstr "mailto.conf"
 
 #. type: Plain text
-#: mailto.conf.man:16
+#: mailto.conf.5:13
 msgid "mailto.conf - configuration file for cups email notifier"
 msgstr "mailto.conf - Konfigurationsdatei für CUPS-E-Mail-Benachrichtigungen"
 
 #. type: Plain text
-#: mailto.conf.man:18
+#: mailto.conf.5:15
 msgid ""
 "The B<mailto.conf> file defines the local mail server and email notification "
 "preferences for CUPS."
@@ -15537,36 +15530,36 @@ msgstr ""
 "Benachrichtigungseinstellungen für CUPS."
 
 #. type: TP
-#: mailto.conf.man:24
+#: mailto.conf.5:21
 #, no-wrap
 msgid "B<Cc >I<cc-address@domain.com>"
 msgstr "B<Cc >I<CC-Adresse@domain.com>"
 
 #. type: Plain text
-#: mailto.conf.man:27
+#: mailto.conf.5:24
 msgid "Specifies an additional recipient for all email notifications."
 msgstr ""
 "Legt einen zusätzlichen Empfänger für alle E-Mail-Benachrichtigungen fest."
 
 #. type: TP
-#: mailto.conf.man:27
+#: mailto.conf.5:24
 #, no-wrap
 msgid "B<From >I<from-address@domain.com>"
 msgstr "B<From >I<Von-Adresse@domain.com>"
 
 #. type: Plain text
-#: mailto.conf.man:30
+#: mailto.conf.5:27
 msgid "Specifies the sender of email notifications."
 msgstr "Legt den Sender von E-Mail-Benachrichtigungen fest."
 
 #. type: TP
-#: mailto.conf.man:30
+#: mailto.conf.5:27
 #, no-wrap
 msgid "B<Sendmail >I<sendmail command and options>"
 msgstr "B<Sendmail >I<Sendmail-Befehl und Optionen>"
 
 #. type: Plain text
-#: mailto.conf.man:35
+#: mailto.conf.5:32
 msgid ""
 "Specifies the sendmail command to use when sending email notifications.  "
 "Only one I<Sendmail> or I<SMTPServer> line may be present in the B<mailto."
@@ -15578,13 +15571,13 @@ msgstr ""
 "sind, wird nur die letzte benutzt."
 
 #. type: TP
-#: mailto.conf.man:35
+#: mailto.conf.5:32
 #, no-wrap
 msgid "B<SMTPServer >I<servername>"
 msgstr "B<SMTPServer> I<Servername>"
 
 #. type: Plain text
-#: mailto.conf.man:40
+#: mailto.conf.5:37
 msgid ""
 "Specifies a SMTP server to send email notifications to.  Only one "
 "I<Sendmail> or I<SMTPServer> line may be present in the B<mailto.conf> "
@@ -15596,13 +15589,13 @@ msgstr ""
 "wird nur die letzte benutzt."
 
 #. type: TP
-#: mailto.conf.man:40
+#: mailto.conf.5:37
 #, no-wrap
 msgid "B<Subject >I<subject-prefix>"
 msgstr "B<Subject >I<Betreff-Anfang>"
 
 #. type: Plain text
-#: mailto.conf.man:43
+#: mailto.conf.5:40
 msgid ""
 "Specifies a prefix string for the subject line of an email notification."
 msgstr ""
@@ -15610,30 +15603,24 @@ msgstr ""
 "Benachrichtigung fest."
 
 #. type: Plain text
-#: mailto.conf.man:46
+#: mailto.conf.5:43
 msgid "B<cupsd>(8), CUPS Online Help (http://localhost:631/help)"
 msgstr "B<cupsd>(8), CUPS-Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: mime.convs.man:13
+#: mime.convs.5:10
 #, no-wrap
 msgid "mime.convs"
 msgstr "mime.convs"
 
-#. type: TH
-#: mime.convs.man:13
-#, no-wrap
-msgid "26 August 2015"
-msgstr "28. August 2015"
-
 #. type: Plain text
-#: mime.convs.man:16
+#: mime.convs.5:13
 #, fuzzy
-msgid "mime.convs - mime type conversion file for cups"
+msgid "mime.convs - mime type conversion file for cups (deprecated)"
 msgstr "mime.convs - MIME-Typ-Konvertierungsdatei für CUPS"
 
 #. type: Plain text
-#: mime.convs.man:19
+#: mime.convs.5:16
 msgid ""
 "The B<mime.convs> file defines the filters that are available for converting "
 "files from one format to another.  The standard filters support text, PDF, "
@@ -15644,7 +15631,7 @@ msgstr ""
 "Text, PDF, PostScript und viele Bilddateitypen."
 
 #. type: Plain text
-#: mime.convs.man:21
+#: mime.convs.5:18
 msgid ""
 "Additional filters are specified in files with the extension I<.convs> in "
 "the CUPS configuration directory."
@@ -15653,7 +15640,7 @@ msgstr ""
 "Konfigurationsverzeichnis festgelegt."
 
 #. type: Plain text
-#: mime.convs.man:26
+#: mime.convs.5:23
 msgid ""
 "Each line in the B<mime.convs> file is a comment, blank, or filter line.  "
 "Comment lines start with the # character.  Filter lines specify the source "
@@ -15666,13 +15653,13 @@ msgstr ""
 "die mit dem Filter assoziiert sind, und den auszuführenden Filter, fest:"
 
 #. type: Plain text
-#: mime.convs.man:29
+#: mime.convs.5:26
 #, no-wrap
 msgid "    source/type destination/type cost filter\n"
 msgstr "    Quelle/Typ Ziel/Typ Belastung Filter\n"
 
 #. type: Plain text
-#: mime.convs.man:32
+#: mime.convs.5:29
 msgid ""
 "The I<source/type> field specifies the source MIME media type that is "
 "consumed by the filter."
@@ -15681,7 +15668,7 @@ msgstr ""
 "Filter verarbeitet wird."
 
 #. type: Plain text
-#: mime.convs.man:34
+#: mime.convs.5:31
 msgid ""
 "The I<destination/type> field specifies the destination MIME media type that "
 "is produced by the filter."
@@ -15690,7 +15677,7 @@ msgstr ""
 "erzeugt wird."
 
 #. type: Plain text
-#: mime.convs.man:37
+#: mime.convs.5:34
 msgid ""
 "The I<cost> field specifies the relative cost for running the filter.  A "
 "value of 100 means that the filter uses a large amount of resources while a "
@@ -15702,7 +15689,7 @@ msgstr ""
 "wenige Ressourcen verwendet."
 
 #. type: Plain text
-#: mime.convs.man:40
+#: mime.convs.5:37
 msgid ""
 "The I<filter> field specifies the filter program filename.  Filenames are "
 "relative to the CUPS filter directory."
@@ -15711,22 +15698,22 @@ msgstr ""
 "sind relativ zu dem CUPS-Filterverzeichnis."
 
 #. type: Plain text
-#: mime.convs.man:42 mime.types.man:92
+#: mime.convs.5:39 mime.types.5:89
 msgid "I</etc/cups> - Typical CUPS configuration directory."
 msgstr "I</etc/cups> - Typisches CUPS-Konfigurationsverzeichnis."
 
 #. type: Plain text
-#: mime.convs.man:44
+#: mime.convs.5:41
 msgid "I</usr/lib/cups/filter> - Typical CUPS filter directory."
 msgstr "I</usr/lib/cups/filter> - Typisches CUPS-Filterverzeichnis."
 
 #. type: Plain text
-#: mime.convs.man:46
+#: mime.convs.5:43
 msgid "I</usr/libexec/cups/filter> - CUPS filter directory on macOS."
 msgstr "I</usr/libexec/cups/filter> - CUPS-Filterverzeichnis unter macOS."
 
 #. type: Plain text
-#: mime.convs.man:48
+#: mime.convs.5:45
 msgid ""
 "Define a filter that converts PostScript documents to CUPS Raster format:"
 msgstr ""
@@ -15734,13 +15721,21 @@ msgstr ""
 "umwandelt:"
 
 #. type: Plain text
-#: mime.convs.man:51
+#: mime.convs.5:48
 #, no-wrap
 msgid "    application/vnd.cups-postscript application/vnd.cups-raster 50 pstoraster\n"
 msgstr "    application/vnd.cups-postscript application/vnd.cups-raster 50 pstoraster\n"
 
 #. type: Plain text
-#: mime.convs.man:60
+#: mime.convs.5:54
+msgid ""
+"CUPS filters are deprecated and will no longer be supported in a future "
+"feature release of CUPS.  Printers that do not support IPP can be supported "
+"using applications such as B<ippeveprinter>(1)."
+msgstr ""
+
+#. type: Plain text
+#: mime.convs.5:61
 msgid ""
 "B<cups-files.conf>(5), B<cupsd.conf>(5), B<cupsd>(8), B<cupsfilter>(8), "
 "B<mime.types>(5), CUPS Online Help (http://localhost:631/help)"
@@ -15749,23 +15744,23 @@ msgstr ""
 "B<mime.types>(5), CUPS-Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: mime.types.man:13
+#: mime.types.5:10
 #, no-wrap
 msgid "mime.types"
 msgstr "mime.types"
 
 #. type: Plain text
-#: mime.types.man:16
+#: mime.types.5:13
 msgid "mime.types - mime type description file for cups"
 msgstr "mime.types - MIME-Typ-Beschreibungsdatei für CUPS"
 
 #. type: Plain text
-#: mime.types.man:18
+#: mime.types.5:15
 msgid "The B<mime.types> file defines the recognized file types."
 msgstr "Die Datei B<mime.types> beschreibt die erkannten Dateitypen."
 
 #. type: Plain text
-#: mime.types.man:20
+#: mime.types.5:17
 msgid ""
 "Additional file types are specified in files with the extension I<.types> in "
 "the CUPS configuration directory."
@@ -15774,7 +15769,7 @@ msgstr ""
 "CUPS-Konfigurationsverzeichnis festgelegt."
 
 #. type: Plain text
-#: mime.types.man:24
+#: mime.types.5:21
 msgid ""
 "Each line in the B<mime.types> file is a comment, blank, or rule line.  "
 "Comment lines start with the # character.  Rule lines start with the MIME "
@@ -15787,13 +15782,13 @@ msgstr ""
 "automatisch zu erkennen:"
 
 #. type: Plain text
-#: mime.types.man:27
+#: mime.types.5:24
 #, no-wrap
 msgid "    I<mime/type >[ I<rule >... I<rule >]\n"
 msgstr "    I<MIME/Typ >[ I<Regel >… I<Regel >]\n"
 
 #. type: Plain text
-#: mime.types.man:30
+#: mime.types.5:27
 msgid ""
 "Rules can be extended over multiple lines using the backslash character "
 "(\\e):"
@@ -15802,7 +15797,7 @@ msgstr ""
 "Rückwärtsschrägstrich (\\e) verwandt wird:"
 
 #. type: Plain text
-#: mime.types.man:34
+#: mime.types.5:31
 #, no-wrap
 msgid ""
 "    I<mime/type >[ I<really-really-really-long-rule >... B<\\e\n"
@@ -15812,7 +15807,7 @@ msgstr ""
 "      >I<Regel >]\n"
 
 #. type: Plain text
-#: mime.types.man:38
+#: mime.types.5:35
 msgid ""
 "MIME media types specified by the I<mime/type> field are case-insensitive "
 "and are sorted in ascending alphanumeric order for the purposes of "
@@ -15825,7 +15820,7 @@ msgstr ""
 "»TYP-ÜBEREINSTIMMUNG UND PRIORITÄT«, um weitere Informationen zu erhalten."
 
 #. type: Plain text
-#: mime.types.man:40
+#: mime.types.5:37
 msgid ""
 "The rules may be grouped using parenthesis, joined using \"+\" for a logical "
 "AND, joined using \",\" or whitespace for a logical OR, and negated using \"!"
@@ -15836,13 +15831,13 @@ msgstr ""
 "ein logisches ODER und »!« für Negation benutzt."
 
 #. type: SS
-#: mime.types.man:40
+#: mime.types.5:37
 #, no-wrap
 msgid "RULES"
 msgstr "REGELN"
 
 #. type: Plain text
-#: mime.types.man:44
+#: mime.types.5:41
 msgid ""
 "Rules take two forms - a filename extension by itself and functions with "
 "test values inside parenthesis.  The following functions are available:"
@@ -15852,26 +15847,26 @@ msgstr ""
 "sind verfügbar:"
 
 #. type: TP
-#: mime.types.man:44
+#: mime.types.5:41
 #, no-wrap
 msgid "B<match(\">I<pattern>B<\")>"
 msgstr "B<match(\">I<Muster>B<\")>"
 
 #. type: Plain text
-#: mime.types.man:47
+#: mime.types.5:44
 msgid "True if the filename matches the given shell wildcard I<pattern>."
 msgstr ""
 "Wahr, falls der Dateiname auf das angegebene Shell-Platzhalter-I<Muster> "
 "passt."
 
 #. type: TP
-#: mime.types.man:47
+#: mime.types.5:44
 #, no-wrap
 msgid "B<ascii(>I<offset>B<,>I<length>B<)>"
 msgstr "B<ascii(>I<Versatz>B<,>I<Länge>B<)>"
 
 #. type: Plain text
-#: mime.types.man:50
+#: mime.types.5:47
 msgid ""
 "True if the I<length> bytes starting at I<offset> are valid printable ASCII "
 "(CR, NL, TAB, BS, 32-126)."
@@ -15880,13 +15875,13 @@ msgstr ""
 "ASCII-Zeichen sind (CR, NL, TAB, BS, 32-126)"
 
 #. type: TP
-#: mime.types.man:50
+#: mime.types.5:47
 #, no-wrap
 msgid "B<printable(>I<offset>B<,>I<length>B<)>"
 msgstr "B<printable(>I<Versatz>B<,>I<Länge>B<)>"
 
 #. type: Plain text
-#: mime.types.man:53
+#: mime.types.5:50
 msgid ""
 "True if the I<length> bytes starting at I<offset> are printable 8-bit chars "
 "(CR, NL, TAB, BS, 32-126, 128-254)."
@@ -15895,13 +15890,13 @@ msgstr ""
 "Bit-Zeichen sind (CR, NL, TAB, BS, 32-126, 128-254)."
 
 #. type: TP
-#: mime.types.man:53
+#: mime.types.5:50
 #, no-wrap
 msgid "B<priority(>I<number>B<)>"
 msgstr "B<priority(>I<Zahl>B<)>"
 
 #. type: Plain text
-#: mime.types.man:58
+#: mime.types.5:55
 msgid ""
 "Specifies the relative priority of this MIME media type.  The default "
 "priority is 100.  Larger values have higher priority while smaller values "
@@ -15912,26 +15907,26 @@ msgstr ""
 "niedrigere Priorität haben."
 
 #. type: TP
-#: mime.types.man:58
+#: mime.types.5:55
 #, no-wrap
 msgid "B<string(>I<offset>B<,\">I<string>B<\")>"
 msgstr "B<string(>I<Versatz>B<,\">I<Zeichenkette>B<\")>"
 
 #. type: Plain text
-#: mime.types.man:61
+#: mime.types.5:58
 msgid "True if the bytes starting at I<offset> are identical to I<string>."
 msgstr ""
 "Wahr, falls die bei I<Versatz> beginnenden Bytes identisch zur "
 "I<Zeichenkette> sind."
 
 #. type: TP
-#: mime.types.man:61
+#: mime.types.5:58
 #, no-wrap
 msgid "B<istring(>I<offset>B<,\">I<string>B<\")>"
 msgstr "B<istring(>I<Versatz>B<,\">I<Zeichenkette>B<\")>"
 
 #. type: Plain text
-#: mime.types.man:64
+#: mime.types.5:61
 msgid ""
 "True if the bytes starting at I<offset> match I<string> without respect to "
 "case."
@@ -15940,24 +15935,24 @@ msgstr ""
 "unabhängig von der Groß-/Kleinschreibung passen."
 
 #. type: TP
-#: mime.types.man:64
+#: mime.types.5:61
 #, no-wrap
 msgid "B<char(>I<offset>B<,>I<value>B<)>"
 msgstr "B<char(>I<Versatz>B<,>I<Wert>B<)>"
 
 #. type: Plain text
-#: mime.types.man:67
+#: mime.types.5:64
 msgid "True if the byte at I<offset> is identical to I<value>."
 msgstr "Wahr, falls das Byte bei I<Versatz> identisch zu I<Wert> ist."
 
 #. type: TP
-#: mime.types.man:67
+#: mime.types.5:64
 #, no-wrap
 msgid "B<short(>I<offset>B<,>I<value>B<)>"
 msgstr "B<short(>I<Versatz>B<,>I<Wert>B<)>"
 
 #. type: Plain text
-#: mime.types.man:70
+#: mime.types.5:67
 msgid ""
 "True if the 16-bit big-endian integer at I<offset> is identical to I<value>."
 msgstr ""
@@ -15965,13 +15960,13 @@ msgstr ""
 "I<Wert> ist."
 
 #. type: TP
-#: mime.types.man:70
+#: mime.types.5:67
 #, no-wrap
 msgid "B<int(>I<offset>B<,>I<value>B<)>"
 msgstr "B<int(>I<Versatz>B<,>I<Wert>B<)>"
 
 #. type: Plain text
-#: mime.types.man:73
+#: mime.types.5:70
 msgid ""
 "True if the 32-bit big-endian integer at I<offset> is identical to I<value>."
 msgstr ""
@@ -15979,24 +15974,24 @@ msgstr ""
 "I<Wert> ist."
 
 #. type: TP
-#: mime.types.man:73
+#: mime.types.5:70
 #, no-wrap
 msgid "B<locale(\">I<string>B<\")>"
 msgstr "B<locale(\">I<Zeichenkette>B<\")>"
 
 #. type: Plain text
-#: mime.types.man:76
+#: mime.types.5:73
 msgid "True if current locale matches I<string>."
 msgstr "Wahr, wenn die aktuelle Standorteinstellung zu I<Zeichenkette> passt."
 
 #. type: TP
-#: mime.types.man:76
+#: mime.types.5:73
 #, no-wrap
 msgid "B<contains(>I<offset>B<,>I<range>B<,\">I<string>B<\")>"
 msgstr "B<contains(>I<Versatz>B<,>I<Bereich>B<,\">I<Zeichenkette>B<\")>"
 
 #. type: Plain text
-#: mime.types.man:79
+#: mime.types.5:76
 msgid ""
 "True if the bytes starting at I<offset> for I<range> bytes contains "
 "I<string>."
@@ -16005,13 +16000,13 @@ msgstr ""
 "I<Zeichenkette> enthält."
 
 #. type: SS
-#: mime.types.man:79
+#: mime.types.5:76
 #, no-wrap
 msgid "STRING CONSTANTS"
 msgstr "ZEICHENKETTENKONSTANTEN"
 
 #. type: Plain text
-#: mime.types.man:81
+#: mime.types.5:78
 msgid ""
 "String constants can be specified inside quotes (\"\") for strings "
 "containing whitespace and angle brackets (E<lt>E<gt>) for hexadecimal "
@@ -16022,13 +16017,13 @@ msgstr ""
 "von Anführungszeichen (\"\") angegeben werden."
 
 #. type: SS
-#: mime.types.man:81
+#: mime.types.5:78
 #, no-wrap
 msgid "TYPE MATCHING AND PRIORITY"
 msgstr "TYP-ÜBEREINSTIMMUNG UND PRIORITÄT"
 
 #. type: Plain text
-#: mime.types.man:85
+#: mime.types.5:82
 msgid ""
 "When CUPS needs to determine the MIME media type of a given file, it checks "
 "every MIME media type defined in the I<.types> files.  When two or more "
@@ -16046,7 +16041,7 @@ msgstr ""
 "erste ausgewählt."
 
 #. type: Plain text
-#: mime.types.man:90
+#: mime.types.5:87
 msgid ""
 "For example, if two types \"text/bar\" and \"text/foo\" are defined as "
 "matching the extension \"doc\", normally the type \"text/bar\" will be "
@@ -16061,7 +16056,7 @@ msgstr ""
 "wird stattdessen »text/foo« ausgewählt."
 
 #. type: Plain text
-#: mime.types.man:94
+#: mime.types.5:91
 msgid ""
 "Define two MIME media types for raster data, with one being a subset with "
 "higher priority:"
@@ -16070,108 +16065,289 @@ msgstr ""
 "Teilmenge mit höherer Priorität ist:"
 
 #. type: Plain text
-#: mime.types.man:99
-#, no-wrap
+#: mime.types.5:96
+#, no-wrap
+msgid ""
+"    application/vnd.cups-raster  string(0,\"RaSt\") string(0,\"tSaR\") \\e\n"
+"                                  string(0,\"RaS2\") string(0,\"2SaR\") \\e\n"
+"                                  string(0,\"RaS3\") string(0,\"3SaR\")\n"
+msgstr ""
+"    application/vnd.cups-raster  string(0,\"RaSt\") string(0,\"tSaR\") \\e\n"
+"                                  string(0,\"RaS2\") string(0,\"2SaR\") \\e\n"
+"                                  string(0,\"RaS3\") string(0,\"3SaR\")\n"
+
+#. type: Plain text
+#: mime.types.5:99
+#, no-wrap
+msgid ""
+"    image/pwg-raster              string(0,\"RaS2\") + \\e\n"
+"                                  string(4,PwgRasterE<lt>00E<gt>) priority(150)\n"
+msgstr ""
+"    image/pwg-raster              string(0,\"RaS2\") + \\e\n"
+"                                  string(4,PwgRasterE<lt>00E<gt>) priority(150)\n"
+
+#. type: Plain text
+#: mime.types.5:107
+msgid ""
+"B<cups-files.conf>(5), B<cupsd.conf>(5), B<cupsd>(8), B<cupsfilter>(8), "
+"B<mime.convs>(5), CUPS Online Help (http://localhost:631/help)"
+msgstr ""
+"B<cups-files.conf>(5), B<cupsd.conf>(5), B<cupsd>(8), B<cupsfilter>(8), "
+"B<mime.convs>(5), CUPS-Online-Hilfe (http://localhost:631/help)"
+
+#. type: TH
+#: notifier.7:10
+#, no-wrap
+msgid "notifier"
+msgstr "notifier"
+
+#. type: Plain text
+#: notifier.7:13
+msgid "notifier - cups notification interface"
+msgstr "notifier - CUPS-Benachrichtigungsschnittstelle"
+
+#. type: Plain text
+#: notifier.7:19
+msgid "B<notifier> I<recipient> [ I<user-data> ]"
+msgstr "B<notifier> I<Empfänger> [ I<Benutzerdaten> ]"
+
+#. type: Plain text
+#: notifier.7:22
+msgid ""
+"The CUPS notifier interface provides a standard method for adding support "
+"for new event notification methods to CUPS.  Each notifier delivers one or "
+"more IPP events from the standard input to the specified recipient."
+msgstr ""
+"Die CUPS-Benachrichtigungsschnittstelle stellt eine Standardmethode zum "
+"Hinzufügen von Unterstützungen für neue Benachrichtigungsmethoden zu CUPS "
+"bereit. Jeder Benachrichtiger liefert eine oder mehrere IPP-Ereignisse aus "
+"der Standardeingabe an den angegebenen Empfänger aus."
+
+#. type: Plain text
+#: notifier.7:31
+msgid ""
+"Notifiers B<MUST> read IPP messages from the standard input using the "
+"B<ippNew>()  and B<ippReadFile>()  functions and exit on error.  Notifiers "
+"are encouraged to exit after a suitable period of inactivity, however they "
+"may exit after reading the first message or stay running until an error is "
+"seen.  Notifiers inherit the environment and can use the logging mechanism "
+"documented in B<filter>(7)."
+msgstr ""
+"Benachrichtiger B<MÜSSEN> IPP-Nachrichten aus der Standardeingabe mittels "
+"der Funktionen B<ippNew>() und B<ippReadFile>() lesen und sich im Fehlerfall "
+"beenden. Benachrichtiger sollten sich nach einer geeigneten Inaktivitätszeit "
+"selbst beenden, allerdings dürfen sie sich auch nach dem Lesen der ersten "
+"Nachricht beenden oder bis ein Fehler auftritt weiterlaufen. Benachrichtiger "
+"erben die Umgebung und können die in B<filter>(7) dokumentierten "
+"Protokolliermechanismen nutzen."
+
+#. type: Plain text
+#: notifier.7:35
+msgid "B<cupsd>(8), B<filter>(7), CUPS Online Help (http://localhost:631/help)"
+msgstr ""
+"B<cupsd>(8), B<filter>(7), CUPS-Online Hilfe (http://localhost:631/help)"
+
+#. type: TH
+#: ppdc.1:10
+#, no-wrap
+msgid "ppdc"
+msgstr "ppdc"
+
+#. type: Plain text
+#: ppdc.1:13
+msgid "ppdc - cups ppd compiler (deprecated)"
+msgstr "ppdc - CUPS-PPD-Compiler (veraltet)"
+
+#. type: Plain text
+#: ppdc.1:45
+msgid ""
+"B<ppdc> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] [ B<-"
+"c> I<message-catalog> ] [ B<-d> I<output-directory> ] [ B<-l> "
+"I<language(s)> ] [ B<-m> ] [ B<-t> ] [ B<-v> ] [ B<-z> ] [ B<--cr> ] [ B<--"
+"crlf> ] [ B<--lf> ] I<source-file>"
+msgstr ""
+"B<ppdc> [ B<-D >I<Name>[B<=>I<Wert>] ] [ B<-I> I<Include-Verzeichnis> ] [ B<-"
+"c> I<Nachrichtenkatalog> ] [ B<-d> I<Ausgabeverzeichnis> ] [ B<-l> "
+"I<Sprache(n)> ] [ B<-m> ] [ B<-t> ] [ B<-v> ] [ B<-z> ] [ B<--cr> ] [ B<--"
+"crlf> ] [ B<--lf> ] I<Quelldatei>"
+
+#. type: Plain text
+#: ppdc.1:48
+msgid ""
+"B<ppdc> compiles PPDC source files into one or more PPD files.  B<This "
+"program is deprecated and will be removed in a future release of CUPS.>"
+msgstr ""
+"B<ppdc> übersetzt PPDC-Quelldateien in eine oder mehrere PPD-Dateien. "
+"B<Dieses Programm ist veraltet und wird in einer zukünftigen "
+"Veröffentlichung von CUPS entfernt.>"
+
+#. type: Plain text
+#: ppdc.1:50
+msgid "B<ppdc> supports the following options:"
+msgstr "I<ppdc> unterstützt die folgenden Optionen:"
+
+#. type: TP
+#: ppdc.1:50 ppdhtml.1:27 ppdpo.1:30
+#, no-wrap
+msgid "B<-D >I<name>[B<=>I<value>]"
+msgstr "B<-D >I<Name>[B<=>I<Wert>]"
+
+#. type: Plain text
+#: ppdc.1:54 ppdhtml.1:31 ppdpo.1:34
+msgid ""
+"Sets the named variable for use in the source file.  It is equivalent to "
+"using the I<#define> directive in the source file."
+msgstr ""
+"Setzt die benannte Variable für die Verwendung in der Quelldatei. Dies ist "
+"äquivalent zu der Verwendung von I<#define>-Direktiven in der Quelldatei."
+
+#. type: TP
+#: ppdc.1:54 ppdhtml.1:31 ppdi.1:32 ppdpo.1:34
+#, no-wrap
+msgid "B<-I >I<include-directory>"
+msgstr "B<-I >I<Include-Verzeichnis>"
+
+#. type: Plain text
+#: ppdc.1:58 ppdhtml.1:35 ppdi.1:36 ppdpo.1:38
+msgid ""
+"Specifies an alternate include directory.  Multiple I<-I> options can be "
+"supplied to add additional directories."
+msgstr ""
+"Legt ein alternatives Include-Verzeichnis fest. Die Option I<-I> kann "
+"mehrfach verwandt werden, um zusätzliche Verzeichnisse hinzuzufügen."
+
+#. type: TP
+#: ppdc.1:58
+#, no-wrap
+msgid "B<-c >I<message-catalog>"
+msgstr "B<-c >I<Nachrichtenkatalog>"
+
+#. type: Plain text
+#: ppdc.1:61
+msgid ""
+"Specifies a single message catalog file in GNU gettext (filename.po) or "
+"Apple strings (filename.strings) format to be used for localization."
+msgstr ""
+"Legt eine einfache Nachrichtenkatalogdatei im GNU-Gettext- (Dateiname.po) "
+"oder Apple-Strings- (Dateiname.strings) Format für die Verwendung in der "
+"Lokalisierung fest."
+
+#. type: TP
+#: ppdc.1:61
+#, no-wrap
+msgid "B<-d >I<output-directory>"
+msgstr "B<-d >I<Ausgabeverzeichnis>"
+
+#. type: Plain text
+#: ppdc.1:65
+msgid ""
+"Specifies the output directory for PPD files.  The default output directory "
+"is \"ppd\"."
+msgstr ""
+"Legt das Ausgabeverzeichnis für PPD-Dateien fest. Die Vorgabe für das "
+"Ausgabeverzeichnis ist »ppd«."
+
+#. type: TP
+#: ppdc.1:65
+#, no-wrap
+msgid "B<-l >I<language(s)>"
+msgstr "B<-l >I<Sprache(n)>"
+
+#. type: Plain text
+#: ppdc.1:70
+msgid ""
+"Specifies one or more languages to use when localizing the PPD file(s).  The "
+"default language is \"en\" (English).  Separate multiple languages with "
+"commas, for example \"de_DE,en_UK,es_ES,es_MX,es_US,fr_CA,fr_FR,it_IT\" will "
+"create PPD files with German, UK English, Spanish (Spain, Mexico, and US), "
+"French (France and Canada), and Italian languages in each file."
+msgstr ""
+"Legt eine oder mehrere Sprachen fest, die bei der Lokalisierung von PPD-"
+"Datei(n) verwandt werden sollen. Die Vorgabesprache ist »en« (englisch). "
+"Mehrere Sprachen können mit Kommata getrennt angegeben werden, z.B. wird "
+"»de_DE,en_UK,es_ES,es_MX,es_US,fr_CA,fr_FR,it_IT« PPD-Dateien mit deutschen, "
+"UK-englischen spanischen (Spanien, Mexiko und USA), französischen "
+"(Frankreich und Kanada) und italienischen Sprachen in einer Datei erstellen."
+
+#. type: Plain text
+#: ppdc.1:73
 msgid ""
-"    application/vnd.cups-raster  string(0,\"RaSt\") string(0,\"tSaR\") \\e\n"
-"                                  string(0,\"RaS2\") string(0,\"2SaR\") \\e\n"
-"                                  string(0,\"RaS3\") string(0,\"3SaR\")\n"
+"Specifies that the output filename should be based on the ModelName value "
+"instead of FileName or PCFilenName."
 msgstr ""
-"    application/vnd.cups-raster  string(0,\"RaSt\") string(0,\"tSaR\") \\e\n"
-"                                  string(0,\"RaS2\") string(0,\"2SaR\") \\e\n"
-"                                  string(0,\"RaS3\") string(0,\"3SaR\")\n"
+"Legt fest, dass der Ausgabename auf dem Wert von ModelName statt von "
+"FileName oder PCFilenName basieren soll."
 
 #. type: Plain text
-#: mime.types.man:102
-#, no-wrap
-msgid ""
-"    image/pwg-raster              string(0,\"RaS2\") + \\e\n"
-"                                  string(4,PwgRasterE<lt>00E<gt>) priority(150)\n"
-msgstr ""
-"    image/pwg-raster              string(0,\"RaS2\") + \\e\n"
-"                                  string(4,PwgRasterE<lt>00E<gt>) priority(150)\n"
+#: ppdc.1:76
+msgid "Specifies that PPD files should be tested instead of generated."
+msgstr "Legt fest, dass PPD-Dateien getestet anstatt erstellt werden sollen."
 
+# FIXME: Original i.O.?
 #. type: Plain text
-#: mime.types.man:110
+#: ppdc.1:82
 msgid ""
-"B<cups-files.conf>(5), B<cupsd.conf>(5), B<cupsd>(8), B<cupsfilter>(8), "
-"B<mime.convs>(5), CUPS Online Help (http://localhost:631/help)"
+"Specifies verbose output, basically a running status of which files are "
+"being loaded or written.  B<-z> Generates compressed PPD files (filename.ppd."
+"gz).  The default is to generate uncompressed PPD files."
 msgstr ""
-"B<cups-files.conf>(5), B<cupsd.conf>(5), B<cupsd>(8), B<cupsfilter>(8), "
-"B<mime.convs>(5), CUPS-Online-Hilfe (http://localhost:631/help)"
+"Legt ausführliche Ausgabe fest, im Prinzip ein laufender Status welche "
+"Dateien geladen oder geschrieben werden. B<-z> erstellt komprimierte PPD-"
+"Dateien (Dateiname.ppd.gz). Standardmäßig werden unkomprimierte PPD-Dateien "
+"erstellt."
 
-#. type: TH
-#: notifier.man:13
+#. type: TP
+#: ppdc.1:82
 #, no-wrap
-msgid "notifier"
-msgstr "notifier"
+msgid "B<--cr>"
+msgstr "B<--cr>"
 
-#. type: Plain text
-#: notifier.man:16
-msgid "notifier - cups notification interface"
-msgstr "notifier - CUPS-Benachrichtigungsschnittstelle"
+#. type: TP
+#: ppdc.1:84
+#, no-wrap
+msgid "B<--crlf>"
+msgstr "B<--crlf>"
 
-#. type: Plain text
-#: notifier.man:22
-msgid "B<notifier> I<recipient> [ I<user-data> ]"
-msgstr "B<notifier> I<Empfänger> [ I<Benutzerdaten> ]"
+#. type: TP
+#: ppdc.1:86
+#, no-wrap
+msgid "B<--lf>"
+msgstr "B<--lf>"
 
 #. type: Plain text
-#: notifier.man:25
+#: ppdc.1:90
 msgid ""
-"The CUPS notifier interface provides a standard method for adding support "
-"for new event notification methods to CUPS.  Each notifier delivers one or "
-"more IPP events from the standard input to the specified recipient."
+"Specifies the line ending to use - carriage return, carriage return and line "
+"feed, or line feed alone.  The default is to use the line feed character "
+"alone."
 msgstr ""
-"Die CUPS-Benachrichtigungsschnittstelle stellt eine Standardmethode zum "
-"Hinzufügen von Unterstützungen für neue Benachrichtigungsmethoden zu CUPS "
-"bereit. Jeder Benachrichtiger liefert eine oder mehrere IPP-Ereignisse aus "
-"der Standardeingabe an den angegebenen Empfänger aus."
+"Legt das zu verwendende Zeilenende fest - Wagenrücklauf, Wagenrücklauf und "
+"Zeilenumbruch oder nur Zeilenumbruch. Standardmäßig wird nur ein "
+"Zeilenumbruch verwandt."
 
 #. type: Plain text
-#: notifier.man:34
+#: ppdc.1:101
 msgid ""
-"Notifiers B<MUST> read IPP messages from the standard input using the "
-"B<ippNew>()  and B<ippReadFile>()  functions and exit on error.  Notifiers "
-"are encouraged to exit after a suitable period of inactivity, however they "
-"may exit after reading the first message or stay running until an error is "
-"seen.  Notifiers inherit the environment and can use the logging mechanism "
-"documented in B<filter>(7)."
-msgstr ""
-"Benachrichtiger B<MÜSSEN> IPP-Nachrichten aus der Standardeingabe mittels "
-"der Funktionen B<ippNew>() und B<ippReadFile>() lesen und sich im Fehlerfall "
-"beenden. Benachrichtiger sollten sich nach einer geeigneten Inaktivitätszeit "
-"selbst beenden, allerdings dürfen sie sich auch nach dem Lesen der ersten "
-"Nachricht beenden oder bis ein Fehler auftritt weiterlaufen. Benachrichtiger "
-"erben die Umgebung und können die in B<filter>(7) dokumentierten "
-"Protokolliermechanismen nutzen."
-
-#. type: Plain text
-#: notifier.man:38
-msgid "B<cupsd>(8), B<filter>(7), CUPS Online Help (http://localhost:631/help)"
+"B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
+"Online Help (http://localhost:631/help)"
 msgstr ""
-"B<cupsd>(8), B<filter>(7), CUPS-Online Hilfe (http://localhost:631/help)"
+"B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS-"
+"Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: ppdcfile.man:13
+#: ppdcfile.5:10
 #, no-wrap
 msgid "ppdcfile"
 msgstr "ppdcfile"
 
-#. type: TH
-#: ppdcfile.man:13
-#, no-wrap
-msgid "5 March 2016"
-msgstr "5. März 2016"
-
 #. type: Plain text
-#: ppdcfile.man:16
+#: ppdcfile.5:13
 #, fuzzy
-msgid "ppdcfile - cups ppd compiler source file format"
+msgid "ppdcfile - cups ppd compiler source file format (deprecated)"
 msgstr "ppdcfile - CUPS-PPD-Compiler-Quelldateiformat"
 
 #. type: Plain text
-#: ppdcfile.man:20
+#: ppdcfile.5:17
 msgid ""
 "The CUPS PPD compiler reads meta files that contain descriptions of one or "
 "more PPD files to be generated by B<ppdc>(1).  This man page provides a "
@@ -16185,7 +16361,7 @@ msgstr ""
 "von CUPS verwandt werden."
 
 #. type: Plain text
-#: ppdcfile.man:22
+#: ppdcfile.5:19
 msgid ""
 "The source file format is plain ASCII text that can be edited using your "
 "favorite text editor. Comments are supported using the C (/* ... */) and C++ "
@@ -16196,7 +16372,7 @@ msgstr ""
 "(// …) Kommentarmechanismus."
 
 #. type: Plain text
-#: ppdcfile.man:24
+#: ppdcfile.5:21
 msgid ""
 "Printer driver information can be grouped and shared using curly braces "
 "({ ... }); PPD files are written when a close brace or end-of-file is seen "
@@ -16208,7 +16384,7 @@ msgstr ""
 "PCFileName-Direktive definiert wurde."
 
 #. type: Plain text
-#: ppdcfile.man:26
+#: ppdcfile.5:23
 msgid ""
 "Directives may be placed anywhere on a line and are followed by one or more "
 "values. The following is a list of the available directives and the values "
@@ -16219,592 +16395,405 @@ msgstr ""
 "Direktiven und den Werten, die sie akzeptieren:"
 
 #. type: TP
-#: ppdcfile.man:26
+#: ppdcfile.5:23
 #, no-wrap
 msgid "B<#define >I<name value>"
 msgstr "B<#define >I<Name Wert>"
 
 #. type: TP
-#: ppdcfile.man:28
+#: ppdcfile.5:25
 #, no-wrap
 msgid "B<#elif >{I<name >| I<value>}"
 msgstr "B<#elif >{I<Name >| I<Wert>}"
 
 #. type: TP
-#: ppdcfile.man:30
+#: ppdcfile.5:27
 #, no-wrap
 msgid "B<#else>"
 msgstr "B<#else>"
 
 #. type: TP
-#: ppdcfile.man:32
+#: ppdcfile.5:29
 #, no-wrap
 msgid "B<#endif>"
 msgstr "B<#endif>"
 
 #. type: TP
-#: ppdcfile.man:34
+#: ppdcfile.5:31
 #, no-wrap
 msgid "B<#font >I<name encoding \"version\" charset status>"
 msgstr "B<#font >I<Name Kodierung \"Version\" Zeichensatz Status>"
 
 #. type: TP
-#: ppdcfile.man:36
+#: ppdcfile.5:33
 #, no-wrap
 msgid "B<#if >{I<name >| I<value>}"
 msgstr "B<#if >{I<Name >| I<Wert>}"
 
 #. type: TP
-#: ppdcfile.man:38
+#: ppdcfile.5:35
 #, no-wrap
 msgid "B<#include E<lt>>I<filename>B<E<gt>>"
 msgstr "B<#include E<lt>>I<Dateiname>B<E<gt>>"
 
 #. type: TP
-#: ppdcfile.man:40
+#: ppdcfile.5:37
 #, no-wrap
 msgid "B<#include \">I<filename>B<\">"
 msgstr "B<#include \">I<Dateiname>B<\">"
 
 #. type: TP
-#: ppdcfile.man:42
+#: ppdcfile.5:39
 #, no-wrap
 msgid "B<#media >I<name width length>"
 msgstr "B<#media >I<Name Breite Länge>"
 
 #. type: TP
-#: ppdcfile.man:44
+#: ppdcfile.5:41
 #, no-wrap
 msgid "B<#media \">I<name>B</>I<text>B<\" >I<width length>"
 msgstr "B<#media \">I<Name>B</>I<Text>B<\" >I<Breite Länge>"
 
 #. type: TP
-#: ppdcfile.man:46
+#: ppdcfile.5:43
 #, no-wrap
 msgid "B<#po >I<locale >B<\">I<filename>B<\">"
 msgstr "B<#po >I<Standorteinstellung >B<\">I<Dateiname>B<\">"
 
 #. type: TP
-#: ppdcfile.man:48
+#: ppdcfile.5:45
 #, no-wrap
 msgid "B<Attribute >I<name >B<\"\" >I<value>"
 msgstr "B<Attribute >I<Name >B<\"\" >I<Wert>"
 
 #. type: TP
-#: ppdcfile.man:50
+#: ppdcfile.5:47
 #, no-wrap
 msgid "B<Attribute >I<name keyword value>"
 msgstr "B<Attribute >I<Name Schlüsselwort Wert>"
 
 #. type: TP
-#: ppdcfile.man:52
+#: ppdcfile.5:49
 #, no-wrap
 msgid "B<Attribute >I<name >B<\">I<keyword>B</>I<text>B<\" >I<value>"
 msgstr "B<Attribute >I<Name >B<\">I<Schlüsselwort>B</>I<Text>B<\" >I<Wert>"
 
 #. type: TP
-#: ppdcfile.man:54
+#: ppdcfile.5:51
 #, no-wrap
 msgid "B<Choice >I<name >B<\">I<code>B<\">"
 msgstr "B<Choice >I<Name >B<\">I<Code>B<\">"
 
 #. type: TP
-#: ppdcfile.man:56
+#: ppdcfile.5:53
 #, no-wrap
 msgid "B<Choice \">I<name>B</>I<text>B<\" \">I<code>B<\">"
 msgstr "B<Choice \">I<Name>B</>I<Text>B<\" \">I<Code>B<\">"
 
 #. type: TP
-#: ppdcfile.man:58
+#: ppdcfile.5:55
 #, no-wrap
 msgid "B<ColorDevice >I<boolean-value>"
 msgstr "B<ColorDevice >I<logischer-Wert>"
 
 #. type: TP
-#: ppdcfile.man:60
+#: ppdcfile.5:57
 #, no-wrap
 msgid "B<ColorModel >I<name colorspace colororder compression>"
 msgstr "B<ColorModel >I<Name Farbraum Farbreihenfolge Komprimierung>"
 
 #. type: TP
-#: ppdcfile.man:62
+#: ppdcfile.5:59
 #, no-wrap
 msgid "B<ColorModel \">I<name>B</>I<text>B<\" >I<colorspace colororder compression>"
 msgstr "B<ColorModel \">I<Name>B</>I<Text>B<\" >I<Farbraum Farbreihenfolge Komprimierung>"
 
 #. type: TP
-#: ppdcfile.man:64
+#: ppdcfile.5:61
 #, no-wrap
 msgid "B<ColorProfile >I<resolution>B</>I<mediatype gamma density matrix>"
 msgstr "B<ColorProfile >I<Auflösung>B</>I<Medientyp Gamma Dichte Matrix>"
 
 #. type: TP
-#: ppdcfile.man:66
+#: ppdcfile.5:63
 #, no-wrap
 msgid "B<Copyright \">I<text>\""
 msgstr "B<Copyright \">I<Text>\""
 
 #. type: TP
-#: ppdcfile.man:68
+#: ppdcfile.5:65
 #, no-wrap
 msgid "B<CustomMedia >I<name width length left bottom right top >B<\">I<size-code>B<\" \">I<region-code>B<\">"
 msgstr "B<CustomMedia >I<Name Breite Länge links unten rechts oben >B<\">I<Größencode>B<\" \">I<Regionscode>B<\">"
 
 #. type: TP
-#: ppdcfile.man:70
+#: ppdcfile.5:67
 #, no-wrap
 msgid "B<CustomMedia \">I<name>B</>I<text>B<\" >I<width length left bottom right top >B<\">I<size-code>B<\" \">I<region-code>B<\">"
 msgstr "B<CustomMedia \">I<Name>B</>I<Text>B<\" >I<Breite Länge links unten rechts oben >B<\">I<Größencode>B<\" \">I<Regionscode>B<\">"
 
 #. type: TP
-#: ppdcfile.man:72
+#: ppdcfile.5:69
 #, no-wrap
 msgid "B<Cutter >I<boolean-value>"
 msgstr "B<Cutter >I<logischer-Wert>"
 
 #. type: TP
-#: ppdcfile.man:74
+#: ppdcfile.5:71
 #, no-wrap
 msgid "B<Darkness >I<temperature name>"
 msgstr "B<Darkness >I<Temperatur Name>"
 
 #. type: TP
-#: ppdcfile.man:76
+#: ppdcfile.5:73
 #, no-wrap
 msgid "B<Darkness >I<temperature >B<\">I<name>B</>I<text>B<\">"
 msgstr "B<Darkness >I<Temperatur >B<\">I<Name>B</>I<Text>B<\">"
 
 #. type: TP
-#: ppdcfile.man:78
+#: ppdcfile.5:75
 #, no-wrap
 msgid "B<DriverType >I<type>"
 msgstr "B<DriverType >I<Typ>"
 
 #. type: TP
-#: ppdcfile.man:80
+#: ppdcfile.5:77
 #, no-wrap
 msgid "B<Duplex >I<type>"
 msgstr "B<Duplex >I<Typ>"
 
 #. type: TP
-#: ppdcfile.man:82
+#: ppdcfile.5:79
 #, no-wrap
 msgid "B<Filter >I<mime-type cost program>"
 msgstr "B<Filter >I<MIME-Typ Belastung Programm>"
 
 #. type: TP
-#: ppdcfile.man:84
+#: ppdcfile.5:81
 #, no-wrap
 msgid "B<Finishing >I<name>"
 msgstr "B<Finishing >I<Name>"
 
 #. type: TP
-#: ppdcfile.man:86
+#: ppdcfile.5:83
 #, no-wrap
 msgid "B<Finishing \">I<name>B</>I<text>B<\">"
 msgstr "B<Finishing \">I<Name>B</>I<Text>B<\">"
 
 #. type: TP
-#: ppdcfile.man:88
+#: ppdcfile.5:85
 #, no-wrap
 msgid "B<Font *>"
 msgstr "B<Font *>"
 
 #. type: TP
-#: ppdcfile.man:90
+#: ppdcfile.5:87
 #, no-wrap
 msgid "B<Font >I<name encoding >B<\">I<version>B<\" >I<charset status>"
 msgstr "B<Font >I<Name Kodierung >B<\">I<Version>B<\" >I<Zeichensatz Status>"
 
 #. type: TP
-#: ppdcfile.man:92
+#: ppdcfile.5:89
 #, no-wrap
 msgid "B<Group >I<name>"
 msgstr "B<Group >I<Name>"
 
 #. type: TP
-#: ppdcfile.man:94
+#: ppdcfile.5:91
 #, no-wrap
 msgid "B<Group \">I<name>B</>I<text>B<\">"
 msgstr "B<Group \">I<Name>B</>I<Text>B<\">"
 
 #. type: TP
-#: ppdcfile.man:96
+#: ppdcfile.5:93
 #, no-wrap
 msgid "B<HWMargins >I<left bottom right top>"
 msgstr "B<HWMargins >I<links unten rechts oben>"
 
 #. type: TP
-#: ppdcfile.man:98
+#: ppdcfile.5:95
 #, no-wrap
 msgid "B<InputSlot >I<position name>"
 msgstr "B<InputSlot >I<Position Name>"
 
 #. type: TP
-#: ppdcfile.man:100
+#: ppdcfile.5:97
 #, no-wrap
 msgid "B<InputSlot >I<position >B<\">I<name>B</>I<text>B<\">"
 msgstr "B<InputSlot >I<Position >B<\">I<Name>B</>I<Text>B<\">"
 
 #. type: TP
-#: ppdcfile.man:102
+#: ppdcfile.5:99
 #, no-wrap
 msgid "B<Installable >I<name>"
 msgstr "B<Installable >I<Name>"
 
 #. type: TP
-#: ppdcfile.man:104
+#: ppdcfile.5:101
 #, no-wrap
 msgid "B<Installable \">I<name>B</>I<text>B<\">"
 msgstr "B<Installable \">I<Name>B</>I<Text>B<\">"
 
 #. type: TP
-#: ppdcfile.man:106
+#: ppdcfile.5:103
 #, no-wrap
 msgid "B<LocAttribute >I<name >B<\">I<keyword>B</>I<text>B<\" >I<value>"
 msgstr "B<LocAttribute >I<Name >B<\">I<Schlüsselwort>B</>I<Text>B<\" >I<Wert>"
 
 #. type: TP
-#: ppdcfile.man:108
+#: ppdcfile.5:105
 #, no-wrap
 msgid "B<ManualCopies >I<boolean-value>"
 msgstr "B<ManualCopies >I<logischer-Wert>"
 
 #. type: TP
-#: ppdcfile.man:110
+#: ppdcfile.5:107
 #, no-wrap
 msgid "B<Manufacturer \">I<name>B<\">"
 msgstr "B<Manufacturer \">I<Name>B<\">"
 
 #. type: TP
-#: ppdcfile.man:112
+#: ppdcfile.5:109
 #, no-wrap
 msgid "B<MaxSize >I<width length>"
 msgstr "B<MaxSize >I<Breite Länge>"
 
 #. type: TP
-#: ppdcfile.man:114
+#: ppdcfile.5:111
 #, no-wrap
 msgid "B<MediaSize >I<name>"
 msgstr "B<MediaSize >I<Name>"
 
 #. type: TP
-#: ppdcfile.man:116
+#: ppdcfile.5:113
 #, no-wrap
 msgid "B<MediaType >I<type name>"
 msgstr "B<MediaType >I<Typ Name>"
 
 #. type: TP
-#: ppdcfile.man:118
+#: ppdcfile.5:115
 #, no-wrap
 msgid "B<MediaType >I<type >B<\">I<name>B</>I<text>B<\">"
 msgstr "B<MediaType >I<Typ >B<\">I<Name>B</>I<Text>B<\">"
 
 #. type: TP
-#: ppdcfile.man:120
+#: ppdcfile.5:117
 #, no-wrap
 msgid "B<MinSize >I<width length>"
 msgstr "B<MinSize >I<Breite Länge>"
 
 #. type: TP
-#: ppdcfile.man:122
+#: ppdcfile.5:119
 #, no-wrap
 msgid "B<ModelName \">I<name>B<\">"
 msgstr "B<ModelName \">I<Name>B<\">"
 
 #. type: TP
-#: ppdcfile.man:124
+#: ppdcfile.5:121
 #, no-wrap
 msgid "B<ModelNumber >I<number>"
 msgstr "B<ModelNumber >I<Nummer>"
 
 #. type: TP
-#: ppdcfile.man:126
+#: ppdcfile.5:123
 #, no-wrap
 msgid "B<Option >I<name type section order>"
 msgstr "B<Option >I<Name Typ Abschnitt Reihenfolge>"
 
 #. type: TP
-#: ppdcfile.man:128
+#: ppdcfile.5:125
 #, no-wrap
 msgid "B<Option \">I<name>B</>I<text>B<\" >I<type section order>"
 msgstr "B<Option \">I<Name>B</>I<Text>B<\" >I<Typ Abschnitt Reihenfolge>"
 
 #. type: TP
-#: ppdcfile.man:130
+#: ppdcfile.5:127
 #, no-wrap
 msgid "B<PCFileName \">I<filename.ppd>B<\">"
 msgstr "B<PCFileName \">I<Dateiname.ppd>B<\">"
 
 #. type: TP
-#: ppdcfile.man:132
-#, no-wrap
-msgid "B<Resolution >I<colorspace bits-per-color row-count row-feed row-step name>"
-msgstr "B<Resolution >I<Farbraum Bits-pro-Farbe Zeilenanzahl Zeilenvorschub Zeilenschrittweite Name>"
-
-#. type: TP
-#: ppdcfile.man:134
-#, no-wrap
-msgid "B<Resolution >I<colorspace bits-per-color row-count row-feed row-step >B<\">I<name>B</>I<text>B<\">"
-msgstr "B<Resolution >I<Farbraum Bits-pro-Farbe Zeilenanzahl Zeilenvorschub Zeilenschrittweite >B<\">I<Name>B</>I<Text>B<\">"
-
-#. type: TP
-#: ppdcfile.man:136
-#, no-wrap
-msgid "B<SimpleColorProfile >I<resolution>B</>I<mediatype density yellow-density red-density gamma red-adjust green-adjust blue-adjust>"
-msgstr "B<SimpleColorProfile >I<Auflösung>B</>I<Medientyp Dichte Gelbdichte Rotdichte Gamma Rotanpassung Grünanpassung Blauanpassung>"
-
-#. type: TP
-#: ppdcfile.man:138
-#, no-wrap
-msgid "B<Throughput >I<pages-per-minute>"
-msgstr "B<Throughput >I<Seiten-pro-Minute>"
-
-#. type: TP
-#: ppdcfile.man:140
-#, no-wrap
-msgid "B<UIConstraints \">I<*Option1 *Option2>B<\">"
-msgstr "B<UIConstraints \">I<*Option1 *Option2>B<\">"
-
-#. type: TP
-#: ppdcfile.man:142
-#, no-wrap
-msgid "B<UIConstraints \">I<*Option1 Choice1 *Option2>B<\">"
-msgstr "B<UIConstraints \">I<*Option1 Auswahl1 *Option2>B<\">"
-
-#. type: TP
-#: ppdcfile.man:144
-#, no-wrap
-msgid "B<UIConstraints \">I<*Option1 *Option2 Choice2>B<\">"
-msgstr "B<UIConstraints \">I<*Option1 *Option2 Auswahl2>B<\">"
-
-#. type: TP
-#: ppdcfile.man:146
-#, no-wrap
-msgid "B<UIConstraints \">I<*Option1 Choice1 *Option2 Choice2>B<\">"
-msgstr "B<UIConstraints \">I<*Option1 Auswahl1 *Option2 Auswahl2>B<\">"
-
-#. type: TP
-#: ppdcfile.man:148
-#, no-wrap
-msgid "B<VariablePaperSize >I<boolean-value>"
-msgstr "B<VariablePaperSize >I<logischer-Wert>"
-
-#. type: TP
-#: ppdcfile.man:150
-#, no-wrap
-msgid "B<Version >I<number>"
-msgstr "B<Version >I<Nummer>"
-
-#. type: Plain text
-#: ppdcfile.man:159
-msgid ""
-"B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), CUPS "
-"Online Help (http://localhost:631/help)"
-msgstr ""
-"B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), CUPS-"
-"Online-Hilfe (http://localhost:631/help)"
-
-#. type: TH
-#: ppdc.man:13
-#, no-wrap
-msgid "ppdc"
-msgstr "ppdc"
-
-#. type: Plain text
-#: ppdc.man:16
-msgid "ppdc - cups ppd compiler (deprecated)"
-msgstr "ppdc - CUPS-PPD-Compiler (veraltet)"
-
-#. type: Plain text
-#: ppdc.man:48
-msgid ""
-"B<ppdc> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] [ B<-"
-"c> I<message-catalog> ] [ B<-d> I<output-directory> ] [ B<-l> "
-"I<language(s)> ] [ B<-m> ] [ B<-t> ] [ B<-v> ] [ B<-z> ] [ B<--cr> ] [ B<--"
-"crlf> ] [ B<--lf> ] I<source-file>"
-msgstr ""
-"B<ppdc> [ B<-D >I<Name>[B<=>I<Wert>] ] [ B<-I> I<Include-Verzeichnis> ] [ B<-"
-"c> I<Nachrichtenkatalog> ] [ B<-d> I<Ausgabeverzeichnis> ] [ B<-l> "
-"I<Sprache(n)> ] [ B<-m> ] [ B<-t> ] [ B<-v> ] [ B<-z> ] [ B<--cr> ] [ B<--"
-"crlf> ] [ B<--lf> ] I<Quelldatei>"
-
-#. type: Plain text
-#: ppdc.man:51
-msgid ""
-"B<ppdc> compiles PPDC source files into one or more PPD files.  B<This "
-"program is deprecated and will be removed in a future release of CUPS.>"
-msgstr ""
-"B<ppdc> übersetzt PPDC-Quelldateien in eine oder mehrere PPD-Dateien. "
-"B<Dieses Programm ist veraltet und wird in einer zukünftigen "
-"Veröffentlichung von CUPS entfernt.>"
-
-#. type: Plain text
-#: ppdc.man:53
-msgid "B<ppdc> supports the following options:"
-msgstr "I<ppdc> unterstützt die folgenden Optionen:"
-
-#. type: TP
-#: ppdc.man:53 ppdhtml.man:30 ppdpo.man:33
-#, no-wrap
-msgid "B<-D >I<name>[B<=>I<value>]"
-msgstr "B<-D >I<Name>[B<=>I<Wert>]"
-
-#. type: Plain text
-#: ppdc.man:57 ppdhtml.man:34 ppdpo.man:37
-msgid ""
-"Sets the named variable for use in the source file.  It is equivalent to "
-"using the I<#define> directive in the source file."
-msgstr ""
-"Setzt die benannte Variable für die Verwendung in der Quelldatei. Dies ist "
-"äquivalent zu der Verwendung von I<#define>-Direktiven in der Quelldatei."
-
-#. type: TP
-#: ppdc.man:57 ppdhtml.man:34 ppdi.man:35 ppdpo.man:37
-#, no-wrap
-msgid "B<-I >I<include-directory>"
-msgstr "B<-I >I<Include-Verzeichnis>"
-
-#. type: Plain text
-#: ppdc.man:61 ppdhtml.man:38 ppdi.man:39 ppdpo.man:41
-msgid ""
-"Specifies an alternate include directory.  Multiple I<-I> options can be "
-"supplied to add additional directories."
-msgstr ""
-"Legt ein alternatives Include-Verzeichnis fest. Die Option I<-I> kann "
-"mehrfach verwandt werden, um zusätzliche Verzeichnisse hinzuzufügen."
-
-#. type: TP
-#: ppdc.man:61
-#, no-wrap
-msgid "B<-c >I<message-catalog>"
-msgstr "B<-c >I<Nachrichtenkatalog>"
-
-#. type: Plain text
-#: ppdc.man:64
-msgid ""
-"Specifies a single message catalog file in GNU gettext (filename.po) or "
-"Apple strings (filename.strings) format to be used for localization."
-msgstr ""
-"Legt eine einfache Nachrichtenkatalogdatei im GNU-Gettext- (Dateiname.po) "
-"oder Apple-Strings- (Dateiname.strings) Format für die Verwendung in der "
-"Lokalisierung fest."
-
-#. type: TP
-#: ppdc.man:64
-#, no-wrap
-msgid "B<-d >I<output-directory>"
-msgstr "B<-d >I<Ausgabeverzeichnis>"
-
-#. type: Plain text
-#: ppdc.man:68
-msgid ""
-"Specifies the output directory for PPD files.  The default output directory "
-"is \"ppd\"."
-msgstr ""
-"Legt das Ausgabeverzeichnis für PPD-Dateien fest. Die Vorgabe für das "
-"Ausgabeverzeichnis ist »ppd«."
-
-#. type: TP
-#: ppdc.man:68
+#: ppdcfile.5:129
 #, no-wrap
-msgid "B<-l >I<language(s)>"
-msgstr "B<-l >I<Sprache(n)>"
-
-#. type: Plain text
-#: ppdc.man:73
-msgid ""
-"Specifies one or more languages to use when localizing the PPD file(s).  The "
-"default language is \"en\" (English).  Separate multiple languages with "
-"commas, for example \"de_DE,en_UK,es_ES,es_MX,es_US,fr_CA,fr_FR,it_IT\" will "
-"create PPD files with German, UK English, Spanish (Spain, Mexico, and US), "
-"French (France and Canada), and Italian languages in each file."
-msgstr ""
-"Legt eine oder mehrere Sprachen fest, die bei der Lokalisierung von PPD-"
-"Datei(n) verwandt werden sollen. Die Vorgabesprache ist »en« (englisch). "
-"Mehrere Sprachen können mit Kommata getrennt angegeben werden, z.B. wird "
-"»de_DE,en_UK,es_ES,es_MX,es_US,fr_CA,fr_FR,it_IT« PPD-Dateien mit deutschen, "
-"UK-englischen spanischen (Spanien, Mexiko und USA), französischen "
-"(Frankreich und Kanada) und italienischen Sprachen in einer Datei erstellen."
+msgid "B<Resolution >I<colorspace bits-per-color row-count row-feed row-step name>"
+msgstr "B<Resolution >I<Farbraum Bits-pro-Farbe Zeilenanzahl Zeilenvorschub Zeilenschrittweite Name>"
 
-#. type: Plain text
-#: ppdc.man:76
-msgid ""
-"Specifies that the output filename should be based on the ModelName value "
-"instead of FileName or PCFilenName."
-msgstr ""
-"Legt fest, dass der Ausgabename auf dem Wert von ModelName statt von "
-"FileName oder PCFilenName basieren soll."
+#. type: TP
+#: ppdcfile.5:131
+#, no-wrap
+msgid "B<Resolution >I<colorspace bits-per-color row-count row-feed row-step >B<\">I<name>B</>I<text>B<\">"
+msgstr "B<Resolution >I<Farbraum Bits-pro-Farbe Zeilenanzahl Zeilenvorschub Zeilenschrittweite >B<\">I<Name>B</>I<Text>B<\">"
 
-#. type: Plain text
-#: ppdc.man:79
-msgid "Specifies that PPD files should be tested instead of generated."
-msgstr "Legt fest, dass PPD-Dateien getestet anstatt erstellt werden sollen."
+#. type: TP
+#: ppdcfile.5:133
+#, no-wrap
+msgid "B<SimpleColorProfile >I<resolution>B</>I<mediatype density yellow-density red-density gamma red-adjust green-adjust blue-adjust>"
+msgstr "B<SimpleColorProfile >I<Auflösung>B</>I<Medientyp Dichte Gelbdichte Rotdichte Gamma Rotanpassung Grünanpassung Blauanpassung>"
 
-# FIXME: Original i.O.?
-#. type: Plain text
-#: ppdc.man:85
-msgid ""
-"Specifies verbose output, basically a running status of which files are "
-"being loaded or written.  B<-z> Generates compressed PPD files (filename.ppd."
-"gz).  The default is to generate uncompressed PPD files."
-msgstr ""
-"Legt ausführliche Ausgabe fest, im Prinzip ein laufender Status welche "
-"Dateien geladen oder geschrieben werden. B<-z> erstellt komprimierte PPD-"
-"Dateien (Dateiname.ppd.gz). Standardmäßig werden unkomprimierte PPD-Dateien "
-"erstellt."
+#. type: TP
+#: ppdcfile.5:135
+#, no-wrap
+msgid "B<Throughput >I<pages-per-minute>"
+msgstr "B<Throughput >I<Seiten-pro-Minute>"
 
 #. type: TP
-#: ppdc.man:85
+#: ppdcfile.5:137
 #, no-wrap
-msgid "B<--cr>"
-msgstr "B<--cr>"
+msgid "B<UIConstraints \">I<*Option1 *Option2>B<\">"
+msgstr "B<UIConstraints \">I<*Option1 *Option2>B<\">"
 
 #. type: TP
-#: ppdc.man:87
+#: ppdcfile.5:139
 #, no-wrap
-msgid "B<--crlf>"
-msgstr "B<--crlf>"
+msgid "B<UIConstraints \">I<*Option1 Choice1 *Option2>B<\">"
+msgstr "B<UIConstraints \">I<*Option1 Auswahl1 *Option2>B<\">"
 
 #. type: TP
-#: ppdc.man:89
+#: ppdcfile.5:141
 #, no-wrap
-msgid "B<--lf>"
-msgstr "B<--lf>"
+msgid "B<UIConstraints \">I<*Option1 *Option2 Choice2>B<\">"
+msgstr "B<UIConstraints \">I<*Option1 *Option2 Auswahl2>B<\">"
 
-#. type: Plain text
-#: ppdc.man:93
-msgid ""
-"Specifies the line ending to use - carriage return, carriage return and line "
-"feed, or line feed alone.  The default is to use the line feed character "
-"alone."
-msgstr ""
-"Legt das zu verwendende Zeilenende fest - Wagenrücklauf, Wagenrücklauf und "
-"Zeilenumbruch oder nur Zeilenumbruch. Standardmäßig wird nur ein "
-"Zeilenumbruch verwandt."
+#. type: TP
+#: ppdcfile.5:143
+#, no-wrap
+msgid "B<UIConstraints \">I<*Option1 Choice1 *Option2 Choice2>B<\">"
+msgstr "B<UIConstraints \">I<*Option1 Auswahl1 *Option2 Auswahl2>B<\">"
+
+#. type: TP
+#: ppdcfile.5:145
+#, no-wrap
+msgid "B<VariablePaperSize >I<boolean-value>"
+msgstr "B<VariablePaperSize >I<logischer-Wert>"
+
+#. type: TP
+#: ppdcfile.5:147
+#, no-wrap
+msgid "B<Version >I<number>"
+msgstr "B<Version >I<Nummer>"
 
 #. type: Plain text
-#: ppdc.man:100
+#: ppdcfile.5:160
 msgid ""
-"B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
+"B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), CUPS "
 "Online Help (http://localhost:631/help)"
 msgstr ""
-"B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS-"
+"B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), CUPS-"
 "Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: ppdhtml.man:13
+#: ppdhtml.1:10
 #, no-wrap
 msgid "ppdhtml"
 msgstr "ppdhtml"
 
 #. type: Plain text
-#: ppdhtml.man:16
+#: ppdhtml.1:13
 msgid "ppdhtml - cups html summary generator (deprecated)"
 msgstr "ppdhtml - CUPS-HTML-Zusammenfassungserzeuger (veraltet)"
 
 #. type: Plain text
-#: ppdhtml.man:25
+#: ppdhtml.1:22
 msgid ""
 "B<ppdhtml> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] "
 "I<source-file>"
@@ -16813,7 +16802,7 @@ msgstr ""
 "I<Quelldatei>"
 
 #. type: Plain text
-#: ppdhtml.man:28
+#: ppdhtml.1:25
 msgid ""
 "B<ppdhtml> reads a driver information file and produces a HTML summary page "
 "that lists all of the drivers in a file and the supported options.  B<This "
@@ -16825,12 +16814,12 @@ msgstr ""
 "zukünftigen Veröffentlichung von CUPS entfernt.>"
 
 #. type: Plain text
-#: ppdhtml.man:30
+#: ppdhtml.1:27
 msgid "B<ppdhtml> supports the following options:"
 msgstr "I<ppdhtml> unterstützt die folgenden Optionen:"
 
 #. type: Plain text
-#: ppdhtml.man:45
+#: ppdhtml.1:46
 msgid ""
 "B<ppdc>(1), B<ppdcfile>(5), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), CUPS "
 "Online Help (http://localhost:631/help)"
@@ -16839,18 +16828,18 @@ msgstr ""
 "Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: ppdi.man:13
+#: ppdi.1:10
 #, no-wrap
 msgid "ppdi"
 msgstr "ppdi"
 
 #. type: Plain text
-#: ppdi.man:16
+#: ppdi.1:13
 msgid "ppdi - import ppd files (deprecated)"
 msgstr "ppdi - PPD-Dateien importieren (veraltet)"
 
 #. type: Plain text
-#: ppdi.man:29
+#: ppdi.1:26
 msgid ""
 "B<ppdi> [ B<-I> I<include-directory> ] [ B<-o> I<source-file> ] I<ppd-file> "
 "[ ...  I<ppd-file> ]"
@@ -16859,7 +16848,7 @@ msgstr ""
 "Datei> [ …  I<PPD-Datei> ]"
 
 #. type: Plain text
-#: ppdi.man:33
+#: ppdi.1:30
 msgid ""
 "B<ppdi> imports one or more PPD files into a PPD compiler source file.  "
 "Multiple languages of the same PPD file are merged into a single printer "
@@ -16873,18 +16862,18 @@ msgstr ""
 "in einer zukünftigen Veröffentlichungen von CUPS entfernt werden.>"
 
 #. type: Plain text
-#: ppdi.man:35
+#: ppdi.1:32
 msgid "B<ppdi> supports the following options:"
 msgstr "I<ppdi> unterstützt die folgenden Optionen:"
 
 #. type: TP
-#: ppdi.man:39
+#: ppdi.1:36
 #, no-wrap
 msgid "B<-o >I<source-file>"
 msgstr "B<-o >I<Quelldatei>"
 
 #. type: Plain text
-#: ppdi.man:45
+#: ppdi.1:42
 msgid ""
 "Specifies the PPD source file to update.  If the source file does not exist, "
 "a new source file is created.  Otherwise the existing file is merged with "
@@ -16898,7 +16887,7 @@ msgstr ""
 "I<ppdi.drv> verwandt."
 
 #. type: Plain text
-#: ppdi.man:52
+#: ppdi.1:53
 msgid ""
 "B<ppdc>(1), B<ppdhtml>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
 "Online Help (http://localhost:631/help)"
@@ -16907,18 +16896,18 @@ msgstr ""
 "Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: ppdmerge.man:13
+#: ppdmerge.1:10
 #, no-wrap
 msgid "ppdmerge"
 msgstr "ppdmerge"
 
 #. type: Plain text
-#: ppdmerge.man:16
+#: ppdmerge.1:13
 msgid "ppdmerge - merge ppd files (deprecated)"
 msgstr "ppdmerge - PPD-Dateien zusammenführen (veraltet)"
 
 #. type: Plain text
-#: ppdmerge.man:27
+#: ppdmerge.1:24
 msgid ""
 "B<ppdmerge> [ B<-o> I<output-ppd-file> ] I<ppd-file> I<ppd-file> [ ...  "
 "I<ppd-file> ]"
@@ -16927,7 +16916,7 @@ msgstr ""
 "I<PPD-Datei> ]"
 
 #. type: Plain text
-#: ppdmerge.man:31
+#: ppdmerge.1:28
 msgid ""
 "B<ppdmerge> merges two or more PPD files into a single, multi-language PPD "
 "file.  B<This program is deprecated and will be removed in a future release "
@@ -16938,18 +16927,18 @@ msgstr ""
 "zukünftigen Veröffentlichungen von CUPS entfernt werden.>"
 
 #. type: Plain text
-#: ppdmerge.man:33
+#: ppdmerge.1:30
 msgid "B<ppdmerge> supports the following options:"
 msgstr "B<ppdmerge> unterstützt die folgenden Optionen:"
 
 #. type: TP
-#: ppdmerge.man:33
+#: ppdmerge.1:30
 #, no-wrap
 msgid "B<-o >I<output-ppd-file>"
 msgstr "B<-o >I<Ausgabe-PPD-Datei>"
 
 #. type: Plain text
-#: ppdmerge.man:38
+#: ppdmerge.1:35
 msgid ""
 "Specifies the PPD file to create.  If not specified, the merged PPD file is "
 "written to the standard output.  If the output file already exists, it is "
@@ -16960,7 +16949,7 @@ msgstr ""
 "Ausgabedatei bereits existiert wird sie ohne Meldung überschrieben."
 
 #. type: Plain text
-#: ppdmerge.man:41
+#: ppdmerge.1:42
 msgid ""
 "B<ppdmerge> does not check whether the merged PPD files are for the same "
 "device.  Merging of different device PPDs will yield unpredictable results."
@@ -16970,7 +16959,7 @@ msgstr ""
 "das Ergebnis unvorhersehbar."
 
 #. type: Plain text
-#: ppdmerge.man:48
+#: ppdmerge.1:49
 msgid ""
 "B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
 "Online Help (http://localhost:631/help)"
@@ -16979,18 +16968,18 @@ msgstr ""
 "Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: ppdpo.man:13
+#: ppdpo.1:10
 #, no-wrap
 msgid "ppdpo"
 msgstr "ppdpo"
 
 #. type: Plain text
-#: ppdpo.man:16
+#: ppdpo.1:13
 msgid "ppdpo - ppd message catalog generator (deprecated)"
 msgstr "ppdpo - PPD-Nachrichtenkatalogersteller (veraltet)"
 
 #. type: Plain text
-#: ppdpo.man:28
+#: ppdpo.1:25
 msgid ""
 "B<ppdpo> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] [ B<-"
 "o> I<output-file> ] I<source-file>"
@@ -16999,7 +16988,7 @@ msgstr ""
 "[ B<-o> I<Ausgabedatei> ] I<Quelldatei>"
 
 #. type: Plain text
-#: ppdpo.man:31
+#: ppdpo.1:28
 msgid ""
 "B<ppdpo> extracts UI strings from PPDC source files and updates either a GNU "
 "gettext or macOS strings format message catalog source file for "
@@ -17013,18 +17002,18 @@ msgstr ""
 ">"
 
 #. type: Plain text
-#: ppdpo.man:33
+#: ppdpo.1:30
 msgid "B<ppdpo> supports the following options:"
 msgstr "B<ppdpo> unterstützt die folgenden Optionen:"
 
 #. type: TP
-#: ppdpo.man:41
+#: ppdpo.1:38
 #, no-wrap
 msgid "B<-o >I<output-file>"
 msgstr "B<-o >I<Ausgabedatei>"
 
 #. type: Plain text
-#: ppdpo.man:45
+#: ppdpo.1:42
 msgid ""
 "Specifies the output file.  The supported extensions are I<.po> or I<.po.gz> "
 "for GNU gettext format message catalogs and I<.strings> for macOS strings "
@@ -17035,7 +17024,7 @@ msgstr ""
 "Dateien."
 
 #. type: Plain text
-#: ppdpo.man:52
+#: ppdpo.1:53
 msgid ""
 "B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdcfile(5),> CUPS "
 "Online Help (http://localhost:631/help)"
@@ -17044,18 +17033,18 @@ msgstr ""
 "Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: printers.conf.man:13
+#: printers.conf.5:9
 #, no-wrap
 msgid "printers.conf"
 msgstr "printers.conf"
 
 #. type: Plain text
-#: printers.conf.man:16
+#: printers.conf.5:12
 msgid "printers.conf - printer configuration file for cups"
 msgstr "printers.conf - Druckerkonfigurationsdatei für CUPS"
 
 #. type: Plain text
-#: printers.conf.man:20
+#: printers.conf.5:16
 msgid ""
 "The B<printers.conf> file defines the local printers that are available. It "
 "is normally located in the I</etc/cups> directory and is maintained by the "
@@ -17068,35 +17057,35 @@ msgstr ""
 "bearbeitet oder manuell verwaltet zu werden."
 
 #. type: Plain text
-#: printers.conf.man:30
+#: printers.conf.5:27
 #, fuzzy
 msgid ""
-"B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime."
-"types>(5), B<subscriptions.conf>(5), CUPS Online Help (http://localhost:631/"
-"help)"
+"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), "
+"B<mime.convs>(5), B<mime.types>(5), B<subscriptions.conf>(5), CUPS Online "
+"Help (http://localhost:631/help)"
 msgstr ""
 "B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime."
 "types>(5), B<subscriptions.conf>(5), CUPS Online Help (http://localhost:631/"
 "help)"
 
 #. type: TH
-#: subscriptions.conf.man:13
+#: subscriptions.conf.5:10
 #, no-wrap
 msgid "subscriptions.conf"
 msgstr "subscriptions.conf"
 
 #. type: Plain text
-#: subscriptions.conf.man:16
+#: subscriptions.conf.5:13
 msgid "subscriptions.conf - subscription configuration file for cups"
 msgstr "subscriptions.conf - Abonnement-Konfigurationsdatei für CUPS"
 
 #. type: Plain text
-#: subscriptions.conf.man:20
+#: subscriptions.conf.5:19
 #, fuzzy
 msgid ""
 "The B<subscriptions.conf> file defines the local event notification "
-"subscriptions that are active. It is normally located in the I</etc/cups> "
-"directory and is maintained by the B<cupsd>(8)  program. This file is not "
+"subscriptions that are active.  It is normally located in the I</etc/cups> "
+"directory and is maintained by the B<cupsd>(8)  program.  This file is not "
 "intended to be edited or managed manually."
 msgstr ""
 "Die Datei B<subscriptions.conf> definiert die lokalen Ereignis-"
@@ -17105,25 +17094,36 @@ msgstr ""
 "Datei ist nicht dazu gedacht, bearbeitet oder manuell verwaltet zu werden."
 
 #. type: Plain text
-#: subscriptions.conf.man:30
+#: subscriptions.conf.5:30
 #, fuzzy
 msgid ""
-"B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime."
-"types>(5), B<printers.conf>(5), CUPS Online Help (http://localhost:631/help)"
+"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), "
+"B<mime.convs>(5), B<mime.types>(5), B<printers.conf>(5), CUPS Online Help "
+"(http://localhost:631/help)"
 msgstr ""
 "B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime."
 "types>(5), B<printers.conf>(5), CUPS Online Help (http://localhost:631/help)"
 
-#, fuzzy
-#~ msgid "26 April 2019"
-#~ msgstr "16. April 2014"
+#~ msgid "4 April 2014"
+#~ msgstr "4. April 2014"
 
-#, fuzzy
-#~ msgid ""
-#~ "client.conf - client configuration file for cups (deprecated on macos)"
-#~ msgstr "client.conf - Client-Konfigurationsdatei für CUPS"
+#~ msgid "Copyright \\[co] 2007-2017 by Apple Inc."
+#~ msgstr "Copyright \\[co] 2007-2017 by Apple Inc."
+
+#~ msgid "15 April 2014"
+#~ msgstr "15. April 2014"
+
+#~ msgid "19 October 2017"
+#~ msgstr "19. Oktober 2017"
 
 #, fuzzy
+#~| msgid "classes.conf - class configuration file for cups"
+#~ msgid "client.conf - client configuration file for cups"
+#~ msgstr "classes.conf - Klassenkonfigurationsdatei für CUPS"
+
+#~ msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
+#~ msgstr "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
+
 #~ msgid ""
 #~ "Sets encryption options (only in /etc/cups/client.conf).  By default, "
 #~ "CUPS only supports encryption using TLS v1.0 or higher using known secure "
@@ -17135,10 +17135,7 @@ msgstr ""
 #~ "clients.  The I<AllowSSL3> option enables SSL v3.0, which is required for "
 #~ "some older clients that do not support TLS v1.0.  The I<DenyCBC> option "
 #~ "disables all CBC cipher suites.  The I<DenyTLS1.0> option disables TLS "
-#~ "v1.0 support - this sets the minimum protocol version to TLS v1.1.  The "
-#~ "I<MinTLS> options set the minimum TLS version to support.  The I<MaxTLS> "
-#~ "options set the maximum TLS version to support.  Not all operating "
-#~ "systems support TLS 1.3 at this time."
+#~ "v1.0 support - this sets the minimum protocol version to TLS v1.1."
 #~ msgstr ""
 #~ "Setzt die Verschlüsselungsoptionen (nur in /etc/cups/client.conf). "
 #~ "Standardmäßig unterstützt CUPS nur Verschlüsselung mit TLS v1.0 oder "
@@ -17155,43 +17152,230 @@ msgstr ""
 #~ "Unterstützung - damit wird die minimale Protokollversion auf TLS v1.1 "
 #~ "gesetzt."
 
-#, fuzzy
-#~ msgid "B<UserAgentTokens None>"
-#~ msgstr "B<ServerTokens None>"
+#~ msgid "10 June 2014"
+#~ msgstr "10. Juni 2014"
 
-#, fuzzy
-#~ msgid "B<UserAgentTokens ProductOnly>"
-#~ msgstr "B<ServerTokens ProductOnly>"
+#~ msgid "cupsaddsmb"
+#~ msgstr "cupsaddsmb"
 
-#, fuzzy
-#~ msgid "B<UserAgentTokens Major>"
-#~ msgstr "B<ServerTokens Major>"
+#~ msgid "11 June 2014"
+#~ msgstr "11. Juni 2014"
 
-#, fuzzy
-#~ msgid "B<UserAgentTokens Minor>"
-#~ msgstr "B<ServerTokens Minor>"
+#~ msgid "cupsaddsmb - export printers to samba for windows clients"
+#~ msgstr "cupsaddsmb - exportiere Drucker an Samba für Windows-Clients"
 
-#, fuzzy
-#~ msgid "B<UserAgentTokens Minimal>"
-#~ msgstr "B<ServerTokens Minimal>"
+#~ msgid ""
+#~ "B<cupsaddsmb> [ B<-H> I<samba-server> ] [ B<-U> I<samba-user[%samba-"
+#~ "password]> ] [ B<-h> I<cups-server[:port]> ] [ B<-v> ] B<-a>"
+#~ msgstr ""
+#~ "B<cupsaddsmb> [ B<-H> I<Samba-Server> ] [ B<-U> I<Samba-Benutzer[%samba-"
+#~ "Passwort]> ] [ B<-h> I<CUPS-Server[:Port]> ] [ B<-v> ] B<-a>"
 
-#, fuzzy
-#~ msgid "B<UserAgentTokens OS>"
-#~ msgstr "B<ServerTokens OS>"
+#~ msgid ""
+#~ "B<cupsaddsmb> [ B<-H> I<samba-server> ] [ B<-U> I<samba-user[%samba-"
+#~ "password]> ] [ B<-h> I<cups-server[:port]> ] [ B<-v> ] I<printer> [ ...  "
+#~ "I<printer> ]"
+#~ msgstr ""
+#~ "B<cupsaddsmb> [ B<-H> I<Samba-Server> ] [ B<-U> I<Samba-Benutzer[%samba-"
+#~ "Passwort]> ] [ B<-h> I<CUPS-Server[:Port]> ] [ B<-v> ] I<Drucker> [ …  "
+#~ "I<Drucker> ]"
 
-#, fuzzy
-#~ msgid "B<UserAgentTokens Full>"
-#~ msgstr "B<ServerTokens Full>"
+#~ msgid ""
+#~ "The B<cupsaddsmb> program exports printers to the SAMBA software (version "
+#~ "2.2.0 or higher) for use with Windows clients.  Depending on the SAMBA "
+#~ "configuration, you may need to provide a password to export the "
+#~ "printers.  This program requires the Windows printer driver files "
+#~ "described below."
+#~ msgstr ""
+#~ "Das Programm B<cupsaddsmb> exportiert Drucker an die Samba-Software "
+#~ "(Version 2.2.0 oder höher) zur Verwendung mit Windows-Clients. Abhängig "
+#~ "von der Samba-Konfiguration müssen Sie ein Passwort bereitstellen, um die "
+#~ "Drucker zu exportieren. Dieses Programm benötigt die im folgenden "
+#~ "beschriebenen Windows-Treiberdateien."
+
+#~ msgid "SAMBA CONFIGURATION"
+#~ msgstr "SAMBA-KONFIGURATION"
+
+#~ msgid ""
+#~ "B<cupsaddsmb> uses the RPC-based printing support in SAMBA to provide "
+#~ "printer drivers and PPD files to Windows client machines.  In order to "
+#~ "use this functionality, you must first configure the SAMBA B<smb."
+#~ "conf>(5)  file to support printing through CUPS and provide a printer "
+#~ "driver download share, as follows:"
+#~ msgstr ""
+#~ "I<cupsaddsmb> verwendet die RPC-basierte Druck-Unterstützung in SAMBA, um "
+#~ "Windows-Client-Maschinen Druckertreiber und PPD-Dateien bereitzustellen. "
+#~ "Um diese Funktionalität zu benutzen, müssen Sie erst die Datei B<smb."
+#~ "conf>(5) von SAMBA so konfigurieren, dass das Drucken via CUPS erfolgt, "
+#~ "und eine Freigabe für den Druckertreiber bereitstellt. Diese "
+#~ "Konfiguration sieht wie folgt aus:"
+
+#~ msgid ""
+#~ "    [global]\n"
+#~ "\tload printers = yes\n"
+#~ "\tprinting = cups\n"
+#~ "\tprintcap name = cups\n"
+#~ msgstr ""
+#~ "    [global]\n"
+#~ "\tload printers = yes\n"
+#~ "\tprinting = cups\n"
+#~ "\tprintcap name = cups\n"
+
+#~ msgid ""
+#~ "    [printers]\n"
+#~ "\tcomment = All Printers\n"
+#~ "\tpath = /var/spool/samba\n"
+#~ "\tbrowseable = no\n"
+#~ "\tpublic = yes\n"
+#~ "\tguest ok = yes\n"
+#~ "\twritable = no\n"
+#~ "\tprintable = yes\n"
+#~ msgstr ""
+#~ "    [printers]\n"
+#~ "\tcomment = Alle Drucker\n"
+#~ "\tpath = /var/spool/samba\n"
+#~ "\tbrowseable = no\n"
+#~ "\tpublic = yes\n"
+#~ "\tguest ok = yes\n"
+#~ "\twritable = no\n"
+#~ "\tprintable = yes\n"
+
+#~ msgid ""
+#~ "    [print$]\n"
+#~ "\tcomment = Printer Drivers\n"
+#~ "\tpath = /etc/samba/drivers\n"
+#~ "\tbrowseable = yes\n"
+#~ "\tguest ok = no\n"
+#~ "\tread only = yes\n"
+#~ "\twrite list = root\n"
+#~ msgstr ""
+#~ "    [print$]\n"
+#~ "\tcomment = Druckertreiber\n"
+#~ "\tpath = /etc/samba/drivers\n"
+#~ "\tbrowseable = yes\n"
+#~ "\tguest ok = no\n"
+#~ "\tread only = yes\n"
+#~ "\twrite list = root\n"
+
+#~ msgid ""
+#~ "This configuration assumes a FHS-compliant installation of SAMBA; adjust "
+#~ "the [printers] and [print$] share paths accordingly on your system as "
+#~ "needed."
+#~ msgstr ""
+#~ "In dieser Konfiguration wird eine FHS-gemäße Installation von SAMBA "
+#~ "angenommen; passen Sie die [printers]- und [print$]-Freigabepfade gemäß "
+#~ "der Notwendigkeiten Ihres Systems an."
+
+#~ msgid "MICROSOFT POSTSCRIPT DRIVERS FOR WINDOWS"
+#~ msgstr "MICROSOFT-POSTSCRIPT-TREIBER FÜR WINDOWS"
+
+#~ msgid ""
+#~ "The base driver for Windows 2000 and higher is the Microsoft PostScript "
+#~ "driver, which is available on any system running Windows 2000 or higher "
+#~ "in the %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eW32X86\\e3 folder for 32-"
+#~ "bit drivers and %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eX64\\e3 folder "
+#~ "for 64-bit drivers."
+#~ msgstr ""
+#~ "Der Basis-Treiber für Windows 2000 und höher ist der Microsoft PostScript-"
+#~ "Treiber, der auf jedem System, das unter Windows 2000 oder höher läuft, "
+#~ "im Ordner %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eW32X86\\e3 für 32-bit-"
+#~ "Treiber und im Ordner %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eX64\\e3 für "
+#~ "64-bit-Treiber verfügbar ist."
+
+#~ msgid ""
+#~ "Copy the 32-bit drivers to the I</usr/share/cups/drivers> directory and "
+#~ "the 64-bit drivers to the I</usr/share/cups/drivers/x64> directory "
+#~ "exactly as named below:"
+#~ msgstr ""
+#~ "Kopieren Sie die 32-Bit-Treiber in das Verzeichnis I</usr/share/cups/"
+#~ "drivers> und die 64-Bit-Treiber in das Verzeichnis I</usr/share/cups/"
+#~ "drivers/x64>, genau wie unten benannt:"
+
+#~ msgid ""
+#~ "    ps5ui.dll\n"
+#~ "    pscript.hlp\n"
+#~ "    pscript.ntf\n"
+#~ "    pscript5.dll\n"
+#~ msgstr ""
+#~ "    ps5ui.dll\n"
+#~ "    pscript.hlp\n"
+#~ "    pscript.ntf\n"
+#~ "    pscript5.dll\n"
+
+#~ msgid ""
+#~ "B<Note:> Unlike Windows, case is significant - make sure that you use the "
+#~ "lowercase filenames shown above, otherwise B<cupsaddsmb> will fail to "
+#~ "export the drivers."
+#~ msgstr ""
+#~ "B<Hinweis:> Anders als unter Windows ist die Groß-/Kleinschreibung "
+#~ "relevant. Stellen Sie sicher, dass Sie die Dateinamen wie oben klein "
+#~ "schreiben, andernfalls kann B<cupsaddsmb> die Treiber nicht exportieren."
+
+#~ msgid "B<cupsaddsmb> supports the following options:"
+#~ msgstr "B<cupsaddsmb> unterstützt die folgenden Optionen:"
+
+#~ msgid "B<-H >I<samba-server>"
+#~ msgstr "B<-H >I<Samba-Server>"
+
+#~ msgid "Specifies the SAMBA server which defaults to the CUPS server."
+#~ msgstr ""
+#~ "Legt den Samba-Server, der standardmäßig auf den CUPS-Server gesetzt "
+#~ "wird, fest."
+
+#~ msgid "B<-U >I<samba-user>[B<%>I<samba-password>]"
+#~ msgstr "B<-U >I<Samba-Benutzer>[B<%>I<Samba-Passwort>]"
+
+#~ msgid ""
+#~ "Specifies the SAMBA print admin username which defaults to your current "
+#~ "username.  If the username contains a percent (%) character, then the "
+#~ "text following the percent is treated as the SAMBA password to use."
+#~ msgstr ""
+#~ "Legt den Benutzernamen des Samba-Druck-Administrators, standardmäßig Ihr "
+#~ "aktueller Benutzername, fest. Falls der Benutzername ein Prozentzeichen "
+#~ "(%) enthält, wird der Text, der dem Prozentzeichen folgt, als zu "
+#~ "verwendendes Samba-Passwort behandelt."
+
+#~ msgid ""
+#~ "Exports all known printers.  Otherwise only the named printers are "
+#~ "exported."
+#~ msgstr ""
+#~ "Exportiert alle bekannten Drucker. Andernfalls werden nur die benannten "
+#~ "Drucker exportiert."
+
+#~ msgid "B<-h >I<cups-server>[B<:>I<port>]"
+#~ msgstr "B<-h >I<CUPS-Server>[B<:>I<port>]"
+
+#~ msgid "Specifies a different CUPS server to use."
+#~ msgstr "Legt einen anderen zu verwendenden CUPS-Server fest."
+
+#~ msgid ""
+#~ "Specifies that verbose information should be shown.  This is useful for "
+#~ "debugging SAMBA configuration problems."
+#~ msgstr ""
+#~ "Legt fest, dass ausführliche Informationen angezeigt werden sollen. Dies "
+#~ "ist für die Fehlersuche bei Samba-Konfigurationsproblemen nützlich."
+
+#~ msgid ""
+#~ "B<rpcclient>(1), B<smbclient>(1), B<smbd>(8), B<smb.conf>(5), CUPS Online "
+#~ "Help (http://localhost:631/help)"
+#~ msgstr ""
+#~ "B<rpcclient>(1), B<smbclient>(1), B<smbd>(8), B<smb.conf>(5), CUPS-Online-"
+#~ "Hilfe (http://localhost:631/help)"
+
+#~ msgid "30 May 2016"
+#~ msgstr "30. Mai 2016"
+
+#~ msgid "2 May 2019"
+#~ msgstr "2. Mai 2019"
 
 #, fuzzy
 #~ msgid ""
-#~ "Specifies what information is included in the User-Agent header of HTTP "
-#~ "requests.  \"None\" disables the User-Agent header.  \"ProductOnly\" "
-#~ "reports \"CUPS\".  \"Major\" reports \"CUPS/major IPP/2\".  \"Minor\" "
-#~ "reports \"CUPS/major.minor IPP/2.1\".  \"Minimal\" reports \"CUPS/major."
-#~ "minor.patch IPP/2.1\".  \"OS\" reports \"CUPS/major.minor.path (osname "
-#~ "osversion) IPP/2.1\".  \"Full\" reports \"CUPS/major.minor.path (osname "
-#~ "osversion; architecture) IPP/2.1\".  The default is \"Minimal\"."
+#~ "Specifies what information is included in the Server header of HTTP "
+#~ "responses.  \"None\" disables the Server header.  \"ProductOnly\" reports "
+#~ "\"CUPS\".  \"Major\" reports \"CUPS 2\".  \"Minor\" reports \"CUPS "
+#~ "2.0\".  \"Minimal\" reports \"CUPS 2.0.0\".  \"OS\" reports \"CUPS 2.0.0 "
+#~ "(UNAME)\" where UNAME is the output of the B<uname>(1)  command.  \"Full"
+#~ "\" reports \"CUPS 2.0.0 (UNAME) IPP/2.0\".  The default is \"Minimal\"."
 #~ msgstr ""
 #~ "Legt fest, welche Informationen in die Server-Kopfzeilen von HTTP-"
 #~ "Antworten aufgenommen werden. »None« deaktiviert die Server-Kopfzeilen. "
@@ -17200,214 +17384,323 @@ msgstr ""
 #~ "die Ausgabe des Befehls B<uname>(1) ist. »Full« berichtet »CUPS 2.0.0 "
 #~ "(UNAME) IPP/2.0«. Die Vorgabe ist »Minimal«."
 
-#, fuzzy
-#~ msgid "DEPRECATED OPTIONS"
-#~ msgstr "VERALTETE DIREKTIVEN"
+#~ msgid ""
+#~ "Sets encryption options.  By default, CUPS only supports encryption using "
+#~ "TLS v1.0 or higher using known secure cipher suites.  Security is reduced "
+#~ "when I<Allow> options are used.  Security is enhanced when I<Deny> "
+#~ "options are used.  The I<AllowDH> option enables cipher suites using "
+#~ "plain Diffie-Hellman key negotiation (not supported on systems using GNU "
+#~ "TLS).  The I<AllowRC4> option enables the 128-bit RC4 cipher suites, "
+#~ "which are required for some older clients.  The I<AllowSSL3> option "
+#~ "enables SSL v3.0, which is required for some older clients that do not "
+#~ "support TLS v1.0.  The I<DenyCBC> option disables all CBC cipher suites.  "
+#~ "The I<DenyTLS1.0> option disables TLS v1.0 support - this sets the "
+#~ "minimum protocol version to TLS v1.1."
+#~ msgstr ""
+#~ "Setzt die Verschlüsselungsoptionen (nur in /etc/cups/client.conf). "
+#~ "Standardmäßig unterstützt CUPS nur Verschlüsselung mit TLS v1.0 oder "
+#~ "höher mit bekannt sicheren Algorithmen. Wenn I<Allow>-Optionen verwandt "
+#~ "werden, wird die Sicherheit reduziert. Wenn I<Deny>-Optionen verwandt "
+#~ "werden, wird die Sicherheit verbessert. Die Option I<AllowDH> aktiviert "
+#~ "Algorithmen, die den einfachen Diffie-Hellman-Schlüsselaustausch "
+#~ "verwenden (für Systeme, die GNU TLS verwenden, wird dies nicht "
+#~ "unterstützt). Die Option I<AllowRC4> aktiviert die 128-bit-RC4-"
+#~ "Algorithmen, die für einige älteren Clients benötigt werden. Die Option "
+#~ "I<AllowSSL3> aktiviert SSL v3.0, das für einige ältere Clients benötigt "
+#~ "wird, die TLS v1.0 nicht unterstützen. Die Option I<DenyCBC> deaktiviert "
+#~ "alle CBC-Algorithmen. Die Option I<DenyTLS1.0> deaktiviert die TLS-v1.0-"
+#~ "Unterstützung - damit wird die minimale Protokollversion auf TLS v1.1 "
+#~ "gesetzt."
 
-#, fuzzy
 #~ msgid ""
-#~ "The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
-#~ "normally located in the I</etc/cups> directory.  Each line in the file "
-#~ "can be a configuration directive, a blank line, or a comment.  "
-#~ "Configuration directives typically consist of a name and zero or more "
-#~ "values separated by whitespace.  The configuration directive name and "
-#~ "values are case-insensitive.  Comment lines start with the # character."
+#~ "Allows access from the named hosts, domains, addresses, or interfaces.  "
+#~ "The Order directive controls whether Allow lines are evaluated before or "
+#~ "after Deny lines."
 #~ msgstr ""
-#~ "Jede Zeile in der Datei kann eine Konfigurationsdirektive, eine leere "
-#~ "Zeile oder ein Kommentar sein. Konfigurationsdirektiven bestehen "
-#~ "typischerweise aus einem Namen und keinem oder mehren, durch Leerzeichen "
-#~ "getrennten Werten. Die Groß- und Kleinschreibung der Namen und Werte der "
-#~ "Konfigurationsdirektiven ist nicht relevant. Kommentarzeilen beginnen mit "
-#~ "dem Zeichen »#«. "
+#~ "Erlaubt Zugriffe von den benannten Rechnern, Domains, Adressen oder "
+#~ "Schnittstellen. Die Direktive »Order« steuert, ob »Allow«-Zeilen vor oder "
+#~ "nach »Deny«-Zeilen ausgewertet werden."
 
-#, fuzzy
 #~ msgid ""
-#~ "Specifies the fully-qualified domain name for the server that is used for "
-#~ "Bonjour sharing.  The default is typically the server's \".local\" "
-#~ "hostname."
+#~ "Denies access from the named hosts, domains, addresses, or interfaces.  "
+#~ "The Order directive controls whether Deny lines are evaluated before or "
+#~ "after Allow lines."
 #~ msgstr ""
-#~ "Legt den vollqualifizierten Rechnernamen des Servers fest. Die Vorgabe "
-#~ "ist der Wert, der von dem Befehl B<hostname>(1) berichtet wird."
+#~ "Verweigert Zugriffe von den benannten Rechnern, Domains, Adressen oder "
+#~ "Schnittstellen. Die Direktive »Order« steuert, ob »Deny«-Zeilen vor oder "
+#~ "nach »Allow«-Zeilen ausgewertet werden."
+
+#~ msgid "8 November 2017"
+#~ msgstr "8. November 2017"
+
+#~ msgid "Copyright \\[co] 2007-2018 by Apple Inc."
+#~ msgstr "Copyright \\[co] 2007-2018 by Apple Inc."
+
+#~ msgid "12 February 2016"
+#~ msgstr "12. Februar 2016"
+
+#~ msgid "25 February 2018 "
+#~ msgstr "25. Februar 2018"
+
+#~ msgid "3 June 2014"
+#~ msgstr "3. Juni 2014"
 
 #, fuzzy
+#~| msgid "15 April 2014"
+#~ msgid "16 April 2014"
+#~ msgstr "15. April 2014"
+
+#~ msgid "cupstestdsc"
+#~ msgstr "cupstestdsc"
+
+#~ msgid "cupstestdsc - test conformance of postscript files (deprecated)"
+#~ msgstr ""
+#~ "cupstestdsc - überprüft Konformität von PostScript-Dateien (veraltet)"
+
+#~ msgid "B<cupstestdsc> [ B<-h> ] I<filename.ps> [ ...  I<filenameN.ps> ]"
+#~ msgstr "B<cupstestdsc> [ B<-h> ] I<Dateiname.ps> [ …  I<DateinameN.ps> ]"
+
+#~ msgid "B<cupstestdsc> [ B<-h> ] B<->"
+#~ msgstr "B<cupstestdsc> [ B<-h> ] B<->"
+
 #~ msgid ""
-#~ "The B<cups-lpd> program is deprecated and will no longer be supported in "
-#~ "a future feature release of CUPS."
+#~ "B<cupstestdsc> tests the conformance of PostScript files to the Adobe "
+#~ "PostScript Language Document Structuring Conventions Specification "
+#~ "version 3.0.  The results of testing and any other output are sent to the "
+#~ "standard output.  The second form of the command reads PostScript from "
+#~ "the standard input."
 #~ msgstr ""
-#~ "I<Dieses Programm ist veraltet und wird in einer zukünftigen "
-#~ "Veröffentlichung von CUPS entfernt werden.>"
+#~ "B<cupstestdsc> überprüft die Konformität von PostScript-Dateien zu der "
+#~ "Adobe PostScript Language Document Structuring Conventions Specification "
+#~ "Version 3.0. Das Ergebnis des Tests und alle anderen Ausgaben werden an "
+#~ "die Standardausgabe gesandt. Die zweite Form des Befehls liest PostScript "
+#~ "von der Standardeingabe."
 
-#, fuzzy
 #~ msgid ""
-#~ "The CUPS SNMP backend is deprecated and will no longer be supported in a "
-#~ "future version of CUPS."
+#~ "B<cupstestdsc> only validates the DSC comments in a PostScript file and "
+#~ "does not attempt to validate the PostScript code itself.  Developers must "
+#~ "ensure that the PostScript they generate follows the rules defined by "
+#~ "Adobe.  Specifically, all pages must be independent of each other, code "
+#~ "outside page descriptions may not affect the graphics state (current "
+#~ "font, color, transform matrix, etc.), and device-specific commands such "
+#~ "as setpagedevice should not be used."
 #~ msgstr ""
-#~ "I<Dieses Programm ist veraltet und wird in einer zukünftigen "
-#~ "Veröffentlichung von CUPS entfernt werden.>"
+#~ "B<cupstestdsc> validiert nur die DSC-Kommentare in einer PostScript-Datei "
+#~ "und versucht nicht, den PostScript-Code selbst zu validieren. Entwickler "
+#~ "müssen sicherstellen, dass das von ihnen generierte PostScript den von "
+#~ "Adobe definierten Regeln folgt. Insbesondere müssen alle Seiten "
+#~ "voneinander unabhängig sein, Code außerhalb der Seitenbeschreibung sollte "
+#~ "nicht den Graphikzustand betreffen (derzeit Schrift, Farbe, "
+#~ "Transformationsmatrix usw.) und Geräte-spezifische Befehle wie "
+#~ "setpagedevice sollten nicht verwandt werden."
 
-#, fuzzy
-#~ msgid "24 April 2019"
-#~ msgstr "24. April 2018"
+#~ msgid ""
+#~ "CUPS Online Help (http://localhost:631/help), Adobe PostScript Language "
+#~ "Document Structuring Conventions Specification, Version 3.0."
+#~ msgstr ""
+#~ "CUPS-Online-Hilfe (http://localhost:631/help), Adobe PostScript Language "
+#~ "Document Structuring Conventions Specification, Version 3.0."
 
-#, fuzzy
-#~ msgid "B<ippevepcl> [ I<filename> ]"
-#~ msgstr "B<PageLog >[ I<Dateiname> ]"
+#~ msgid "19 October 2015"
+#~ msgstr "19. Oktober 2015"
 
-#, fuzzy
-#~ msgid "B<ippeveps> [ I<filename> ]"
-#~ msgstr "B<PageLog >[ I<Dateiname> ]"
+#~ msgid "14 February 2018"
+#~ msgstr "14. Februar 2018"
 
-#, fuzzy
-#~ msgid "B<ippeveprinter>(8)"
-#~ msgstr "B<-p >[I<Drucker>]"
+#~ msgid "ippserver"
+#~ msgstr "ippserver"
 
-#, fuzzy
-#~ msgid "Copyright \\[co] 2019 by Apple Inc."
-#~ msgstr "Copyright \\[co] 2007-2019 by Apple Inc."
+#~ msgid "28 August 2014"
+#~ msgstr "28. August 2014"
 
-#, fuzzy
-#~ msgid "ippeveprinter"
-#~ msgstr "/printers"
+#~ msgid "ippserver - a simple internet printing protocol server"
+#~ msgstr "ippserver - ein einfacher Internet-Printing-Protocol-Server"
 
-#, fuzzy
-#~ msgid "17 May 2019"
-#~ msgstr "2. Mai 2019"
+#~ msgid "B<-P>"
+#~ msgstr "B<-P>"
 
-#, fuzzy
-#~ msgid "Show program usage."
-#~ msgstr "Zeigt die Programm-Verwendung."
+#~ msgid "Report support for PIN printing."
+#~ msgstr "Berichtet die Unterstützung für PIN-Drucken."
 
-#, fuzzy
-#~ msgid "Show the CUPS version."
-#~ msgstr "Zeigt, ob der CUPS-Server läuft."
+#~ msgid "Run the specified command for each document that is printed."
+#~ msgstr "Führt den angegebenen Befehl für jedes zu druckende Dokument aus."
 
 #, fuzzy
-#~ msgid "B<-D >I<device-uri>"
-#~ msgstr "B<-v \">I<Geräte-URI>B<\">"
+#~| msgid ""
+#~| "Specifies the model name of the printer.  The default is \"Printer\"."
+#~ msgid ""
+#~ "Specifies the printer icon file for the server.  The default is \"printer."
+#~ "png\"."
+#~ msgstr "Legt den Modellnamen des Druckers fest. Die Vorgabe ist »Printer«."
 
 #, fuzzy
-#~ msgid "B<-F >I<output-type/subtype[,...]>"
-#~ msgstr "B<-f >I<Typ/Untertyp[,…]>"
+#~ msgid "    ippserver -c file \"My Cool Printer\"\n"
+#~ msgstr "    ippserver \"Mein Toller Drucker\"\n"
 
-#, fuzzy
-#~ msgid "B<-P >I<filename.ppd>"
-#~ msgstr "B<-p >I<Dateiname.ppd>"
+#~ msgid "Copyright \\[co] 2007-2014 by Apple Inc."
+#~ msgstr "Copyright \\[co] 2007-2014 by Apple Inc."
 
-#, fuzzy
-#~ msgid "B<-V 1.1>"
-#~ msgstr "B<VERSION 1.1>"
+#~ msgid "4 August 2017"
+#~ msgstr "4. August 2017"
 
-#, fuzzy
-#~ msgid "B<-V 2.0>"
-#~ msgstr "B<VERSION 2.0>"
+#~ msgid "19 August 2018"
+#~ msgstr "19. August 2018"
 
-#, fuzzy
-#~ msgid "Specifies the maximum IPP version to report.  2.0 is the default."
-#~ msgstr "Legt die für diesen Test zu verwendende IPP-Versionsnummer fest."
+#~ msgid "B<-i >I<ppd-file>"
+#~ msgstr "B<-i >I<PPD-Datei>"
 
-#, fuzzy
 #~ msgid ""
-#~ "Specifies the printer icon file for the server.  The file must be a PNG "
-#~ "format image.  The default is an internally-provided PNG image."
+#~ "Specifies a PostScript Printer Description (PPD) file to use with the "
+#~ "printer."
 #~ msgstr ""
-#~ "Legt die Drucker-Icon-Datei für den Server fest. Die Vorgabe ist »printer."
-#~ "png«."
+#~ "Legt eine mit diesem Drucker zu verwendende PostScript-Printer-"
+#~ "Description-(PPD)-Datei fest."
 
-#, fuzzy
-#~ msgid "COMMAND OUTPUT"
-#~ msgstr "BEFEHLE"
+#~ msgid ""
+#~ "Unlike the System V printing system, CUPS allows printer names to contain "
+#~ "any printable character except SPACE, TAB, \"/\", or \"#\".  Also, "
+#~ "printer and class names are I<not> case-sensitive.  Finally, the CUPS "
+#~ "version of B<lpadmin> may ask the user for an access password depending "
+#~ "on the printing system configuration.  This differs from the System V "
+#~ "version which requires the root user to execute this command."
+#~ msgstr ""
+#~ "Anders als in einem System-V-Drucksystem erlaubt CUPS, dass Druckernamen "
+#~ "jedes druckbare Zeichen außer LEERZEICHEN, TABULATOR, »/« oder »#« "
+#~ "enthalten. Außerdem wird bei Drucker- und Klassennamen Groß- und "
+#~ "Kleinschreibung nicht unterschieden. Zu guter Letzt könnte die CUPS-"
+#~ "Version von B<lpadmin> den Benutzer abhängig von der "
+#~ "Drucksystemkonfiguration nach einem Passwort fragen. Das unterscheidet es "
+#~ "von der System-V-Version, die zur Ausführung dieses Befehls den Root-"
+#~ "Benutzer benötigt."
 
-#, fuzzy
-#~ msgid "B<ATTR: >I<attribute=value[ attribute=value]>"
-#~ msgstr "B<ATTR: >I<Attribut=Wert >[ I<… Attribut=Wert>]"
+#~ msgid "12 June 2014"
+#~ msgstr "12. Juni 2014"
 
-#, fuzzy
-#~ msgid "B<DEBUG: >I<Debugging message>"
-#~ msgstr "B<DEBUG: >I<Nachricht>"
+#~ msgid "2 May 2016"
+#~ msgstr "2. Mai 2016"
 
-#, fuzzy
-#~ msgid "B<ERROR: >I<Error message>"
-#~ msgstr "B<ERROR:>I< Nachricht>"
+#~ msgid "B<-o collate=true>"
+#~ msgstr "B<-o collate=true>"
 
-#, fuzzy
-#~ msgid "B<INFO: >I<Informational message>"
-#~ msgstr "B<INFO:>I< Nachricht>"
+#~ msgid "Prints collated copies."
+#~ msgstr "Druckt sortierte Kopien."
 
-#, fuzzy
-#~ msgid "    ippeveprinter -c /usr/bin/file \"My Cool Printer\"\n"
-#~ msgstr "    ippserver -c file \"Mein Toller Drucker\"\n"
+#~ msgid "B<-o fit-to-page>"
+#~ msgstr "B<-o fit-to-page>"
 
-#, fuzzy
-#~ msgid "B<--ippserver >I<filename>"
-#~ msgstr "B<-p >I<Dateiname.ppd>"
+#~ msgid "Scales the print file to fit on the page."
+#~ msgstr "Skaliert die Druckdatei auf Seitengröße."
+
+#~ msgid "B<-o job-hold-until=>I<when>"
+#~ msgstr "B<-o job-hold-until=>I<wann>"
 
-#, fuzzy
 #~ msgid ""
-#~ "Specifies that the test results should be written to the named "
-#~ "B<ippserver> attributes file."
+#~ "Holds the job until the specified local time.  \"when\" can be "
+#~ "\"indefinite\" to hold the until released, \"day-time\" to print the job "
+#~ "between 6am and 6pm local time, \"night\" to print the job between 6pm "
+#~ "and 6am local time, \"second-shift\" to print the job between 4pm and "
+#~ "12am local time, \"third-shift\" to print the job between 12am and 8am "
+#~ "local time, or \"weekend\" to print the job on Saturday or Sunday."
 #~ msgstr ""
-#~ "Legt fest, dass der aktuelle Test übersprungen werden soll, wenn die "
-#~ "Variable (nicht) definiert ist."
+#~ "Hält den Auftrag bis zur angegebenen lokalen Uhrzeit. »wann« kann "
+#~ "»indefinite« enthalten, um das Halten bis zur Freigabe durchzuführen, "
+#~ "»day-time«, um den Auftrag zwischen 6:00 Uhr und 18:00 Uhr lokale Zeit zu "
+#~ "drucken, »night«, um den Auftrag zwischen 4:00 Uhr und 12:00 Uhr lokale "
+#~ "Zeit zu drucken, »third-shift«, um den Auftrag zwischen 12:00 Uhr und "
+#~ "08:00 Uhr lokale Zeit zu drucken oder »weekend«, um den Auftrag am "
+#~ "Samstag oder Sonntag zu drucken."
 
-#, fuzzy
-#~ msgid "13 May 2019"
-#~ msgstr "13. Mai 2013"
+#~ msgid "B<-o job-hold-until=>I<hh:mm>"
+#~ msgstr "B<-o job-hold-until=>I<hh:mm>"
 
-#, fuzzy
-#~ msgid "B<$date-start>"
-#~ msgstr "B<-H restart>"
+#~ msgid "Holds the job until the specified time in hours and minutes UTC."
+#~ msgstr "Hält den Auftrag bis zur angegeben Zeit in Stunden und Minuten UTC."
 
-#, fuzzy
-#~ msgid "B<-o print-quality=3>"
-#~ msgstr "B<-o printer-op-policy=>I<Name>"
+#~ msgid "B<-o job-priority=>I<priority>"
+#~ msgstr "B<-o job-priority=>I<Priorität>"
 
-#, fuzzy
-#~ msgid "B<-o print-quality=4>"
-#~ msgstr "B<-o orientation-requested=4>"
+#~ msgid ""
+#~ "Set the priority to a value from 1 (lowest) to 100 (highest), which "
+#~ "influences when a job is scheduled for printing.  The default priority is "
+#~ "typically 50."
+#~ msgstr ""
+#~ "Setzt die Priorität auf einen Wert zwischen 1 (niedrigste) und 100 "
+#~ "(höchste). Dies beeinflusst, wann ein Auftrag für den Druck eingeplant "
+#~ "wird. Die Vorgabepriorität ist typischerweise 50."
 
-#, fuzzy
-#~ msgid "B<-o print-quality=5>"
-#~ msgstr "B<-o orientation-requested=5>"
+#~ msgid "B<-o job-sheets=>I<start-name,end-name>"
+#~ msgstr "B<-o job-sheets=>I<Startname,Endname>"
 
-#, fuzzy
-#~ msgid "Print a presentation document 2-up to a printer called \"bar\":"
-#~ msgstr ""
-#~ "Druckt ein Präsentations-Dokument zweifach pro Seite auf dem Drucker mit "
-#~ "Namen »foo«:"
+#~ msgid "Prints cover pages (banners) with the document."
+#~ msgstr "Druckt Deckblätter mit dem Dokument."
 
-#, fuzzy
-#~ msgid "    lp -d bar -o number-up=2 filename\n"
-#~ msgstr "    lp -d foo -o number-up=2 Dateiname\n"
+#~ msgid "B<-o mirror>"
+#~ msgstr "B<-o mirror>"
 
-#, fuzzy
-#~ msgid "The following B<lpadmin> options are deprecated:"
-#~ msgstr "Die folgenden Optionen werden erkannt:"
+#~ msgid "Mirrors each page."
+#~ msgstr "Spiegelt jede Seite."
 
-#, fuzzy
-#~ msgid "B<-i >I<filename>"
-#~ msgstr "B<-f>I<\\ Dateiname>"
+#~ msgid "B<-o number-up-layout=>I<layout>"
+#~ msgstr "B<-o number-up-layout=>I<Layout>"
 
-#, fuzzy
 #~ msgid ""
-#~ "Specifies a PostScript Printer Description (PPD) file to use with the "
-#~ "printer.  Note: PPD files and printer drivers are deprecated and will not "
-#~ "be supported in a future version of CUPS."
+#~ "Specifies the layout of pages with the \"number-up\" option.  The \"layout"
+#~ "\" string can be \"btlr\", \"btrl\", \"lrbt\", \"lrtb\", \"rlbt\", \"rltb"
+#~ "\", \"tblr\", or \"tbrl\" - the first two letters determine the column "
+#~ "order while the second two letters determine the row order.  \"bt\" is "
+#~ "bottom-to-top, \"lr\" is left-to-right, \"rl\" is right-to-left, and \"tb"
+#~ "\" is top-to-bottom."
 #~ msgstr ""
-#~ "Legt eine PostScript-Printer-Description-Datei für die Verwendung mit dem "
-#~ "Drucker fest. Falls angegeben überschreibt diese Option die Option I<-i> "
-#~ "(Schnittstellenskript)."
+#~ "Legt das Layout der Seiten mit der Option »number-up« fest. Die "
+#~ "Zeichenkette »Layout« kann »btlr«, »btrl«, »lrbt«, »lrtb«, »rlbt«, "
+#~ "»rltb«, »tblr« oder »tbrl« sein. Die ersten zwei Buchstaben bestimmen die "
+#~ "Spaltenreihenfolge, während die zweiten zwei Buchstaben die "
+#~ "Zeilenreihenfolge bestimmen. »bt« ist von unten nach oben, »lr« ist links "
+#~ "nach rechts, »rl« ist rechts nach links und »tb« ist oben nach unten."
+
+#~ msgid "B<-o outputorder=reverse>"
+#~ msgstr "B<-o outputorder=reverse>"
+
+#~ msgid "Prints pages in reverse order."
+#~ msgstr "Druckt Seiten in umgekehrter Reihenfolge"
+
+#~ msgid "B<-o page-border=>I<border>"
+#~ msgstr "B<-o page-border=>I<Rand>"
 
-#, fuzzy
 #~ msgid ""
-#~ "Finally, the CUPS version of B<lpadmin> may ask the user for an access "
-#~ "password depending on the printing system configuration.  This differs "
-#~ "from the System V version which requires the root user to execute this "
-#~ "command."
+#~ "Prints a border around each document page.  \"border\" is \"double\", "
+#~ "\"double-thick\", \"single\", or \"single-thick\"."
 #~ msgstr ""
-#~ "Die CUPS-Versionen von B<disable> und B<enable> könnten den Benutzer, "
-#~ "abhängig von der Konfiguration des Drucksystems, nach einem "
-#~ "Zugriffspasswort fragen. Dies unterscheidet sich von der System-V-"
-#~ "Version, die verlangt, dass der Benutzer »root« diese Befehle ausführt."
+#~ "Druckt einen Rand um jede Dokumentenseite. »Rand« ist »double«, »double-"
+#~ "thick«, »single« oder »single-thick«."
+
+#~ msgid "B<-o page-ranges=>I<page-list>"
+#~ msgstr "B<-o page-ranges=>I<Seitenliste>"
+
+#~ msgid "    lp -d foo -o number-up=2 filename\n"
+#~ msgstr "    lp -d foo -o number-up=2 Dateiname\n"
+
+#~ msgid "26 May 2016"
+#~ msgstr "26. Mai 2016"
+
+#~ msgid "10 April 2018"
+#~ msgstr "10. April 2018"
+
+#~ msgid "22 May 2014"
+#~ msgstr "22. Mai 2014"
+
+#~ msgid "26 May 2017"
+#~ msgstr "26. Mai 2017"
+
+#~ msgid "26 August 2015"
+#~ msgstr "28. August 2015"
+
+#~ msgid "5 March 2016"
+#~ msgstr "5. März 2016"
+
+#, fuzzy
+#~ msgid "13 May 2019"
+#~ msgstr "13. Mai 2013"
 
 #~ msgid "15 June 2017"
 #~ msgstr "15. Juni 2017"
@@ -18539,9 +18832,6 @@ msgstr ""
 #~ msgid "I<ipptool(1)>, RFC 2911,"
 #~ msgstr "I<ipptool(1)>, RFC 2911,"
 
-#~ msgid "16 July 2012"
-#~ msgstr "16. Juli 2012"
-
 #~ msgid "CONFIGURATION OPTIONS"
 #~ msgstr "KONFIGURATIONSOPTIONEN"
 
diff --git a/debian/manpage-po4a/po/fr.po b/debian/manpage-po4a/po/fr.po
index 0fccf0ef6..701354e7a 100644
--- a/debian/manpage-po4a/po/fr.po
+++ b/debian/manpage-po4a/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cups-2.0.3-6\n"
-"POT-Creation-Date: 2019-08-17 15:33+0200\n"
+"POT-Creation-Date: 2019-09-02 10:31+0200\n"
 "PO-Revision-Date: 2018-04-25 11:57+0200\n"
 "Last-Translator: Jean-Paul Guillonneau <guillonneau.jeanpaul@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -22,100 +22,101 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: backend.man:13
+#: backend.7:10
 #, no-wrap
 msgid "backend"
 msgstr "backend"
 
 #. type: TH
-#: backend.man:13 cancel.man:13 classes.conf.man:13 client.conf.man.in:13
-#: cupsaccept.man:13 cupsaddsmb.man.in:13 cups-config.man:13 cupsctl.man:13
-#: cupsd.conf.man.in:13 cupsd-helper.man:13 cupsd-logs.man:13 cupsd.man.in:13
-#: cupsenable.man:13 cups-files.conf.man.in:13 cupsfilter.man:12
-#: cups-lpd.man.in:13 cups.man:13 cups-snmp.conf.man:13 cups-snmp.man.in:12
-#: cupstestdsc.man:13 cupstestppd.man:13 filter.man:13 ippfind.man:12
-#: ../test/ippserver.man:12 ipptoolfile.man:12 ipptool.man:12 lpadmin.man:13
-#: lpc.man:13 lpinfo.man:13 lp.man:13 lpmove.man:13 lpoptions.man.in:13
-#: lpq.man:13 lpr.man:13 lprm.man:13 lpstat.man:13 mailto.conf.man:13
-#: mime.convs.man:13 mime.types.man:13 notifier.man:13 ppdcfile.man:13
-#: ppdc.man:13 ppdhtml.man:13 ppdi.man:13 ppdmerge.man:13 ppdpo.man:13
-#: printers.conf.man:13 subscriptions.conf.man:13
+#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10
+#: cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10
+#: cupsfilter.8:9 cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10
+#: cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ipptool.1:9
+#: ipptoolfile.5:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10 lpmove.8:10
+#: lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9 mailto.conf.5:10
+#: mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10 ppdcfile.5:10
+#: ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10 printers.conf.5:9
+#: subscriptions.conf.5:10
 #, no-wrap
 msgid "CUPS"
 msgstr "CUPS"
 
 # type: TH
 #. type: TH
-#: backend.man:13
-#, no-wrap
-msgid "4 April 2014"
-msgstr "4 avril 2014"
+#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd-helper.8:10
+#: cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10 cupsfilter.8:9
+#: cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10 cupstestppd.1:10 filter.7:10
+#: ippfind.1:9 ipptool.1:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10
+#: lpmove.8:10 lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9
+#: mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10
+#: ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10
+#: printers.conf.5:9 subscriptions.conf.5:10
+#, no-wrap
+msgid "26 April 2019"
+msgstr "26 avril 2019"
 
 # type: TH
 #. type: TH
-#: backend.man:13 cancel.man:13 classes.conf.man:13 client.conf.man.in:13
-#: cupsaccept.man:13 cupsaddsmb.man.in:13 cups-config.man:13 cupsctl.man:13
-#: cupsd.conf.man.in:13 cupsd-helper.man:13 cupsd-logs.man:13 cupsd.man.in:13
-#: cupsenable.man:13 cups-files.conf.man.in:13 cupsfilter.man:12
-#: cups-lpd.man.in:13 cups.man:13 cups-snmp.conf.man:13 cups-snmp.man.in:12
-#: cupstestdsc.man:13 cupstestppd.man:13 filter.man:13 ippfind.man:12
-#: ../test/ippserver.man:12 ipptoolfile.man:12 ipptool.man:12 lpadmin.man:13
-#: lpc.man:13 lpinfo.man:13 lp.man:13 lpmove.man:13 lpoptions.man.in:13
-#: lpq.man:13 lpr.man:13 lprm.man:13 lpstat.man:13 mailto.conf.man:13
-#: mime.convs.man:13 mime.types.man:13 notifier.man:13 ppdcfile.man:13
-#: ppdc.man:13 ppdhtml.man:13 ppdi.man:13 ppdmerge.man:13 ppdpo.man:13
-#: printers.conf.man:13 subscriptions.conf.man:13
+#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10
+#: cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10
+#: cupsfilter.8:9 cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10
+#: cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ippfind.1:9
+#: ipptool.1:9 ipptoolfile.5:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10
+#: lpmove.8:10 lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9
+#: mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10
+#: ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10
+#: printers.conf.5:9 subscriptions.conf.5:10
 #, no-wrap
 msgid "Apple Inc."
 msgstr "Apple Inc."
 
 # type: SH
 #. type: SH
-#: backend.man:14 cancel.man:14 classes.conf.man:14 client.conf.man.in:14
-#: cupsaccept.man:14 cupsaddsmb.man.in:14 cups-config.man:14 cupsctl.man:14
-#: cupsd.conf.man.in:14 cupsd-helper.man:14 cupsd-logs.man:14 cupsd.man.in:14
-#: cupsenable.man:14 cups-files.conf.man.in:14 cupsfilter.man:13
-#: cups-lpd.man.in:14 cups.man:14 cups-snmp.conf.man:14 cups-snmp.man.in:13
-#: cupstestdsc.man:14 cupstestppd.man:14 filter.man:14 ippfind.man:13
-#: ../test/ippserver.man:13 ipptoolfile.man:13 ipptool.man:13 lpadmin.man:14
-#: lpc.man:14 lpinfo.man:14 lp.man:14 lpmove.man:14 lpoptions.man.in:14
-#: lpq.man:14 lpr.man:14 lprm.man:14 lpstat.man:14 mailto.conf.man:14
-#: mime.convs.man:14 mime.types.man:14 notifier.man:14 ppdcfile.man:14
-#: ppdc.man:14 ppdhtml.man:14 ppdi.man:14 ppdmerge.man:14 ppdpo.man:14
-#: printers.conf.man:14 subscriptions.conf.man:14
+#: backend.7:11 cancel.1:11 classes.conf.5:11 client.conf.5:11 cups.1:11
+#: cupsaccept.8:11 cups-config.1:11 cupsctl.8:11 cupsd.8:11 cupsd.conf.5:11
+#: cupsd-helper.8:11 cupsd-logs.5:11 cupsenable.8:11 cups-files.conf.5:11
+#: cupsfilter.8:10 cups-lpd.8:11 cups-snmp.8:10 cups-snmp.conf.5:11
+#: cupstestppd.1:11 filter.7:11 ippevepcl.7:10 ippeveprinter.1:10 ippfind.1:10
+#: ipptool.1:10 ipptoolfile.5:10 lp.1:11 lpadmin.8:11 lpc.8:11 lpinfo.8:11
+#: lpmove.8:11 lpoptions.1:11 lpq.1:11 lpr.1:11 lprm.1:11 lpstat.1:10
+#: mailto.conf.5:11 mime.convs.5:11 mime.types.5:11 notifier.7:11 ppdc.1:11
+#: ppdcfile.5:11 ppdhtml.1:11 ppdi.1:11 ppdmerge.1:11 ppdpo.1:11
+#: printers.conf.5:10 subscriptions.conf.5:11
 #, no-wrap
 msgid "NAME"
 msgstr "NOM"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:16
+#: backend.7:13
 msgid "backend - cups backend transmission interfaces"
 msgstr "backend - Programme de transmission de CUPS."
 
 # type: SH
 #. type: SH
-#: backend.man:16 cancel.man:16 cupsaccept.man:16 cupsaddsmb.man.in:17
-#: cups-config.man:16 cupsctl.man:16 cupsd-helper.man:16 cupsd.man.in:16
-#: cupsenable.man:16 cupsfilter.man:15 cups-lpd.man.in:16 cups-snmp.man.in:15
-#: cupstestdsc.man:16 cupstestppd.man:16 filter.man:16 ippfind.man:15
-#: ../test/ippserver.man:15 ipptool.man:15 lpadmin.man:16 lpc.man:16
-#: lpinfo.man:16 lp.man:16 lpmove.man:16 lpoptions.man.in:16 lpq.man:16
-#: lpr.man:16 lprm.man:16 lpstat.man:16 notifier.man:16 ppdc.man:16
-#: ppdhtml.man:16 ppdi.man:16 ppdmerge.man:16 ppdpo.man:16
+#: backend.7:13 cancel.1:13 cupsaccept.8:13 cups-config.1:13 cupsctl.8:13
+#: cupsd.8:13 cupsd-helper.8:13 cupsenable.8:13 cupsfilter.8:12 cups-lpd.8:13
+#: cups-snmp.8:12 cupstestppd.1:13 filter.7:13 ippevepcl.7:12
+#: ippeveprinter.1:12 ippfind.1:12 ipptool.1:12 lp.1:13 lpadmin.8:13 lpc.8:13
+#: lpinfo.8:13 lpmove.8:13 lpoptions.1:13 lpq.1:13 lpr.1:13 lprm.1:13
+#: lpstat.1:12 notifier.7:13 ppdc.1:13 ppdhtml.1:13 ppdi.1:13 ppdmerge.1:13
+#: ppdpo.1:13
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SYNOPSIS"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:18
+#: backend.7:15
 msgid "B<backend>"
 msgstr "B<backend>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:28
+#: backend.7:25
 msgid ""
 "B<backend> I<job> I<user> I<title> I<num-copies> I<options> [ I<filename> ]"
 msgstr ""
@@ -123,19 +124,19 @@ msgstr ""
 "[ I<fichier> ]"
 
 #. type: Plain text
-#: backend.man:31 filter.man:29
+#: backend.7:28 filter.7:26
 #, no-wrap
 msgid "B<#include E<lt>cups/cups.hE<gt>>\n"
 msgstr "B<#include E<lt>cups/cups.hE<gt>>\n"
 
 #. type: Plain text
-#: backend.man:33
+#: backend.7:30
 #, no-wrap
 msgid "B<const char *cupsBackendDeviceURI>(B<char **>I<argv>);\n"
 msgstr "B<const char *cupsBackendDeviceURI>(B<char **>I<argv>);\n"
 
 #. type: Plain text
-#: backend.man:40
+#: backend.7:37
 #, no-wrap
 msgid ""
 "B<void cupsBackendReport>(B<const char *>I<device_scheme>,\n"
@@ -153,7 +154,7 @@ msgstr ""
 "                       B<const char *>I<emplacement_périph>);\n"
 
 #. type: Plain text
-#: backend.man:43
+#: backend.7:40
 #, no-wrap
 msgid ""
 "B<ssize_t cupsBackChannelWrite>(B<const char *>I<buffer>,\n"
@@ -163,7 +164,7 @@ msgstr ""
 "                             B<t_taille >I<octets>, B<double >I<délai>);\n"
 
 #. type: Plain text
-#: backend.man:47
+#: backend.7:44
 #, no-wrap
 msgid ""
 "B<int cupsSideChannelRead>(B<cups_sc_command_t *>I<command>,\n"
@@ -175,7 +176,7 @@ msgstr ""
 "                        B<int *>I<taille_données>, B<double >I<délai>);\n"
 
 #. type: Plain text
-#: backend.man:51
+#: backend.7:48
 #, no-wrap
 msgid ""
 "B<int cupsSideChannelWrite>(B<cups_sc_command_t >I<command>,\n"
@@ -188,25 +189,23 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: backend.man:52 cancel.man:40 classes.conf.man:16 client.conf.man.in:16
-#: cupsaccept.man:43 cupsaddsmb.man.in:50 cups-config.man:52 cupsctl.man:39
-#: cupsd.conf.man.in:16 cupsd-helper.man:49 cupsd-logs.man:16 cupsd.man.in:35
-#: cupsenable.man:49 cups-files.conf.man.in:16 cupsfilter.man:57
-#: cups-lpd.man.in:26 cups.man:16 cups-snmp.conf.man:16 cups-snmp.man.in:26
-#: cupstestdsc.man:31 cupstestppd.man:54 filter.man:54 ippfind.man:35
-#: ../test/ippserver.man:62 ipptoolfile.man:15 ipptool.man:75 lpadmin.man:57
-#: lpc.man:23 lpinfo.man:63 lp.man:87 lpmove.man:40 lpoptions.man.in:56
-#: lpq.man:34 lpr.man:56 lprm.man:34 lpstat.man:69 mailto.conf.man:16
-#: mime.convs.man:16 mime.types.man:16 notifier.man:22 ppdcfile.man:16
-#: ppdc.man:48 ppdhtml.man:25 ppdi.man:29 ppdmerge.man:27 ppdpo.man:28
-#: printers.conf.man:16 subscriptions.conf.man:16
+#: backend.7:49 cancel.1:37 classes.conf.5:13 client.conf.5:13 cups.1:13
+#: cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:13
+#: cupsd-helper.8:46 cupsd-logs.5:13 cupsenable.8:46 cups-files.conf.5:13
+#: cupsfilter.8:54 cups-lpd.8:23 cups-snmp.8:23 cups-snmp.conf.5:13
+#: cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:79 ippfind.1:32
+#: ipptool.1:75 ipptoolfile.5:12 lp.1:84 lpadmin.8:54 lpc.8:20 lpinfo.8:60
+#: lpmove.8:37 lpoptions.1:53 lpq.1:31 lpr.1:53 lprm.1:31 lpstat.1:65
+#: mailto.conf.5:13 mime.convs.5:13 mime.types.5:13 notifier.7:19 ppdc.1:45
+#: ppdcfile.5:13 ppdhtml.1:22 ppdi.1:26 ppdmerge.1:24 ppdpo.1:25
+#: printers.conf.5:12 subscriptions.conf.5:13
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:56
+#: backend.7:53
 msgid ""
 "Backends are a special type of B<filter>(7)  which is used to send print "
 "data to and discover different devices on the system."
@@ -217,7 +216,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:58
+#: backend.7:55
 msgid ""
 "Like filters, backends must be capable of reading from a filename on the "
 "command-line or from the standard input, copying the standard input to a "
@@ -230,11 +229,11 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:66
+#: backend.7:64
 #, fuzzy
 msgid ""
 "The command name (I<argv[0]>) is set to the device URI of the destination "
-"printer. Authentication information in I<argv[0]> is removed, so backend "
+"printer.  Authentication information in I<argv[0]> is removed, so backend "
 "developers are urged to use the B<DEVICE_URI> environment variable whenever "
 "authentication information is required. The B<cupsBackendDeviceURI>()  "
 "function may be used to retrieve the correct device URI."
@@ -249,7 +248,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:68
+#: backend.7:66
 msgid ""
 "Back-channel data from the device should be relayed to the job filters using "
 "the I<cupsBackChannelWrite> function."
@@ -258,7 +257,7 @@ msgstr ""
 "travaux en utilisant la fonction B<cupsBackChannelWrite>."
 
 #. type: Plain text
-#: backend.man:76
+#: backend.7:74
 msgid ""
 "Backends are responsible for reading side-channel requests using the "
 "B<cupsSideChannelRead>()  function and responding with the "
@@ -273,19 +272,19 @@ msgstr ""
 
 # type: SH
 #. type: SS
-#: backend.man:76
+#: backend.7:74
 #, no-wrap
 msgid "DEVICE DISCOVERY"
 msgstr "DÉCOUVERTE DES PÉRIPHÉRIQUES"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:78
+#: backend.7:77
 #, fuzzy
 msgid ""
 "When run with no arguments, the backend should list the devices and schemes "
-"it supports or is advertising to the standard output. The output consists of "
-"zero or more lines consisting of any of the following forms:"
+"it supports or is advertising to the standard output.  The output consists "
+"of zero or more lines consisting of any of the following forms:"
 msgstr ""
 "Quand il est exécuté sans paramètre, le programme de transmission doit "
 "afficher sur la sortie standard les périphériques et schémas qu'il gère ou "
@@ -294,7 +293,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:84
+#: backend.7:83
 #, no-wrap
 msgid ""
 "    device-class scheme \"Unknown\" \"device-info\"\n"
@@ -308,7 +307,7 @@ msgstr ""
 "    classe_périphérique URI_périphérique \"marque_et_modèle_périphérique\" \"info_périphérique\" \"id_périphérique\" \"emplacement_périphérique\"\n"
 
 #. type: Plain text
-#: backend.man:89
+#: backend.7:88
 msgid ""
 "The B<cupsBackendReport>()  function can be used to generate these lines and "
 "handle any necessary escaping of characters in the various strings."
@@ -319,20 +318,20 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:93
+#: backend.7:92
 msgid "The I<device-class> field is one of the following values:"
 msgstr "Le champ I<classe_périphérique> peut prendre une de ces valeurs :"
 
 # type: TP
 #. type: TP
-#: backend.man:93
+#: backend.7:92
 #, no-wrap
 msgid "B<direct>"
 msgstr "I<direct>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:96
+#: backend.7:95
 msgid ""
 "The device-uri refers to a specific direct-access device with no options, "
 "such as a parallel, USB, or SCSI device."
@@ -342,27 +341,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: backend.man:96
+#: backend.7:95
 #, no-wrap
 msgid "B<file>"
 msgstr "I<file>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:99
+#: backend.7:98
 msgid "The device-uri refers to a file on disk."
 msgstr "L'URI du périphérique se réfère à un fichier sur le disque."
 
 # type: TP
 #. type: TP
-#: backend.man:99
+#: backend.7:98
 #, no-wrap
 msgid "B<network>"
 msgstr "I<network>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:103
+#: backend.7:102
 msgid ""
 "The device-uri refers to a networked device and conforms to the general form "
 "for network URIs."
@@ -372,18 +371,18 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: backend.man:103
+#: backend.7:102
 #, no-wrap
 msgid "B<serial>"
 msgstr "I<serial>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:106
+#: backend.7:106
 #, fuzzy
 msgid ""
 "The device-uri refers to a serial device with configurable baud rate and "
-"other options. If the device-uri contains a baud value, it represents the "
+"other options.  If the device-uri contains a baud value, it represents the "
 "maximum baud rate supported by the device."
 msgstr ""
 "L'URI du périphérique se réfère à un périphérique série avec une vitesse "
@@ -392,13 +391,13 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:112
+#: backend.7:114
 #, fuzzy
 msgid ""
 "The I<scheme> field provides the URI scheme that is supported by the "
-"backend. Backends should use this form only when the backend supports any "
-"URI using that scheme. The I<device-uri> field specifies the full URI to use "
-"when communicating with the device."
+"backend.  Backends should use this form only when the backend supports any "
+"URI using that scheme.  The I<device-uri> field specifies the full URI to "
+"use when communicating with the device."
 msgstr ""
 "Le champ I<schéma> fournit le schéma d'URI géré par le programme de "
 "transmission. Les programmes de transmission ne doivent utiliser cette forme "
@@ -407,11 +406,11 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:116
+#: backend.7:119
 #, fuzzy
 msgid ""
 "The I<device-make-and-model> field specifies the make and model of the "
-"device, e.g. \"Example Foojet 2000\". If the make and model is not known, "
+"device, e.g. \"Example Foojet 2000\".  If the make and model is not known, "
 "you must report \"Unknown\"."
 msgstr ""
 "Le champ I<marque_et_modèle_périphérique> précise la marque et le modèle du "
@@ -420,10 +419,10 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:120
+#: backend.7:124
 #, fuzzy
 msgid ""
-"The I<device-info> field specifies additional information about the device. "
+"The I<device-info> field specifies additional information about the device.  "
 "Typically this includes the make and model along with the port number or "
 "network address, e.g. \"Example Foojet 2000 USB #1\"."
 msgstr ""
@@ -434,7 +433,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:124
+#: backend.7:128
 msgid ""
 "The optional I<device-id> field specifies the IEEE-1284 device ID string for "
 "the device, which is used to select a matching driver."
@@ -444,7 +443,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:128
+#: backend.7:132
 msgid ""
 "The optional I<device-location> field specifies the physical location of the "
 "device, which is often used to pre-populate the printer-location attribute "
@@ -456,18 +455,18 @@ msgstr ""
 
 # type: SH
 #. type: SS
-#: backend.man:128
+#: backend.7:132
 #, no-wrap
 msgid "PERMISSIONS"
 msgstr "PERMISSIONS"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:130
+#: backend.7:135
 #, fuzzy
 msgid ""
 "Backends without world read and execute permissions are run as the root "
-"user. Otherwise, the backend is run using an unprivileged user account, "
+"user.  Otherwise, the backend is run using an unprivileged user account, "
 "typically \"lp\"."
 msgstr ""
 "Les programmes de transmission sans droit de lecture et d'exécution pour "
@@ -477,15 +476,15 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: backend.man:130 cupsfilter.man:105 cupstestppd.man:113 ippfind.man:217
-#: ../test/ippserver.man:130 ipptool.man:186
+#: backend.7:135 cupsfilter.8:102 cupstestppd.1:110 ippevepcl.7:39
+#: ippeveprinter.1:183 ippfind.1:214 ipptool.1:191
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "CODE DE RETOUR"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:132
+#: backend.7:137
 msgid "The following exit codes are defined for backends:"
 msgstr ""
 "Les codes de retour suivants sont définis pour les programmes de "
@@ -493,14 +492,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: backend.man:132
+#: backend.7:137
 #, no-wrap
 msgid "B<CUPS_BACKEND_OK>"
 msgstr "B<CUPS_BACKEND_OK>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:135
+#: backend.7:140
 msgid ""
 "The print file was successfully transmitted to the device or remote server."
 msgstr ""
@@ -509,18 +508,18 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: backend.man:135
+#: backend.7:140
 #, no-wrap
 msgid "B<CUPS_BACKEND_FAILED>"
 msgstr "B<CUPS_BACKEND_FAILED>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:141
+#: backend.7:147
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted to the device or remote "
-"server. The scheduler will respond to this by canceling the job, retrying "
+"server.  The scheduler will respond to this by canceling the job, retrying "
 "the job, or stopping the queue depending on the state of the I<printer-error-"
 "policy> attribute."
 msgstr ""
@@ -531,18 +530,18 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: backend.man:141
+#: backend.7:147
 #, no-wrap
 msgid "B<CUPS_BACKEND_AUTH_REQUIRED>"
 msgstr "B<CUPS_BACKEND_AUTH_REQUIRED>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:144
+#: backend.7:151
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because valid authentication "
-"information is required. The scheduler will respond to this by holding the "
+"information is required.  The scheduler will respond to this by holding the "
 "job and adding the 'cups-held-for-authentication' keyword to the \"job-"
 "reasons\" Job Description attribute."
 msgstr ""
@@ -553,18 +552,18 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: backend.man:144
+#: backend.7:151
 #, no-wrap
 msgid "B<CUPS_BACKEND_HOLD>"
 msgstr "B<CUPS_BACKEND_HOLD>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:147
+#: backend.7:155
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because it cannot be printed "
-"at this time. The scheduler will respond to this by holding the job."
+"at this time.  The scheduler will respond to this by holding the job."
 msgstr ""
 "Le fichier à imprimer n'a pas été transmis avec succès parce qu'il ne peut "
 "pas être imprimé à ce moment. L'ordonnanceur conservera le travail "
@@ -572,36 +571,36 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: backend.man:147
+#: backend.7:155
 #, no-wrap
 msgid "B<CUPS_BACKEND_STOP>"
 msgstr "B<CUPS_BACKEND_STOP>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:150
+#: backend.7:159
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because it cannot be printed "
-"at this time. The scheduler will respond to this by stopping the queue."
+"at this time.  The scheduler will respond to this by stopping the queue."
 msgstr ""
 "Le fichier à imprimer n'a pas été transmis avec succès parce qu'il ne peut "
 "pas être imprimé à ce moment. L'ordonnanceur stoppera la file d'impression."
 
 # type: TP
 #. type: TP
-#: backend.man:150
+#: backend.7:159
 #, no-wrap
 msgid "B<CUPS_BACKEND_CANCEL>"
 msgstr "B<CUPS_BACKEND_CANCEL>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:153
+#: backend.7:163
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because one or more "
-"attributes are not supported or the job was canceled at the printer. The "
+"attributes are not supported or the job was canceled at the printer.  The "
 "scheduler will respond to this by canceling the job."
 msgstr ""
 "Le fichier à imprimer n'a pas été transmis avec succès parce qu'un attribut "
@@ -610,18 +609,18 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: backend.man:153
+#: backend.7:163
 #, no-wrap
 msgid "B<CUPS_BACKEND_RETRY>"
 msgstr "B<CUPS_BACKEND_RETRY>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:156
+#: backend.7:167
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because of a temporary "
-"issue. The scheduler will retry the job at a future time - other jobs may "
+"issue.  The scheduler will retry the job at a future time - other jobs may "
 "print before this one."
 msgstr ""
 "Le fichier à imprimer n'a pas été transmis avec succès à cause d'un incident "
@@ -630,18 +629,18 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: backend.man:156
+#: backend.7:167
 #, no-wrap
 msgid "B<CUPS_BACKEND_RETRY_CURRENT>"
 msgstr "B<CUPS_BACKEND_RETRY_CURRENT>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:159
+#: backend.7:171
 #, fuzzy
 msgid ""
 "The print file was not successfully transmitted because of a temporary "
-"issue. The scheduler will retry the job immediately without allowing "
+"issue.  The scheduler will retry the job immediately without allowing "
 "intervening jobs."
 msgstr ""
 "Le fichier à imprimer n'a pas été transmis avec succès à cause d'un incident "
@@ -650,20 +649,20 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:161
+#: backend.7:173
 msgid "All other exit code values are reserved."
 msgstr "Tous les autres codes de retour sont réservés."
 
 # type: SH
 #. type: SH
-#: backend.man:161 cupsfilter.man:108 cups.man:63 cups-snmp.man.in:40
-#: ippfind.man:219 ../test/ippserver.man:141
+#: backend.7:173 cups.1:60 cupsfilter.8:105 cups-snmp.8:37 ippevepcl.7:41
+#: ippeveprinter.1:194 ippfind.1:216
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "ENVIRONNEMENT"
 
 #. type: Plain text
-#: backend.man:167
+#: backend.7:179
 msgid ""
 "In addition to the environment variables listed in B<cups>(1)  and "
 "B<filter>(7), CUPS backends can expect the following environment variable:"
@@ -674,53 +673,55 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: backend.man:167
+#: backend.7:179
 #, no-wrap
 msgid "B<DEVICE_URI>"
 msgstr "B<DEVICE_URI>"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:170
+#: backend.7:182
 msgid "The device URI associated with the printer."
 msgstr "L'URI du périphérique associé à l'imprimante."
 
 # type: SH
 #. type: SH
-#: backend.man:170 cupsd-helper.man:59 cupsd.man.in:74 cupsfilter.man:113
-#: cups-lpd.man.in:57 cups.man:117 cups-snmp.man.in:43 ipptool.man:190
-#: lpoptions.man.in:107 mime.convs.man:40 mime.types.man:90
+#: backend.7:182 cups.1:114 cupsd.8:71 cupsd-helper.8:56 cupsfilter.8:110
+#: cups-lpd.8:54 cups-snmp.8:40 ipptool.1:195 lpoptions.1:104 mime.convs.5:37
+#: mime.types.5:87
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
 
 # type: TH
 #. type: Plain text
-#: backend.man:172
+#: backend.7:184
 msgid "I</etc/cups/cups-files.conf>"
 msgstr "I</etc/cups/cups-files.conf>"
 
 # type: SH
 #. type: SH
-#: backend.man:172 cancel.man:84 classes.conf.man:20 client.conf.man.in:86
-#: cupsfilter.man:120 cups-lpd.man.in:63 cupstestdsc.man:35 filter.man:204
-#: lpadmin.man:199 lpc.man:43 lpr.man:187 ppdmerge.man:38 printers.conf.man:20
-#: subscriptions.conf.man:20
+#: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:110
+#: cups.1:122 cupsd.conf.5:858 cupsd-helper.8:77 cups-files.conf.5:273
+#: cupsfilter.8:117 cups-lpd.8:60 cups-snmp.8:44 cups-snmp.conf.5:58
+#: cupstestppd.1:138 filter.7:201 lpadmin.8:203 lpc.8:40 lpinfo.8:117 lpr.1:151
+#: mime.convs.5:50 ppdc.1:90 ppdcfile.5:149 ppdhtml.1:35 ppdi.1:42
+#: ppdmerge.1:35 ppdpo.1:42 printers.conf.5:16 subscriptions.conf.5:19
 #, no-wrap
 msgid "NOTES"
 msgstr "NOTES"
 
 #. type: Plain text
-#: backend.man:178
+#: backend.7:192
 #, fuzzy
 msgid ""
-"CUPS backends are not generally designed to be run directly by the user. "
+"CUPS backends are not generally designed to be run directly by the user.  "
 "Aside from the device URI issue ( I<argv[0]> and B<DEVICE_URI> environment "
 "variable contain the device URI), CUPS backends also expect specific "
 "environment variables and file descriptors, and typically run in a user "
-"session that (on macOS) has additional restrictions that affect how it runs. "
-"Backends can also be installed with restricted permissions (0500 or 0700) "
-"that tell the scheduler to run them as the \"root\" user instead of an "
+"session that (on macOS) has additional restrictions that affect how it "
+"runs.  Backends can also be installed with restricted permissions (0500 or "
+"0700) that tell the scheduler to run them as the \"root\" user instead of an "
 "unprivileged user (typically \"lp\") on the system."
 msgstr ""
 "Les programmes de transmission de CUPS ne sont généralement pas conçus pour "
@@ -737,13 +738,13 @@ msgstr ""
 "« lp »)."
 
 #. type: Plain text
-#: backend.man:188
+#: backend.7:204
 #, fuzzy
 msgid ""
 "Unless you are a developer and know what you are doing, please do not run "
-"backends directly. Instead, use the B<lp>(1)  or B<lpr>(1)  programs to send "
-"print jobs or B<lpinfo>(8)  to query for available printers using the "
-"backend. The one exception is the SNMP backend - see B<cups-snmp>(8)  for "
+"backends directly.  Instead, use the B<lp>(1)  or B<lpr>(1)  programs to "
+"send print jobs or B<lpinfo>(8)  to query for available printers using the "
+"backend.  The one exception is the SNMP backend - see B<cups-snmp>(8)  for "
 "more information."
 msgstr ""
 "À moins que vous ne soyez développeur, ou que vous sachiez ce que vous "
@@ -754,27 +755,33 @@ msgstr ""
 "seule exception est le programme de transmission SNMP — voir "
 "B<snmpbackend>(8) pour plus d'information."
 
+#. type: Plain text
+#: backend.7:208 filter.7:205 lpadmin.8:207 lpinfo.8:121
+msgid ""
+"CUPS printer drivers and backends are deprecated and will no longer be "
+"supported in a future feature release of CUPS.  Printers that do not support "
+"IPP can be supported using applications such as B<ippeveprinter>(1)."
+msgstr ""
+
 # type: SH
 #. type: SH
-#: backend.man:188 cancel.man:87 classes.conf.man:22 client.conf.man.in:98
-#: cupsaccept.man:80 cupsaddsmb.man.in:119 cups-config.man:107 cupsctl.man:95
-#: cupsd.conf.man.in:869 cupsd-helper.man:80 cupsd-logs.man:219
-#: cupsd.man.in:112 cupsenable.man:91 cups-files.conf.man.in:276
-#: cupsfilter.man:130 cups-lpd.man.in:111 cups.man:125 cups-snmp.conf.man:60
-#: cups-snmp.man.in:49 cupstestdsc.man:41 cupstestppd.man:141 filter.man:211
-#: ippfind.man:258 ../test/ippserver.man:164 ipptoolfile.man:646
-#: ipptool.man:241 lpadmin.man:210 lpc.man:48 lpinfo.man:120 lp.man:255
-#: lpmove.man:69 lpoptions.man.in:113 lpq.man:59 lpr.man:207 lprm.man:77
-#: lpstat.man:144 mailto.conf.man:43 mime.convs.man:53 mime.types.man:103
-#: notifier.man:34 ppdcfile.man:152 ppdc.man:93 ppdhtml.man:38 ppdi.man:45
-#: ppdmerge.man:41 ppdpo.man:45 printers.conf.man:22 subscriptions.conf.man:22
+#: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:122 cups.1:126
+#: cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:895
+#: cupsd-helper.8:81 cupsd-logs.5:216 cupsenable.8:88 cups-files.conf.5:280
+#: cupsfilter.8:131 cups-lpd.8:111 cups-snmp.8:49 cups-snmp.conf.5:62
+#: cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:251
+#: ippfind.1:255 ipptool.1:246 ipptoolfile.5:649 lp.1:219 lpadmin.8:224
+#: lpc.8:47 lpinfo.8:121 lpmove.8:66 lpoptions.1:110 lpq.1:56 lpr.1:171
+#: lprm.1:74 lpstat.1:140 mailto.conf.5:40 mime.convs.5:54 mime.types.5:100
+#: notifier.7:31 ppdc.1:94 ppdcfile.5:153 ppdhtml.1:39 ppdi.1:46 ppdmerge.1:42
+#: ppdpo.1:46 printers.conf.5:18 subscriptions.conf.5:21
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:197
+#: backend.7:217
 msgid ""
 "I<cups>(1), I<cups-files.conf>(5), I<cups-snmp>(8), I<cupsd>(8), "
 "I<filter>(7), I<lp>(1), I<lpinfo>(8), I<lpr>(1),"
@@ -784,68 +791,57 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:199 cupsaccept.man:88 cupsctl.man:100 filter.man:219
-#: lpmove.man:76
+#: backend.7:219 cupsaccept.8:85 cupsctl.8:97 filter.7:220 lpmove.8:73
 msgid "CUPS Online Help (http://localhost:631/help)"
 msgstr "Aide en ligne de CUPS : E<lt>URL:I<http://localhost:631/help>E<gt>"
 
 # type: SH
 #. type: SH
-#: backend.man:199 cancel.man:93 classes.conf.man:30 client.conf.man.in:102
-#: cupsaccept.man:88 cupsaddsmb.man.in:125 cups-config.man:110 cupsctl.man:100
-#: cupsd.conf.man.in:878 cupsd-helper.man:88 cupsd-logs.man:224
-#: cupsd.man.in:128 cupsenable.man:99 cups-files.conf.man.in:286
-#: cupsfilter.man:137 cups-lpd.man.in:118 cups.man:141 cups-snmp.conf.man:63
-#: cups-snmp.man.in:55 cupstestdsc.man:45 cupstestppd.man:145 filter.man:219
-#: ippfind.man:260 ../test/ippserver.man:166 ipptoolfile.man:651
-#: ipptool.man:246 lpadmin.man:216 lpc.man:58 lpinfo.man:123 lp.man:264
-#: lpmove.man:76 lpoptions.man.in:120 lpq.man:66 lpr.man:216 lprm.man:84
-#: lpstat.man:151 mailto.conf.man:46 mime.convs.man:60 mime.types.man:110
-#: notifier.man:38 ppdcfile.man:159 ppdc.man:100 ppdhtml.man:45 ppdi.man:52
-#: ppdmerge.man:48 ppdpo.man:52 printers.conf.man:30 subscriptions.conf.man:30
+#: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:126 cups.1:142
+#: cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:904
+#: cupsd-helper.8:89 cupsd-logs.5:221 cupsenable.8:96 cups-files.conf.5:290
+#: cupsfilter.8:138 cups-lpd.8:118 cups-snmp.8:55 cups-snmp.conf.5:65
+#: cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:255
+#: ippfind.1:257 ipptool.1:251 ipptoolfile.5:654 lp.1:228 lpadmin.8:230
+#: lpc.8:57 lpinfo.8:124 lpmove.8:73 lpoptions.1:117 lpq.1:63 lpr.1:180
+#: lprm.1:81 lpstat.1:147 mailto.conf.5:43 mime.convs.5:61 mime.types.5:107
+#: notifier.7:35 ppdc.1:101 ppdcfile.5:160 ppdhtml.1:46 ppdi.1:53 ppdmerge.1:49
+#: ppdpo.1:53 printers.conf.5:27 subscriptions.conf.5:30
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 # type: Plain text
 #. type: Plain text
-#: backend.man:200 cancel.man:94 classes.conf.man:31 client.conf.man.in:103
-#: cupsaccept.man:89 cupsaddsmb.man.in:126 cups-config.man:111 cupsctl.man:101
-#: cupsd-helper.man:89 cupsd.man.in:129 cupsenable.man:100 cupsfilter.man:138
-#: cups-lpd.man.in:119 cups.man:142 cups-snmp.conf.man:64 cups-snmp.man.in:56
-#: cupstestdsc.man:46 cupstestppd.man:146 filter.man:220 ipptool.man:247
-#: lpc.man:59 lpinfo.man:124 lp.man:265 lpmove.man:77 lpq.man:67 lpr.man:217
-#: lprm.man:85 lpstat.man:152 mailto.conf.man:47 mime.convs.man:61
-#: mime.types.man:111 notifier.man:39 ppdcfile.man:160 ppdc.man:101
-#: ppdhtml.man:46 ppdi.man:53 ppdmerge.man:49 ppdpo.man:53 printers.conf.man:31
-#: subscriptions.conf.man:31
-msgid "Copyright \\[co] 2007-2017 by Apple Inc."
-msgstr "Copyright 2007-2017 par Apple Inc."
+#: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:127 cups.1:143
+#: cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:905
+#: cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cups-files.conf.5:291
+#: cupsfilter.8:139 cups-lpd.8:119 cups-snmp.8:56 cups-snmp.conf.5:66
+#: cupstestppd.1:147 filter.7:221 ippeveprinter.1:256 ipptool.1:252
+#: ipptoolfile.5:655 lp.1:229 lpadmin.8:231 lpc.8:58 lpinfo.8:125 lpmove.8:74
+#: lpoptions.1:118 lpq.1:64 lpr.1:181 lprm.1:82 lpstat.1:148 mailto.conf.5:44
+#: mime.convs.5:62 mime.types.5:108 notifier.7:36 ppdc.1:102 ppdcfile.5:161
+#: ppdhtml.1:47 ppdi.1:54 ppdmerge.1:50 ppdpo.1:54 printers.conf.5:28
+#: subscriptions.conf.5:31
+msgid "Copyright \\[co] 2007-2019 by Apple Inc."
+msgstr "Copyright 2007-2019 par Apple Inc."
 
 # type: TH
 #. type: TH
-#: cancel.man:13
+#: cancel.1:10
 #, no-wrap
 msgid "cancel"
 msgstr "cancel"
 
-# type: TH
-#. type: TH
-#: cancel.man:13 classes.conf.man:13 cups-config.man:13 cupsd-helper.man:13
-#: printers.conf.man:13 subscriptions.conf.man:13
-#, no-wrap
-msgid "15 April 2014"
-msgstr "15 avril 2014"
-
 # type: Plain text
 #. type: Plain text
-#: cancel.man:16
+#: cancel.1:13
 msgid "cancel - cancel jobs"
 msgstr "cancel - Annuler des travaux d'impression"
 
 # type: Plain text
 #. type: Plain text
-#: cancel.man:40
+#: cancel.1:37
 msgid ""
 "B<cancel> [ B<-E> ] [ B<-U> I<username> ] [ B<-a> ] [ B<-h> I<hostname[:"
 "port]> ] [ B<-u> I<username> ] [ B<-x> ] [ I<id> ] [ I<destination> ] "
@@ -856,7 +852,7 @@ msgstr ""
 "[ I<destination> ] [ I<id_destination> ]"
 
 #. type: Plain text
-#: cancel.man:43
+#: cancel.1:40
 msgid ""
 "The B<cancel> command cancels print jobs.  If no I<destination> or I<id> is "
 "specified, the currently printing job on the default destination is canceled."
@@ -867,32 +863,31 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: cancel.man:43 cupsaccept.man:53 cupsaddsmb.man.in:99 cups-config.man:55
-#: cupsctl.man:43 cupsd.conf.man.in:479 cupsd.man.in:40 cupsenable.man:54
-#: cupsfilter.man:62 cups-lpd.man.in:35 cupstestppd.man:61 filter.man:63
-#: ippfind.man:194 ../test/ippserver.man:65 ipptool.man:88 lpadmin.man:76
-#: lpinfo.man:66 lp.man:97 lpmove.man:42 lpoptions.man.in:71 lpq.man:39
-#: lpr.man:67 lprm.man:39 lpstat.man:72 ppdc.man:51 ppdhtml.man:28 ppdi.man:33
-#: ppdmerge.man:31 ppdpo.man:31
+#: cancel.1:40 cupsaccept.8:50 cups-config.1:52 cupsctl.8:40 cupsd.8:37
+#: cupsd.conf.5:485 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:32
+#: cupstestppd.1:58 filter.7:60 ippeveprinter.1:82 ippfind.1:191 ipptool.1:88
+#: lp.1:94 lpadmin.8:73 lpinfo.8:63 lpmove.8:39 lpoptions.1:68 lpq.1:36
+#: lpr.1:64 lprm.1:36 lpstat.1:68 ppdc.1:48 ppdhtml.1:25 ppdi.1:30
+#: ppdmerge.1:28 ppdpo.1:28
 #, no-wrap
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
 # type: Plain text
 #. type: Plain text
-#: cancel.man:45
+#: cancel.1:42
 msgid "The following options are recognized by B<cancel>:"
 msgstr "Les options suivantes sont reconnues par B<cancel> :"
 
 #. type: TP
-#: cancel.man:45 cupsaddsmb.man.in:108 lpq.man:50
+#: cancel.1:42 lpq.1:47
 #, no-wrap
 msgid "B<-a>"
 msgstr "B<-a>"
 
 # type: Plain text
 #. type: Plain text
-#: cancel.man:49
+#: cancel.1:46
 msgid ""
 "Cancel all jobs on the named destination, or all jobs on all destinations if "
 "none is provided."
@@ -901,83 +896,83 @@ msgstr ""
 "toutes les destinations si aucune destination n'est fournie."
 
 #. type: TP
-#: cancel.man:49 cupsaccept.man:58 cupsctl.man:45 cupsenable.man:56
-#: ipptool.man:120 lpadmin.man:183 lpinfo.man:68 lp.man:102 lpmove.man:44
-#: lpoptions.man.in:73 lpq.man:41 lpr.man:69 lprm.man:43 lpstat.man:74
+#: cancel.1:46 cupsaccept.8:55 cupsctl.8:42 cupsenable.8:53 ipptool.1:125
+#: lp.1:99 lpadmin.8:175 lpinfo.8:65 lpmove.8:41 lpoptions.1:70 lpq.1:38
+#: lpr.1:66 lprm.1:40 lpstat.1:70
 #, no-wrap
 msgid "B<-E>"
 msgstr "B<-E>"
 
 # type: Plain text
 #. type: Plain text
-#: cancel.man:52 cupsaccept.man:61 lpinfo.man:71 lp.man:105 lpmove.man:47
-#: lpq.man:44 lpr.man:72 lprm.man:46 lpstat.man:77
+#: cancel.1:49 cupsaccept.8:58 lp.1:102 lpinfo.8:68 lpmove.8:44 lpq.1:41
+#: lpr.1:69 lprm.1:43 lpstat.1:73
 msgid "Forces encryption when connecting to the server."
 msgstr "Obliger un chiffrement lors de la connexion au serveur."
 
 # type: TP
 #. type: TP
-#: cancel.man:52
+#: cancel.1:49
 #, no-wrap
 msgid "B<-h >I<hostname>[I<:port>]"
 msgstr "B<-h> I<nom_hôte>[B<:>I<port>]"
 
 # type: Plain text
 #. type: Plain text
-#: cancel.man:55 lpmove.man:53 lpq.man:56 lpr.man:75 lprm.man:55 lpstat.man:107
+#: cancel.1:52 lpmove.8:50 lpq.1:53 lpr.1:72 lprm.1:52 lpstat.1:103
 msgid "Specifies an alternate server."
 msgstr "Indiquer un serveur alternatif."
 
 # type: TP
 #. type: TP
-#: cancel.man:55 cupsaccept.man:61 cupsctl.man:48 cupsenable.man:59 lp.man:105
-#: lpmove.man:47 lpq.man:47 lpr.man:85 lprm.man:49 lpstat.man:83
+#: cancel.1:52 cupsaccept.8:58 cupsctl.8:45 cupsenable.8:56 lp.1:102
+#: lpmove.8:44 lpq.1:44 lpr.1:82 lprm.1:46 lpstat.1:79
 #, no-wrap
 msgid "B<-U >I<username>"
 msgstr "B<-U> I<identifiant>"
 
 # type: Plain text
 #. type: Plain text
-#: cancel.man:58 lp.man:108
+#: cancel.1:55 lp.1:105
 msgid "Specifies the username to use when connecting to the server."
 msgstr "Indiquer l'identifiant à utiliser pour les connexions au serveur."
 
 # type: TP
 #. type: TP
-#: cancel.man:58
+#: cancel.1:55
 #, no-wrap
 msgid "B<-u >I<username>"
 msgstr "B<-u> I<identifiant>"
 
 # type: Plain text
 #. type: Plain text
-#: cancel.man:61
+#: cancel.1:58
 msgid "Cancels jobs owned by I<username>."
 msgstr "Annuler les travaux d'impression de l'I<identifiant>."
 
 #. type: TP
-#: cancel.man:61
+#: cancel.1:58
 #, no-wrap
 msgid "B<-x>"
 msgstr "B<-x>"
 
 #. type: Plain text
-#: cancel.man:64
+#: cancel.1:61
 msgid "Deletes job data files in addition to canceling."
 msgstr "Supprimer les fichiers de données des travaux en plus de l’annulation"
 
 #. type: SH
-#: cancel.man:64 cupsaccept.man:70 cupsd.conf.man.in:847 cupsd.man.in:84
-#: cupsenable.man:80 cups-lpd.man.in:49 cups.man:122 cups-snmp.man.in:47
-#: filter.man:202 ../test/ippserver.man:137 ipptool.man:224 lpadmin.man:194
-#: lpinfo.man:100 lp.man:232 lpoptions.man.in:111 lprm.man:55 lpstat.man:137
+#: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:873
+#: cupsenable.8:77 cups-lpd.8:46 cups-snmp.8:47 filter.7:199
+#: ippeveprinter.1:190 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97
+#: lpoptions.1:108 lprm.1:52 lpstat.1:133
 #, no-wrap
 msgid "CONFORMING TO"
 msgstr "CONFORMITÉ"
 
 # type: Plain text
 #. type: Plain text
-#: cancel.man:66
+#: cancel.1:63
 msgid ""
 "Unlike the System V printing system, CUPS allows printer names to contain "
 "any printable character except SPACE, TAB, \"/\", or \"#\". Also, printer "
@@ -990,53 +985,52 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: cancel.man:66 cups-config.man:94 cupsctl.man:69 cupsd.conf.man.in:849
-#: cupsd.man.in:87 cupstestppd.man:128 ippfind.man:245
-#: ../test/ippserver.man:148 ipptool.man:228 lpinfo.man:102 lp.man:237
-#: lpmove.man:53 lpr.man:189 lprm.man:59 mime.convs.man:46 mime.types.man:92
+#: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:875
+#: cupstestppd.1:125 ippeveprinter.1:235 ippfind.1:242 ipptool.1:233 lp.1:201
+#: lpinfo.8:99 lpmove.8:50 lpr.1:153 lprm.1:56 mime.convs.5:43 mime.types.5:89
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "EXEMPLES"
 
 #. type: Plain text
-#: cancel.man:68
+#: cancel.1:65
 msgid "Cancel the current print job:"
 msgstr "Annuler le travail d’impression en cours :"
 
 # type: TH
 #. type: Plain text
-#: cancel.man:71
+#: cancel.1:68
 #, no-wrap
 msgid "    cancel\n"
 msgstr "    cancel\n"
 
 #. type: Plain text
-#: cancel.man:74
+#: cancel.1:71
 msgid "Cancel job \"myprinter-42\":"
 msgstr "Annuler le travail d’impression « myprinter-42 » :"
 
 #. type: Plain text
-#: cancel.man:77
+#: cancel.1:74
 #, no-wrap
 msgid "    cancel myprinter-42\n"
 msgstr "    cancel myprinter-42\n"
 
 # type: Plain text
 #. type: Plain text
-#: cancel.man:80 lprm.man:73
+#: cancel.1:77 lprm.1:70
 msgid "Cancel all jobs:"
 msgstr "Annuler tous les travaux d'impression :"
 
 # type: Plain text
 #. type: Plain text
-#: cancel.man:83
+#: cancel.1:80
 #, no-wrap
 msgid "    cancel -a\n"
 msgstr "    cancel -a\n"
 
 # type: Plain text
 #. type: Plain text
-#: cancel.man:87
+#: cancel.1:84
 msgid ""
 "Administrators wishing to prevent unauthorized cancellation of jobs via the "
 "I<-u> option should require authentication for Cancel-Jobs operations in "
@@ -1047,7 +1041,7 @@ msgstr ""
 "pour les opérations dans le fichier I<cupsd.conf>."
 
 #. type: Plain text
-#: cancel.man:93
+#: cancel.1:90
 msgid ""
 "B<cupsd.conf>(5), B<lp>(1), B<lpmove>(8), B<lpstat>(1), CUPS Online Help "
 "(http://localhost:631/help)"
@@ -1057,25 +1051,25 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: classes.conf.man:13
+#: classes.conf.5:10
 #, no-wrap
 msgid "classes.conf"
 msgstr "classes.conf"
 
 # type: Plain text
 #. type: Plain text
-#: classes.conf.man:16
+#: classes.conf.5:13
 msgid "classes.conf - class configuration file for cups"
 msgstr "classes.conf - Fichier de configuration des classes de CUPS"
 
 # type: Plain text
 #. type: Plain text
-#: classes.conf.man:20
+#: classes.conf.5:19
 #, fuzzy
 msgid ""
 "The B<classes.conf> file defines the local printer classes that are "
-"available. It is normally located in the I</etc/cups> directory and is "
-"maintained by the B<cupsd>(8)  program. This file is not intended to be "
+"available.  It is normally located in the I</etc/cups> directory and is "
+"maintained by the B<cupsd>(8)  program.  This file is not intended to be "
 "edited or managed manually."
 msgstr ""
 "Le fichier I<classes.conf> définit les classes d'imprimantes locales "
@@ -1084,7 +1078,7 @@ msgstr ""
 "prévu pour être édité ou traité manuellement."
 
 #. type: Plain text
-#: classes.conf.man:22 printers.conf.man:22 subscriptions.conf.man:22
+#: classes.conf.5:21 printers.conf.5:18 subscriptions.conf.5:21
 msgid ""
 "The name, location, and format of this file are an implementation detail "
 "that will change in future releases of CUPS."
@@ -1094,7 +1088,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: classes.conf.man:30
+#: classes.conf.5:29
 msgid ""
 "B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime.types>(5), "
 "B<printers.conf>(5), B<subscriptions.conf>(5), CUPS Online Help (http://"
@@ -1106,29 +1100,21 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: client.conf.man.in:13
+#: client.conf.5:10
 #, no-wrap
 msgid "client.conf"
 msgstr "client.conf"
 
-# type: TH
-#. type: TH
-#: client.conf.man.in:13
-#, no-wrap
-msgid "19 October 2017"
-msgstr "19 octobre 2017"
-
 # type: Plain text
 #. type: Plain text
-#: client.conf.man.in:16
+#: client.conf.5:13
 #, fuzzy
-#| msgid "classes.conf - class configuration file for cups"
-msgid "client.conf - client configuration file for cups"
-msgstr "classes.conf - Fichier de configuration des classes de CUPS"
+msgid "client.conf - client configuration file for cups (deprecated on macos)"
+msgstr "client.conf - Fichier de configuration de client pour CUPS"
 
 # type: Plain text
 #. type: Plain text
-#: client.conf.man.in:19
+#: client.conf.5:16
 msgid ""
 "The B<client.conf> file configures the CUPS client and is normally located "
 "in the I</etc/cups> and/or I<~/.cups> directories.  Each line in the file "
@@ -1141,7 +1127,7 @@ msgstr ""
 "commentaires commencent par le caractère « # »."
 
 #. type: Plain text
-#: client.conf.man.in:24
+#: client.conf.5:21
 msgid ""
 "B<Note:> Starting with macOS 10.7, this file is only used by command-line "
 "and X11 applications plus the IPP backend.  The B<ServerName> directive is "
@@ -1159,15 +1145,14 @@ msgstr ""
 
 # type: SH
 #. type: SS
-#: client.conf.man.in:24 cups-files.conf.man.in:25 cups-snmp.conf.man:24
-#: mailto.conf.man:23
+#: client.conf.5:21 cups-files.conf.5:22 cups-snmp.conf.5:21 mailto.conf.5:20
 #, no-wrap
 msgid "DIRECTIVES"
 msgstr "DIRECTIVES"
 
 # type: Plain text
 #. type: Plain text
-#: client.conf.man.in:26
+#: client.conf.5:23
 msgid ""
 "The following directives are understood by the client. Consult the online "
 "help for detailed descriptions:"
@@ -1176,19 +1161,19 @@ msgstr ""
 "reporter à l'aide en ligne pour une description plus détaillée :"
 
 #. type: TP
-#: client.conf.man.in:26
+#: client.conf.5:23
 #, no-wrap
 msgid "B<AllowAnyRoot Yes>"
 msgstr "B<AllowAnyRoot> I<Yes>"
 
 #. type: TP
-#: client.conf.man.in:28
+#: client.conf.5:25
 #, no-wrap
 msgid "B<AllowAnyRoot No>"
 msgstr "B<AllowAnyRoot> I<No>"
 
 #. type: Plain text
-#: client.conf.man.in:32
+#: client.conf.5:29
 msgid ""
 "Specifies whether to allow TLS with certificates that have not been signed "
 "by a trusted Certificate Authority.  The default is \"Yes\"."
@@ -1197,19 +1182,19 @@ msgstr ""
 "signés par des autorités de certification de confiance. Par défaut, « Yes »."
 
 #. type: TP
-#: client.conf.man.in:32
+#: client.conf.5:29
 #, no-wrap
 msgid "B<AllowExpiredCerts Yes>"
 msgstr "B<AllowExpiredCerts> I<Yes>"
 
 #. type: TP
-#: client.conf.man.in:34
+#: client.conf.5:31
 #, no-wrap
 msgid "B<AllowExpiredCerts No>"
 msgstr "B<AllowExpiredCerts> I<No>"
 
 #. type: Plain text
-#: client.conf.man.in:38
+#: client.conf.5:35
 msgid ""
 "Specifies whether to allow TLS with expired certificates.  The default is "
 "\"No\"."
@@ -1219,39 +1204,39 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: client.conf.man.in:38 cupsd.conf.man.in:722
+#: client.conf.5:35 cupsd.conf.5:732
 #, no-wrap
 msgid "B<Encryption IfRequested>"
 msgstr "B<Encryption> I<IfRequested>"
 
 # type: TP
 #. type: TP
-#: client.conf.man.in:40 cupsd.conf.man.in:724
+#: client.conf.5:37 cupsd.conf.5:734
 #, no-wrap
 msgid "B<Encryption Never>"
 msgstr "B<Encryption> I<Never>"
 
 # type: TP
 #. type: TP
-#: client.conf.man.in:42 cupsd.conf.man.in:726
+#: client.conf.5:39 cupsd.conf.5:736
 #, no-wrap
 msgid "B<Encryption Required>"
 msgstr "B<Encryption> I<Required>"
 
 # type: Plain text
 #. type: Plain text
-#: client.conf.man.in:45
+#: client.conf.5:42
 msgid "Specifies the level of encryption that should be used."
 msgstr "Définir si un chiffrement doit être utilisé."
 
 #. type: TP
-#: client.conf.man.in:45 cupsd.conf.man.in:161
+#: client.conf.5:42 cupsd.conf.5:165
 #, no-wrap
 msgid "B<GSSServiceName >I<name>"
 msgstr "B<GSSServiceName> I<nom>"
 
 #. type: Plain text
-#: client.conf.man.in:49
+#: client.conf.5:46
 msgid ""
 "Specifies the Kerberos service name that is used for authentication, "
 "typically \"host\", \"http\", or \"ipp\".  CUPS adds the remote hostname "
@@ -1264,21 +1249,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: client.conf.man.in:49
+#: client.conf.5:46
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]"
 msgstr "B<ServerName> I<nom_hôte>-ou-I<adresse-ip>[B<:>I<port>]"
 
 # type: TP
 #. type: TP
-#: client.conf.man.in:51
+#: client.conf.5:48
 #, no-wrap
 msgid "B<ServerName >I</domain/socket>"
 msgstr "B<ServerName> I</domaine/socket>"
 
 # type: Plain text
 #. type: Plain text
-#: client.conf.man.in:55
+#: client.conf.5:52
 msgid ""
 "Specifies the address and optionally the port to use when connecting to the "
 "server.  B<Note: This directive is not supported on macOS 10.7 or later.>"
@@ -1289,14 +1274,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: client.conf.man.in:55
+#: client.conf.5:52
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]B</version=1.1>"
 msgstr "B<ServerName> I<nom_hôte>-ou-I<adresse-ip>[B<:>I<port>]B</version=1.1>"
 
 # type: Plain text
 #. type: Plain text
-#: client.conf.man.in:58
+#: client.conf.5:55
 msgid ""
 "Specifies the address and optionally the port to use when connecting to a "
 "server running CUPS 1.3.12 and earlier."
@@ -1305,19 +1290,21 @@ msgstr ""
 "serveur sous CUPS version 1.3.12 ou précédente."
 
 #. type: TP
-#: client.conf.man.in:58 cupsd.conf.man.in:434
+#: client.conf.5:55 cupsd.conf.5:437
 #, no-wrap
-msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
-msgstr "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
+msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>] [I<MaxTLS1.0>] [I<MaxTLS1.1>] [I<MaxTLS1.2>] [I<MaxTLS1.3>] [I<MinTLS1.0>] [I<MinTLS1.1>] [I<MinTLS1.2>] [I<MinTLS1.3>]"
+msgstr ""
 
 #. type: TP
-#: client.conf.man.in:60 cupsd.conf.man.in:436
+#: client.conf.5:57 cupsd.conf.5:439
 #, no-wrap
 msgid "B<SSLOptions None>"
 msgstr "B<SSLOptions> I<None>"
 
+#. #SSLPort
 #. type: Plain text
-#: client.conf.man.in:71
+#: client.conf.5:71 cupsd.conf.5:454
+#, fuzzy
 msgid ""
 "Sets encryption options (only in /etc/cups/client.conf).  By default, CUPS "
 "only supports encryption using TLS v1.0 or higher using known secure cipher "
@@ -1329,7 +1316,9 @@ msgid ""
 "option enables SSL v3.0, which is required for some older clients that do "
 "not support TLS v1.0.  The I<DenyCBC> option disables all CBC cipher "
 "suites.  The I<DenyTLS1.0> option disables TLS v1.0 support - this sets the "
-"minimum protocol version to TLS v1.1."
+"minimum protocol version to TLS v1.1.  The I<MinTLS> options set the minimum "
+"TLS version to support.  The I<MaxTLS> options set the maximum TLS version "
+"to support.  Not all operating systems support TLS 1.3 at this time."
 msgstr ""
 "Définir les options de chiffrement (seulement dans I</etc/cups/client."
 "conf>). Par défaut, CUPS prend en charge le chiffrement avec TLS "
@@ -1347,20 +1336,20 @@ msgstr ""
 "minimale du protocole à TLS version 1.1."
 
 #. type: TP
-#: client.conf.man.in:71
+#: client.conf.5:71
 #, no-wrap
 msgid "B<TrustOnFirstUse Yes>"
 msgstr "B<TrustOnFirstUse> I<Yes>"
 
 #. type: TP
-#: client.conf.man.in:73
+#: client.conf.5:73
 #, no-wrap
 msgid "B<TrustOnFirstUse No>"
 msgstr "B<TrustOnFirstUse> I<No>"
 
 # type: Plain text
 #. type: Plain text
-#: client.conf.man.in:77
+#: client.conf.5:77
 msgid ""
 "Specifies whether to trust new TLS certificates by default.  The default is "
 "\"Yes\"."
@@ -1370,31 +1359,100 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: client.conf.man.in:77
+#: client.conf.5:77
 #, no-wrap
 msgid "B<User >I<name>"
 msgstr "B<User> I<nom>"
 
 # type: Plain text
+#. #UserAgentTokens
 #. type: Plain text
-#: client.conf.man.in:80
+#: client.conf.5:81
 msgid "Specifies the default user name to use for requests."
 msgstr "Indiquer le nom d'utilisateur par défaut à utiliser pour les requêtes."
 
+# type: TP
+#. type: TP
+#: client.conf.5:81
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens None>"
+msgstr "B<ServerTokens> I<None>"
+
+# type: TP
+#. type: TP
+#: client.conf.5:83
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens ProductOnly>"
+msgstr "B<ServerTokens> I<ProductOnly>"
+
+# type: TP
+#. type: TP
+#: client.conf.5:85
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens Major>"
+msgstr "B<ServerTokens> I<Major>"
+
+# type: TP
+#. type: TP
+#: client.conf.5:87
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens Minor>"
+msgstr "B<ServerTokens> I<Minor>"
+
+# type: TP
+#. type: TP
+#: client.conf.5:89
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens Minimal>"
+msgstr "B<ServerTokens> I<Minimal>"
+
+# type: TP
+#. type: TP
+#: client.conf.5:91
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens OS>"
+msgstr "B<ServerTokens> I<OS>"
+
+# type: TP
+#. type: TP
+#: client.conf.5:93
+#, fuzzy, no-wrap
+msgid "B<UserAgentTokens Full>"
+msgstr "B<ServerTokens> I<Full>"
+
+#. type: Plain text
+#: client.conf.5:104
+#, fuzzy
+msgid ""
+"Specifies what information is included in the User-Agent header of HTTP "
+"requests.  \"None\" disables the User-Agent header.  \"ProductOnly\" reports "
+"\"CUPS\".  \"Major\" reports \"CUPS/major IPP/2\".  \"Minor\" reports \"CUPS/"
+"major.minor IPP/2.1\".  \"Minimal\" reports \"CUPS/major.minor.patch "
+"IPP/2.1\".  \"OS\" reports \"CUPS/major.minor.path (osname osversion) "
+"IPP/2.1\".  \"Full\" reports \"CUPS/major.minor.path (osname osversion; "
+"architecture) IPP/2.1\".  The default is \"Minimal\"."
+msgstr ""
+"Indiquer l’information à inclure dans l’en-tête du serveur pour les réponses "
+"HTTP. « None » désactive l’en-tête, « ProductOnly » renvoie « CUPS », "
+"« Major » renvoie « CUPS 2», « Minor » renvoie « CUPS 2.0 », « Minimal » "
+"renvoie « CUPS 2.0.0 », « OS » renvoie « CUPS 2.0.0 (UNAME) » ou UNAME est "
+"la sortie de la commande B<uname>(1), « Full » renvoie "
+"« CUPS 2.0.0 (UNAME) IPP/2.0 ». Par défaut, « Minimal »."
+
 #. type: TP
-#: client.conf.man.in:80
+#: client.conf.5:104
 #, no-wrap
 msgid "B<ValidateCerts Yes>"
 msgstr "B<ValidateCerts> I<Yes>"
 
 #. type: TP
-#: client.conf.man.in:82
+#: client.conf.5:106
 #, no-wrap
 msgid "B<ValidateCerts No>"
 msgstr "B<ValidateCerts> I<No>"
 
 #. type: Plain text
-#: client.conf.man.in:86
+#: client.conf.5:110
 msgid ""
 "Specifies whether to only allow TLS with certificates whose common name "
 "matches the hostname.  The default is \"No\"."
@@ -1403,7 +1461,7 @@ msgstr ""
 "usuel correspond au nom d’hôte. Par défaut, « No »."
 
 #. type: Plain text
-#: client.conf.man.in:91
+#: client.conf.5:115
 msgid ""
 "The B<client.conf> file is deprecated on macOS and will no longer be "
 "supported in a future version of CUPS.  Configuration settings can instead "
@@ -1415,7 +1473,7 @@ msgstr ""
 "B<defaults>(1) :"
 
 #. type: Plain text
-#: client.conf.man.in:94
+#: client.conf.5:118
 #, no-wrap
 msgid ""
 "defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required\n"
@@ -1425,13 +1483,13 @@ msgstr ""
 "defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO\n"
 
 #. type: Plain text
-#: client.conf.man.in:96
+#: client.conf.5:120
 #, no-wrap
 msgid "defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption\n"
 msgstr "defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption\n"
 
 #. type: Plain text
-#: client.conf.man.in:98
+#: client.conf.5:122
 msgid ""
 "On Linux and other systems using GNU TLS, the I</etc/cups/ssl/site.crl> "
 "file, if present, provides a list of revoked X.509 certificates and is used "
@@ -1443,7 +1501,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: client.conf.man.in:102
+#: client.conf.5:126
 msgid "B<cups>(1), B<default>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 "B<cupsd>(1), B<default>(7), aide en ligne de CUPS E<lt>URL:I<http://"
@@ -1451,527 +1509,695 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: cupsaccept.man:13
-#, no-wrap
-msgid "cupsaccept"
-msgstr "cupsaccept"
-
-# type: TH
-#. type: TH
-#: cupsaccept.man:13 cups-snmp.conf.man:13 cups-snmp.man.in:12
+#: cups.1:10
 #, no-wrap
-msgid "10 June 2014"
-msgstr "10 juin 2014"
+msgid "cups"
+msgstr "cups"
 
-# type: Plain text
 #. type: Plain text
-#: cupsaccept.man:16
-msgid "cupsaccept/cupsreject - accept/reject jobs sent to a destination"
+#: cups.1:13
+msgid "cups - a standards-based, open source printing system"
 msgstr ""
-"cupsaccept, cupsreject - Accepter ou refuser les travaux d'impression "
-"envoyés vers une destination"
+"cups - Système d’impression au code source ouvert, basé sur les standards "
 
-# type: Plain text
 #. type: Plain text
-#: cupsaccept.man:28
+#: cups.1:16
 msgid ""
-"B<cupsaccept> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] "
-"I<destination(s)>"
+"B<CUPS> is the software you use to print from applications like word "
+"processors, email readers, photo editors, and web browsers. It converts the "
+"page descriptions produced by your application (put a paragraph here, draw a "
+"line there, and so forth) into something your printer can understand and "
+"then sends the information to the printer for printing."
 msgstr ""
-"B<cupsaccept> [ B<-E> ] [ B<-U> I<identifiant> ] [ B<-h> I<nom_hôte>[B<:"
-">I<port>] ] I<destination(s)>"
+"B<CUPS> est le logiciel utilisé pour imprimer à partir d’applications telles "
+"que traitement de texte, lecteur de courriels, éditeur d’images et "
+"navigateur web. Il convertit les descriptions de page (mettre un paragraphe "
+"ici, dessiner une ligne là, etc.) en quelque chose que l’imprimante puisse "
+"comprendre, et ensuite envoie l’information vers l’imprimante."
 
-# type: Plain text
 #. type: Plain text
-#: cupsaccept.man:43
+#: cups.1:22
 msgid ""
-"B<cupsreject> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] "
-"[ B<-r> I<reason> ] I<destination(s)>"
+"Now, since every printer manufacturer does things differently, printing can "
+"be very complicated.  B<CUPS> does its best to hide this from you and your "
+"application so that you can concentrate on printing and less on how to "
+"print. Generally, the only time you need to know anything about your printer "
+"is when you use it for the first time, and even then B<CUPS> can often "
+"figure things out on its own."
 msgstr ""
-"B<cupsreject> [ B<-E> ] [ B<-U> I<identifiant> ] [ B<-h> I<nom_hôte>[B<:"
-">I<port>] ] [ B<-r> I<raison> ] I<destination(s)>"
+"Maintenant, comme chaque fabricant fait les choses à sa manière, une "
+"impression peut être très compliquée. B<CUPS> fait au mieux pour dissimuler "
+"cela à l’application comme à l’utilisateur de façon que celui-ci se "
+"concentre sur l’impression sans se soucier de la manière de faire. "
+"Généralement, la seule fois que l’utilisateur se soucie de son imprimante, "
+"c’est lors de sa première utilisation, et même alors, B<CUPS> peut faire les "
+"choses de lui-même."
+
+#. type: SS
+#: cups.1:22
+#, no-wrap
+msgid "HOW DOES IT WORK?"
+msgstr "COMMENT ÇA MARCHE ?"
 
-# type: Plain text
 #. type: Plain text
-#: cupsaccept.man:47
+#: cups.1:26
 msgid ""
-"The B<cupsaccept> command instructs the printing system to accept print jobs "
-"to the specified destinations."
+"The first time you print to a printer, B<CUPS> creates a queue to keep track "
+"of the current status of the printer (everything OK, out of paper, etc.) and "
+"any pages you have printed. Most of the time the queue points to a printer "
+"connected directly to your computer via a USB port, however it can also "
+"point to a printer on your network, a printer on the Internet, or multiple "
+"printers depending on the configuration. Regardless of where the queue "
+"points, it will look like any other printer to you and your applications."
 msgstr ""
-"B<cupsaccept> envoie l'ordre au système d'impression d'accepter les travaux "
-"d'impression vers les destinations indiquées."
+"Lors de la première impression, B<CUPS> crée une file d’attente pour "
+"conserver une trace de l’état actuel de l’imprimante (toutes choses OK, plus "
+"de papier, etc.) et de toutes les pages imprimées. La plupart du temps la "
+"file d’attente concerne l’imprimante connectée à votre ordinateur sur la "
+"prise USB. Cependant, elle peut concerner une imprimante du réseau, une "
+"imprimante sur Internet ou plusieurs imprimantes suivant la configuration. "
+"Quelque soit l’endroit concerné par la file d’attente, celles-ci seront "
+"semblables à n’importe quelle autre imprimante pour les applications et "
+"l’utilisateur."
 
-# type: Plain text
 #. type: Plain text
-#: cupsaccept.man:53
+#: cups.1:32
 msgid ""
-"The B<cupsreject> command instructs the printing system to reject print jobs "
-"to the specified destinations.  The I<-r> option sets the reason for "
-"rejecting print jobs. If not specified, the reason defaults to \"Reason "
-"Unknown\"."
+"Every time you print something, B<CUPS> creates a job which contains the "
+"queue you are sending the print to, the name of the document you are "
+"printing, and the page descriptions. Job are numbered (queue-1, queue-2, and "
+"so forth) so you can monitor the job as it is printed or cancel it if you "
+"see a mistake. When B<CUPS> gets a job for printing, it determines the best "
+"programs (filters, printer drivers, port monitors, and backends) to convert "
+"the pages into a printable format and then runs them to actually print the "
+"job."
 msgstr ""
-"B<cupsreject> envoie l'ordre au système d'impression de refuser les travaux "
-"d'impression vers les destinations indiquées. L'option B<-r> permet "
-"d'indiquer la raison du rejet des travaux d'impression. Si cette raison "
-"n'est pas fournie, la raison par défaut est « Reason Unknown » (« Raison "
-"inconnue »)."
+"Chaque fois qu’une impression est réalisée, B<CUPS> crée un travail qui "
+"contient la file d’attente à laquelle l’impression est envoyée, le nom du "
+"document à imprimer, et les descriptions de page. Les travaux sont numérotés "
+"(queue-1, queue-2, etc.) pour pouvoir contrôler l’impression du travail ou "
+"son annulation en cas d’erreur. Lorsque B<CUPS> accepte un travail "
+"d’impression, il détermine les meilleurs programmes (filtres, pilotes "
+"d’imprimante, écoute de ports et programmes de transmission) pour convertir "
+"les pages dans un format imprimable et les exécuter pour réellement réaliser "
+"l’impression."
 
-# type: Plain text
 #. type: Plain text
-#: cupsaccept.man:58
+#: cups.1:36
 msgid ""
-"The following options are supported by both B<cupsaccept> and B<cupsreject>:"
+"When the print job is completely printed, B<CUPS> removes the job from the "
+"queue and moves on to any other jobs you have submitted. You can also be "
+"notified when the job is finished, or if there are any errors during "
+"printing, in several different ways."
 msgstr ""
-"Les options suivantes sont reconnues par B<cupsaccept> et B<cupsreject> :"
-
-# type: Plain text
-#. type: Plain text
-#: cupsaccept.man:64
-msgid "Sets the username that is sent when connecting to the server."
-msgstr "Indiquer l'identifiant utilisé pour se connecter au serveur."
+"Lorsque le travail d’impression est complètement terminé, B<CUPS> retire le "
+"travail de la file d’attente et commence tout autre travail demandé. Une "
+"notification peut être aussi faite lorsque le travail est terminé, ou si une "
+"erreur s’est produite, de différentes manières."
 
-# type: TP
-#. type: TP
-#: cupsaccept.man:64
+#. type: SS
+#: cups.1:36
 #, no-wrap
-msgid "B<-h >I<hostname[:port]>"
-msgstr "B<-h> I<nom_hôte>[B<:>I<port>]"
+msgid "WHERE DO I BEGIN?"
+msgstr "OÙ COMMENCER ?"
 
-# type: Plain text
 #. type: Plain text
-#: cupsaccept.man:67 lp.man:118
-msgid "Chooses an alternate server."
-msgstr "Utiliser un autre serveur."
-
-# type: TP
-#. type: TP
-#: cupsaccept.man:67
-#, no-wrap
-msgid "B<-r >\"I<reason>\""
-msgstr "B<-r> \"I<raison>\""
+#: cups.1:38
+msgid ""
+"The easiest way to start is by using the web interface to configure your "
+"printer. Go to \"http://localhost:631\" and choose the Administration tab at "
+"the top of the page. Click/press on the Add Printer button and follow the "
+"prompts."
+msgstr ""
+"Le moyen le plus facile est de commencer avec l’interface web pour "
+"configurer l’imprimante. Allez à l’adresse « http://localhost:631 », "
+"choisissez l’onglet Administration au haut de la page, cliquez sur le bouton "
+"« Add Printer » (ajouter une imprimante) et suivez les indications."
 
-# type: Plain text
 #. type: Plain text
-#: cupsaccept.man:70
+#: cups.1:40
 msgid ""
-"Sets the reason string that is shown for a printer that is rejecting jobs."
+"When you are asked for a username and password, enter your login username "
+"and password or the \"root\" username and password."
 msgstr ""
-"Configurer la raison qui est affichée pour une imprimante refusant un "
-"travail."
+"Lorsqu’un identifiant et un mot de passe sont demandés, entrez votre "
+"identifiant de connexion et votre mot de passe, ou l’identifiant et mot de "
+"passe du superutilisateur."
 
-# type: Plain text
 #. type: Plain text
-#: cupsaccept.man:78
+#: cups.1:42
 msgid ""
-"The B<cupsaccept> and B<cupsreject> commands correspond to the System V "
-"printing system commands \"accept\" and \"reject\", respectively.  Unlike "
-"the System V printing system, CUPS allows printer names to contain any "
-"printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer and "
-"class names are I<not> case-sensitive."
+"After the printer is added you will be asked to set the default printer "
+"options (paper size, output mode, etc.) for the printer. Make any changes as "
+"needed and then click/press on the Set Default Options button to save them. "
+"Some printers also support auto-configuration - click/press on the Query "
+"Printer for Default Options button to update the options automatically."
 msgstr ""
-"Les commandes B<cupsaccept> et B<cupsreject> correspondent aux commandes du "
-"système d’impression de System V « accept » et « reject », respectivement. "
-"Au contraire du système d’impression de System V, CUPS autorise les noms "
-"d’imprimante contenant n’importe quel caractère imprimable, sauf ESPACE, "
-"TAB, « / » ou « # ». De même, les noms d'imprimante et de classe ne sont "
-"B<pas> sensibles à la casse."
+"Après l’ajout de l’imprimante, les options par défaut de l’imprimante sont "
+"demandées (taille de papier, mode de sortie, etc.). Faites tous les "
+"changements nécessaires et cliquez sur le bouton « Set Default Options » "
+"pour les enregistrer. Quelques imprimantes peuvent aussi s’auto-configurer "
+"— cliquez sur les boutons « Query Printer » (recherche imprimante) puis "
+"« Default Options » (options par défaut) pour mettre à jour les options "
+"automatiquement."
 
-# type: Plain text
 #. type: Plain text
-#: cupsaccept.man:80
+#: cups.1:44
 msgid ""
-"Finally, the CUPS versions may ask the user for an access password depending "
-"on the printing system configuration."
+"Once you have added the printer, you can print to it from any application. "
+"You can also choose Print Test Page from the maintenance menu to print a "
+"simple test page and verify that everything is working properly."
 msgstr ""
-"Enfin, les versions de CUPS peuvent demander à l’utilisateur un mot de passe "
-"suivant la configuration du système d’impression."
+"Une fois l’imprimante ajoutée, elle peut être utilisée à partir de n’importe "
+"quelle application. Le bouton « Print Test Page » du menu de maintenance "
+"permet d’imprimer une page simple de test et de vérifier le bon "
+"fonctionnement général."
 
-# type: Plain text
 #. type: Plain text
-#: cupsaccept.man:86
-msgid "B<cancel>(1), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), B<lpstat>(1),"
-msgstr "B<cancel>(1), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), B<lpstat>(1),"
-
-# type: TH
-#. type: TH
-#: cupsaddsmb.man.in:13
-#, no-wrap
-msgid "cupsaddsmb"
-msgstr "cupsaddsmb"
+#: cups.1:52
+msgid ""
+"You can also use the B<lpadmin>(8)  and B<lpinfo>(8)  commands to add "
+"printers to B<CUPS>.  Additionally, your operating system may include "
+"graphical user interfaces or automatically create printer queues when you "
+"connect a printer to your computer."
+msgstr ""
+"Les commandes B<lpadmin>(8) et B<lpinfo>(8) permettent d’ajouter des "
+"imprimantes à B<CUPS>. De plus, le système d’exploitation peut comporter une "
+"interface graphique ou automatiquement créer une file d’attente d’impression "
+"lors de la connexion de l’imprimante."
 
-# type: TH
-#. type: TH
-#: cupsaddsmb.man.in:13 cupsenable.man:13 cupsfilter.man:12 cupstestdsc.man:13
-#: cupstestppd.man:13 lpc.man:13
+#. type: SS
+#: cups.1:52
 #, no-wrap
-msgid "11 June 2014"
-msgstr "11 juin 2014"
-
-# type: Plain text
-#. type: Plain text
-#: cupsaddsmb.man.in:16
-msgid "cupsaddsmb - export printers to samba for windows clients"
-msgstr ""
-"cupsaddsmb - Exporter des imprimantes vers Samba pour les clients Windows"
+msgid "HOW DO I GET HELP?"
+msgstr "COMMENT OBTENIR DE L’AIDE ?"
 
-# type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:32
+#: cups.1:60
 msgid ""
-"B<cupsaddsmb> [ B<-H> I<samba-server> ] [ B<-U> I<samba-user[%samba-"
-"password]> ] [ B<-h> I<cups-server[:port]> ] [ B<-v> ] B<-a>"
+"The B<CUPS> web site (http://www.CUPS.org) provides access to the I<cups> "
+"and I<cups-devel> mailing lists, additional documentation and resources, and "
+"a bug report database. Most vendors also provide online discussion forums to "
+"ask printing questions for your operating system of choice."
 msgstr ""
-"B<cupsaddsmb> [ B<-H> I<serveur_samba> ] [ B<-U> I<identifiant_samba>[I<%mot-"
-"de-passe_samba>] ] [ B<-h> I<serveur_cups>[B<:>I<port>] ] [ B<-v> ] B<-a>"
+"Le site web de B<CUPS> (E<lt>URL:I<http://www.CUPS.org>E<gt>) permet "
+"d’accéder aux listes de diffusion I<cups> et I<cups-devel>, à des "
+"informations et ressources complémentaires, et à la base de données des "
+"rapports de bogue. La plupart des fournisseurs maintiennent des forums de "
+"discussion en ligne, permettant de poser des questions pour votre système "
+"d’exploitation."
 
-# type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:50
+#: cups.1:63
 msgid ""
-"B<cupsaddsmb> [ B<-H> I<samba-server> ] [ B<-U> I<samba-user[%samba-"
-"password]> ] [ B<-h> I<cups-server[:port]> ] [ B<-v> ] I<printer> [ ...  "
-"I<printer> ]"
+"B<CUPS> commands use the following environment variables to override the "
+"default locations of files and so forth. For security reasons, these "
+"environment variables are ignored for setuid programs:"
 msgstr ""
-"B<cupsaddsmb> [ B<-H> I<serveur_samba> ] [ B<-U> I<identifiant_samba>[I<%mot-"
-"de-passe_samba>] ] [ B<-h> I<serveur_cups>[B<:>I<port>] ] [ B<-v> ] "
-"I<imprimante> [ ... I<imprimante> ]"
+"Les commandes de B<CUPS> utilisent les variables d’environnement suivantes "
+"pour outrepasser les emplacements de fichier, etc. Pour des raisons de "
+"sécurité, ces variables sont ignorées par les programmes setuid :"
+
+# type: TP
+#. type: TP
+#: cups.1:63
+#, no-wrap
+msgid "B<CUPS_ANYROOT>"
+msgstr "B<CUPS_ANYROOT>"
 
-# type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:54
-msgid ""
-"The B<cupsaddsmb> program exports printers to the SAMBA software (version "
-"2.2.0 or higher) for use with Windows clients.  Depending on the SAMBA "
-"configuration, you may need to provide a password to export the printers.  "
-"This program requires the Windows printer driver files described below."
-msgstr ""
-"B<cupsaddsmb> permet l'export d'imprimantes vers SAMBA (version 2.2.0 ou "
-"supérieure) pour utilisation par des clients Windows. Suivant la "
-"configuration de SAMBA, il est possible qu'un mot de passe soit demandé pour "
-"l'export. Ce programme requiert les fichiers du pilote Windows, comme "
-"indiqué plus bas."
+#: cups.1:66
+msgid "Whether to allow any X.509 certificate root (Y or N)."
+msgstr "Autoriser tout certificat racine X.509 (Oui ou Non)."
 
-# type: SH
-#. type: SS
-#: cupsaddsmb.man.in:54
+# type: TP
+#. type: TP
+#: cups.1:66 filter.7:156
 #, no-wrap
-msgid "SAMBA CONFIGURATION"
-msgstr "CONFIGURATION DE SAMBA"
+msgid "B<CUPS_CACHEDIR>"
+msgstr "B<CUPS_CACHEDIR>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:60
-msgid ""
-"B<cupsaddsmb> uses the RPC-based printing support in SAMBA to provide "
-"printer drivers and PPD files to Windows client machines.  In order to use "
-"this functionality, you must first configure the SAMBA B<smb.conf>(5)  file "
-"to support printing through CUPS and provide a printer driver download "
-"share, as follows:"
-msgstr ""
-"B<cupsaddsmb> utilise le mode d'impression basé sur RPC dans SAMBA, pour "
-"fournir aux clients Windows les pilotes d'impression et les fichiers PPD. "
-"Pour utiliser cette fonctionnalité, vous devez configurer le fichier I<smb."
-"conf> de SAMBA pour qu'il utilise l'impression à travers CUPS, et fournisse "
-"un pilote à télécharger. Cela est fait de la manière suivante :"
+#: cups.1:69
+msgid "The directory where semi-persistent cache files can be found."
+msgstr "Le répertoire où se trouvent les fichiers cache semi-persistant."
+
+# type: TP
+#. type: TP
+#: cups.1:69 filter.7:159
+#, no-wrap
+msgid "B<CUPS_DATADIR>"
+msgstr "B<CUPS_DATADIR>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:66
+#: cups.1:72 filter.7:162
+msgid "The directory where data files can be found."
+msgstr "Le répertoire où se trouvent les fichiers de données."
+
+#. type: TP
+#: cups.1:72
 #, no-wrap
-msgid ""
-"    [global]\n"
-"\tload printers = yes\n"
-"\tprinting = cups\n"
-"\tprintcap name = cups\n"
+msgid "B<CUPS_ENCRYPTION>"
+msgstr "B<CUPS_ENCRYPTION>"
+
+#. type: Plain text
+#: cups.1:75
+msgid "The default level of encryption (Always, IfRequested, Never, Required)."
 msgstr ""
-"    [global]\n"
-"\tload printers = yes\n"
-"\tprinting = cups\n"
-"\tprintcap name = cups\n"
+"Le niveau de chiffrement par défaut (Always, IfRequested, Never, Required)."
+
+# type: TP
+#. type: TP
+#: cups.1:75
+#, no-wrap
+msgid "B<CUPS_EXPIREDCERTS>"
+msgstr "B<CUPS_EXPIREDCERTS>"
 
-# type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:75
+#: cups.1:78
+msgid "Whether to allow expired X.509 certificates (Y or N)."
+msgstr "Autoriser les certificats X.509 périmés (Oui ou Non)."
+
+# type: TP
+#. type: TP
+#: cups.1:78
 #, no-wrap
-msgid ""
-"    [printers]\n"
-"\tcomment = All Printers\n"
-"\tpath = /var/spool/samba\n"
-"\tbrowseable = no\n"
-"\tpublic = yes\n"
-"\tguest ok = yes\n"
-"\twritable = no\n"
-"\tprintable = yes\n"
-msgstr ""
-"    [printers]\n"
-"\tcomment = All Printers\n"
-"\tpath = /var/spool/samba\n"
-"\tbrowseable = no\n"
-"\tpublic = yes\n"
-"\tguest ok = yes\n"
-"\twritable = no\n"
-"\tprintable = yes\n"
+msgid "B<CUPS_GSSSERVICENAME>"
+msgstr "B<CUPS_GSSSERVICENAME>"
 
-# type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:83
+#: cups.1:81
+msgid "The Kerberos service name used for authentication."
+msgstr "Le nom de service Kerberos utilisé pour authentification."
+
+# type: TP
+#. type: TP
+#: cups.1:81
 #, no-wrap
-msgid ""
-"    [print$]\n"
-"\tcomment = Printer Drivers\n"
-"\tpath = /etc/samba/drivers\n"
-"\tbrowseable = yes\n"
-"\tguest ok = no\n"
-"\tread only = yes\n"
-"\twrite list = root\n"
-msgstr ""
-"    [print$]\n"
-"\tcomment = Printer Drivers\n"
-"\tpath = /etc/samba/drivers\n"
-"\tbrowseable = yes\n"
-"\tguest ok = no\n"
-"\tread only = yes\n"
-"\twrite list = root\n"
+msgid "B<CUPS_SERVER>"
+msgstr "B<CUPS_SERVER>"
 
-# type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:86
+#: cups.1:84
 msgid ""
-"This configuration assumes a FHS-compliant installation of SAMBA; adjust the "
-"[printers] and [print$] share paths accordingly on your system as needed."
+"The hostname/IP address and port number of the CUPS scheduler (hostname:port "
+"or ipaddress:port)."
 msgstr ""
-"Cette configuration suppose une installation de SAMBA conforme au standard "
-"FHS. Modifiez les chemins des partages [I<printers>] et [I<print$>] suivant "
-"votre installation."
+"Le nom d’hôte ou adresse IP et le numéro de port de l’ordonnanceur CUPS "
+"(nom_hôte:port ou adresse_ip:port)."
 
-# type: SH
-#. type: SS
-#: cupsaddsmb.man.in:86
+# type: TP
+#. type: TP
+#: cups.1:84
 #, no-wrap
-msgid "MICROSOFT POSTSCRIPT DRIVERS FOR WINDOWS"
-msgstr "PILOTES POSTSCRIPT MICROSOFT POUR WINDOWS"
+msgid "B<CUPS_SERVERBIN>"
+msgstr "B<CUPS_SERVERBIN>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:88
+#: cups.1:87
 msgid ""
-"The base driver for Windows 2000 and higher is the Microsoft PostScript "
-"driver, which is available on any system running Windows 2000 or higher in "
-"the %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eW32X86\\e3 folder for 32-bit "
-"drivers and %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eX64\\e3 folder for 64-"
-"bit drivers."
+"The directory where server helper programs, filters, backend, etc. can be "
+"found."
 msgstr ""
-"Le pilote de base de Windows 2000 et des versions ultérieures est le pilote "
-"PostScript Microsoft qui est disponible sur tous les systèmes avec "
-"Windows 2000 ou une version ultérieure dans le répertoire I<%WINDIR%"
-"\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eW32X86\\e3> pour les pilotes 32 bits et dans "
-"le répertoire I<%WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eX64\\e3> pour les "
-"pilotes 64 bits."
+"Le répertoire où trouver les programmes d’assistance du serveur, les "
+"filtres, les programmes de transmission, etc."
+
+# type: TP
+#. type: TP
+#: cups.1:87 filter.7:169
+#, no-wrap
+msgid "B<CUPS_SERVERROOT>"
+msgstr "B<CUPS_SERVERROOT>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:90
-msgid ""
-"Copy the 32-bit drivers to the I</usr/share/cups/drivers> directory and the "
-"64-bit drivers to the I</usr/share/cups/drivers/x64> directory exactly as "
-"named below:"
-msgstr ""
-"Copier exactement les pilotes 32 bits dans le répertoire I</usr/share/cups/"
-"drivers> et les pilotes 64 bits dans le répertoire I</usr/share/cups/drivers/"
-"x64>, comme mentionnés ci-dessous :"
+#: cups.1:90 filter.7:172
+msgid "The root directory of the server."
+msgstr "Le répertoire racine du serveur."
+
+# type: TP
+#. type: TP
+#: cups.1:90
+#, no-wrap
+msgid "B<CUPS_STATEDIR>"
+msgstr "B<CUPS_STATEDIR>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:96
+#: cups.1:93
+msgid "The directory where state files can be found."
+msgstr "Le répertoire où trouver les fichiers d’état."
+
+# type: TP
+#. type: TP
+#: cups.1:93
 #, no-wrap
-msgid ""
-"    ps5ui.dll\n"
-"    pscript.hlp\n"
-"    pscript.ntf\n"
-"    pscript5.dll\n"
-msgstr ""
-"    ps5ui.dll\n"
-"    pscript.hlp\n"
-"    pscript.ntf\n"
-"    pscript5.dll\n"
+msgid "B<CUPS_USER>"
+msgstr "B<CUPS_USER>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:99
-msgid ""
-"B<Note:> Unlike Windows, case is significant - make sure that you use the "
-"lowercase filenames shown above, otherwise B<cupsaddsmb> will fail to export "
-"the drivers."
-msgstr ""
-"B<Remarque :> contrairement à Windows, la casse est importante. Assurez-vous "
-"d'utiliser des noms de fichier en minuscule, comme ci-dessus. Sinon, "
-"B<cupsaddsmb> échouera lors de l'export des pilotes."
+#: cups.1:96
+msgid "Specifies the name of the user for print requests."
+msgstr "Indiquer le nom d'utilisateur pour les requêtes d’impression."
+
+#. type: TP
+#: cups.1:96
+#, no-wrap
+msgid "B<HOME>"
+msgstr "B<HOME>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:101
-msgid "B<cupsaddsmb> supports the following options:"
-msgstr "B<cupsaddsmb> accepte les options suivantes :"
+#: cups.1:99
+msgid "Specifies the home directory of the current user."
+msgstr "Définir le répertoire personnel (home) de l’utilisateur actuel."
 
-# type: TP
 #. type: TP
-#: cupsaddsmb.man.in:101
+#: cups.1:99
 #, no-wrap
-msgid "B<-H >I<samba-server>"
-msgstr "B<-H> I<serveur_samba>"
+msgid "B<IPP_PORT>"
+msgstr "B<IPP_PORT>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:104
-msgid "Specifies the SAMBA server which defaults to the CUPS server."
-msgstr "Préciser le serveur SAMBA par défaut pour le serveur CUPS."
+#: cups.1:102
+msgid "Specifies the default port number for IPP requests."
+msgstr "Indiquer le numéro de port par défaut pour les requêtes IPP."
 
 # type: TP
 #. type: TP
-#: cupsaddsmb.man.in:104
+#: cups.1:102
 #, no-wrap
-msgid "B<-U >I<samba-user>[B<%>I<samba-password>]"
-msgstr "B<-U> I<utilisateur_samba>[B<%>I<mot-de-passe_samba>]"
+msgid "B<LOCALEDIR>"
+msgstr "B<LOCALEDIR>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:108
-msgid ""
-"Specifies the SAMBA print admin username which defaults to your current "
-"username.  If the username contains a percent (%) character, then the text "
-"following the percent is treated as the SAMBA password to use."
-msgstr ""
-"Indiquer l'identifiant de l'administrateur d'impression SAMBA, qui est par "
-"défaut l'utilisateur courant. Si l'identifiant contient un caractère « % », "
-"ce qui suit le pour cent est considéré comme le mot de passe SAMBA à "
-"utiliser."
+#: cups.1:105
+msgid "Specifies the location of localization files."
+msgstr "Définir l’emplacement des fichiers d’internationalisation."
+
+#. type: TP
+#: cups.1:105
+#, no-wrap
+msgid "B<LPDEST>"
+msgstr "B<LPDEST>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:112
-msgid ""
-"Exports all known printers.  Otherwise only the named printers are exported."
-msgstr ""
-"Exporter toutes les imprimantes connues. Sinon, seules les imprimantes "
-"fournies sur la ligne de commande sont exportées."
+#: cups.1:108
+msgid "Specifies the default print queue (System V standard)."
+msgstr "Indiquer la file d’attente par défaut (standard System V)."
 
 # type: TP
 #. type: TP
-#: cupsaddsmb.man.in:112
+#: cups.1:108 filter.7:184
 #, no-wrap
-msgid "B<-h >I<cups-server>[B<:>I<port>]"
-msgstr "B<-h> I<serveur_cups>[B<:>I<port>]"
+msgid "B<PRINTER>"
+msgstr "B<PRINTER>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:115
-msgid "Specifies a different CUPS server to use."
-msgstr "Définir un autre serveur CUPS à utiliser."
+#: cups.1:111
+msgid "Specifies the default print queue (Berkeley standard)."
+msgstr "Indiquer la file d’attente par défaut (standard Berkeley)."
 
 #. type: TP
-#: cupsaddsmb.man.in:115 cupstestppd.man:105 ipptool.man:182 ppdc.man:79
+#: cups.1:111
 #, no-wrap
-msgid "B<-v>"
-msgstr "B<-v>"
+msgid "B<TMPDIR>"
+msgstr "B<TMPDIR>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:119
+#: cups.1:114
+msgid "Specifies the location of temporary files."
+msgstr "Définir l’emplacement des fichiers temporaires."
+
+#. type: Plain text
+#: cups.1:118
+#, no-wrap
+msgid ""
+"I<~/.cups/client.conf>\n"
+"I<~/.cups/lpoptions>\n"
+msgstr ""
+"I<~/.cups/client.conf>\n"
+"I<~/.cups/lpoptions>\n"
+
+#. type: Plain text
+#: cups.1:122
+msgid ""
+"B<CUPS> conforms to the Internet Printing Protocol version 2.1 and "
+"implements the Berkeley and System V UNIX print commands."
+msgstr ""
+"B<CUPS> se conforme au protocole « Internet Printing Protocol » version 2.1 "
+"et met en œuvre les commandes d’impression des systèmes UNIX Berkeley et "
+"System V. "
+
+#. type: Plain text
+#: cups.1:126 cupsd-helper.8:81
 msgid ""
-"Specifies that verbose information should be shown.  This is useful for "
-"debugging SAMBA configuration problems."
+"CUPS printer drivers, backends, and PPD files are deprecated and will no "
+"longer be supported in a future feature release of CUPS.  Printers that do "
+"not support IPP can be supported using applications such as "
+"B<ippeveprinter>(1)."
 msgstr ""
-"Indiquer que des informations détaillées doivent être affichées. Cela peut "
-"être utile pour le débogage des configurations de SAMBA."
 
 # type: Plain text
 #. type: Plain text
-#: cupsaddsmb.man.in:125
+#: cups.1:142
 msgid ""
-"B<rpcclient>(1), B<smbclient>(1), B<smbd>(8), B<smb.conf>(5), CUPS Online "
-"Help (http://localhost:631/help)"
+"B<cancel>(1), B<client.conf>(7), B<cupsctl>(8), B<cupsd>(8), B<lp>(1), "
+"B<lpadmin>(8), B<lpinfo>(8), B<lpoptions>(1), B<lpr>(1), B<lprm>(1), "
+"B<lpq>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help), CUPS "
+"Web Site (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup "
+"(http://www.pwg.org/ipp)"
 msgstr ""
-"B<rpcclient>(1), B<smbclient>(1), B<smbd>(8), B<smb.conf>(5), aide en ligne "
-"de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
+"B<cancel>(1), B<client.conf>(7), B<cupsctl>(8), B<cupsd>(8), B<lp>(1), "
+"B<lpadmin>(8), B<lpinfo>(8), B<lpoptions>(1), B<lpr>(1), B<lprm>(1), "
+"B<lpq>(1), B<lpstat>(1), aide en ligne de CUPS E<lt>URL:I<http://"
+"localhost:631/help>E<gt>, site web de CUPS E<lt>URL:I<http://www.CUPS."
+"org>E<gt>, PWG Internet Printing Protocol Workgroup E<lt>URL:I<h://www.pwg."
+"org/ipp>E<gt>"
 
 # type: TH
 #. type: TH
-#: cups-config.man:13
+#: cupsaccept.8:10
 #, no-wrap
-msgid "cups-config"
-msgstr "cups-config"
+msgid "cupsaccept"
+msgstr "cupsaccept"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:16
-msgid "cups-config - get cups api, compiler, directory, and link information."
+#: cupsaccept.8:13
+msgid "cupsaccept/cupsreject - accept/reject jobs sent to a destination"
 msgstr ""
-"cups-config - Obtenir les informations sur l'API, la compilation, les "
-"répertoires et les liens pour CUPS."
+"cupsaccept, cupsreject - Accepter ou refuser les travaux d'impression "
+"envoyés vers une destination"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:19
-msgid "B<cups-config> I<--api-version>"
-msgstr "B<cups-config --api-version>"
+#: cupsaccept.8:25
+msgid ""
+"B<cupsaccept> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] "
+"I<destination(s)>"
+msgstr ""
+"B<cupsaccept> [ B<-E> ] [ B<-U> I<identifiant> ] [ B<-h> I<nom_hôte>[B<:"
+">I<port>] ] I<destination(s)>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:22
-msgid "B<cups-config> I<--build>"
-msgstr "B<cups-config --build>"
+#: cupsaccept.8:40
+msgid ""
+"B<cupsreject> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<hostname[:port]> ] "
+"[ B<-r> I<reason> ] I<destination(s)>"
+msgstr ""
+"B<cupsreject> [ B<-E> ] [ B<-U> I<identifiant> ] [ B<-h> I<nom_hôte>[B<:"
+">I<port>] ] [ B<-r> I<raison> ] I<destination(s)>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:25
-msgid "B<cups-config> I<--cflags>"
-msgstr "B<cups-config --cflags>"
+#: cupsaccept.8:44
+msgid ""
+"The B<cupsaccept> command instructs the printing system to accept print jobs "
+"to the specified destinations."
+msgstr ""
+"B<cupsaccept> envoie l'ordre au système d'impression d'accepter les travaux "
+"d'impression vers les destinations indiquées."
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:28
-msgid "B<cups-config> I<--datadir>"
-msgstr "B<cups-config --datadir>"
-
-# type: Plain text
+#: cupsaccept.8:50
+msgid ""
+"The B<cupsreject> command instructs the printing system to reject print jobs "
+"to the specified destinations.  The I<-r> option sets the reason for "
+"rejecting print jobs. If not specified, the reason defaults to \"Reason "
+"Unknown\"."
+msgstr ""
+"B<cupsreject> envoie l'ordre au système d'impression de refuser les travaux "
+"d'impression vers les destinations indiquées. L'option B<-r> permet "
+"d'indiquer la raison du rejet des travaux d'impression. Si cette raison "
+"n'est pas fournie, la raison par défaut est « Reason Unknown » (« Raison "
+"inconnue »)."
+
+# type: Plain text
+#. type: Plain text
+#: cupsaccept.8:55
+msgid ""
+"The following options are supported by both B<cupsaccept> and B<cupsreject>:"
+msgstr ""
+"Les options suivantes sont reconnues par B<cupsaccept> et B<cupsreject> :"
+
+# type: Plain text
+#. type: Plain text
+#: cupsaccept.8:61
+msgid "Sets the username that is sent when connecting to the server."
+msgstr "Indiquer l'identifiant utilisé pour se connecter au serveur."
+
+# type: TP
+#. type: TP
+#: cupsaccept.8:61
+#, no-wrap
+msgid "B<-h >I<hostname[:port]>"
+msgstr "B<-h> I<nom_hôte>[B<:>I<port>]"
+
+# type: Plain text
+#. type: Plain text
+#: cupsaccept.8:64 lp.1:115
+msgid "Chooses an alternate server."
+msgstr "Utiliser un autre serveur."
+
+# type: TP
+#. type: TP
+#: cupsaccept.8:64
+#, no-wrap
+msgid "B<-r >\"I<reason>\""
+msgstr "B<-r> \"I<raison>\""
+
+# type: Plain text
+#. type: Plain text
+#: cupsaccept.8:67
+msgid ""
+"Sets the reason string that is shown for a printer that is rejecting jobs."
+msgstr ""
+"Configurer la raison qui est affichée pour une imprimante refusant un "
+"travail."
+
+# type: Plain text
+#. type: Plain text
+#: cupsaccept.8:75
+msgid ""
+"The B<cupsaccept> and B<cupsreject> commands correspond to the System V "
+"printing system commands \"accept\" and \"reject\", respectively.  Unlike "
+"the System V printing system, CUPS allows printer names to contain any "
+"printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer and "
+"class names are I<not> case-sensitive."
+msgstr ""
+"Les commandes B<cupsaccept> et B<cupsreject> correspondent aux commandes du "
+"système d’impression de System V « accept » et « reject », respectivement. "
+"Au contraire du système d’impression de System V, CUPS autorise les noms "
+"d’imprimante contenant n’importe quel caractère imprimable, sauf ESPACE, "
+"TAB, « / » ou « # ». De même, les noms d'imprimante et de classe ne sont "
+"B<pas> sensibles à la casse."
+
+# type: Plain text
+#. type: Plain text
+#: cupsaccept.8:77
+msgid ""
+"Finally, the CUPS versions may ask the user for an access password depending "
+"on the printing system configuration."
+msgstr ""
+"Enfin, les versions de CUPS peuvent demander à l’utilisateur un mot de passe "
+"suivant la configuration du système d’impression."
+
+# type: Plain text
+#. type: Plain text
+#: cupsaccept.8:83
+msgid "B<cancel>(1), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), B<lpstat>(1),"
+msgstr "B<cancel>(1), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), B<lpstat>(1),"
+
+# type: TH
+#. type: TH
+#: cups-config.1:10
+#, no-wrap
+msgid "cups-config"
+msgstr "cups-config"
+
+# type: Plain text
+#. type: Plain text
+#: cups-config.1:13
+msgid "cups-config - get cups api, compiler, directory, and link information."
+msgstr ""
+"cups-config - Obtenir les informations sur l'API, la compilation, les "
+"répertoires et les liens pour CUPS."
+
+# type: Plain text
+#. type: Plain text
+#: cups-config.1:16
+msgid "B<cups-config> I<--api-version>"
+msgstr "B<cups-config --api-version>"
+
+# type: Plain text
+#. type: Plain text
+#: cups-config.1:19
+msgid "B<cups-config> I<--build>"
+msgstr "B<cups-config --build>"
+
+# type: Plain text
+#. type: Plain text
+#: cups-config.1:22
+msgid "B<cups-config> I<--cflags>"
+msgstr "B<cups-config --cflags>"
+
+# type: Plain text
+#. type: Plain text
+#: cups-config.1:25
+msgid "B<cups-config> I<--datadir>"
+msgstr "B<cups-config --datadir>"
+
+# type: Plain text
 #. type: Plain text
-#: cups-config.man:31
+#: cups-config.1:28
 msgid "B<cups-config> I<--help>"
 msgstr "B<cups-config --help>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:34
+#: cups-config.1:31
 msgid "B<cups-config> I<--ldflags>"
 msgstr "B<cups-config --ldflags>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:42
+#: cups-config.1:39
 msgid "B<cups-config> [ I<--image> ] [ I<--static> ] I<--libs>"
 msgstr "B<cups-config> [ B<--image> ] [ B<--static> ] B<--libs>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:45
+#: cups-config.1:42
 msgid "B<cups-config> I<--serverbin>"
 msgstr "B<cups-config --serverbin>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:48
+#: cups-config.1:45
 msgid "B<cups-config> I<--serverroot>"
 msgstr "B<cups-config --serverroot>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:51
+#: cups-config.1:48
 msgid "B<cups-config> I<--version>"
 msgstr "B<cups-config --version>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:55
+#: cups-config.1:52
 msgid ""
 "The B<cups-config> command allows application developers to determine the "
 "necessary command-line options for the compiler and linker, as well as the "
@@ -1986,127 +2212,109 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:57
+#: cups-config.1:54
 msgid "The B<cups-config> command accepts the following command-line options:"
 msgstr "B<cups-config> accepte les options de ligne de commande suivantes :"
 
 # type: TP
 #. type: TP
-#: cups-config.man:57
+#: cups-config.1:54
 #, no-wrap
 msgid "B<--api-version>"
 msgstr "B<--api-version>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:60
+#: cups-config.1:57
 msgid "Reports the current API version (major.minor)."
 msgstr "Afficher la version d'API actuelle (majeur.mineur)."
 
 #. type: TP
-#: cups-config.man:60
+#: cups-config.1:57
 #, no-wrap
 msgid "B<--build>"
 msgstr "B<--build>"
 
 #. type: Plain text
-#: cups-config.man:63
+#: cups-config.1:60
 msgid "Reports a system-specific build number."
 msgstr "Afficher un numéro de compilation spécifique au système."
 
 # type: TP
 #. type: TP
-#: cups-config.man:63
+#: cups-config.1:60
 #, no-wrap
 msgid "B<--cflags>"
 msgstr "B<--cflags>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:66
+#: cups-config.1:63
 msgid "Reports the necessary compiler options."
 msgstr "Afficher les options de compilations nécessaires."
 
 # type: TP
 #. type: TP
-#: cups-config.man:66
+#: cups-config.1:63
 #, no-wrap
 msgid "B<--datadir>"
 msgstr "B<--datadir>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:69
+#: cups-config.1:66
 msgid "Reports the default CUPS data directory."
 msgstr "Afficher le répertoire de données par défaut de CUPS."
 
 # type: TP
 #. type: TP
-#: cups-config.man:69 ippfind.man:196 ipptool.man:91
+#: cups-config.1:66 ippeveprinter.1:85 ippfind.1:193 ipptool.1:91
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:72
+#: cups-config.1:69
 msgid "Reports the program usage message."
 msgstr "Afficher un message d'aide d’utilisation du programme."
 
 # type: TP
 #. type: TP
-#: cups-config.man:72
-#, no-wrap
-msgid "B<--image>"
-msgstr "B<--image>"
-
-# type: Plain text
-#. type: Plain text
-#: cups-config.man:76
-#, fuzzy
-msgid ""
-"When used with I<--libs>, adds the CUPS imaging library to the list of "
-"libraries."
-msgstr ""
-"Lorsqu'elle est utilisée avec B<--libs>, cette option ajoute la bibliothèque "
-"de gestion des images CUPS aux bibliothèques."
-
-# type: TP
-#. type: TP
-#: cups-config.man:76
+#: cups-config.1:69
 #, no-wrap
 msgid "B<--ldflags>"
 msgstr "B<--ldflags>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:79
+#: cups-config.1:72
 msgid "Reports the necessary linker options."
 msgstr "Afficher les options nécessaires pour l'édition des liens."
 
 # type: TP
 #. type: TP
-#: cups-config.man:79
+#: cups-config.1:72
 #, no-wrap
 msgid "B<--libs>"
 msgstr "B<--libs>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:82
+#: cups-config.1:75
 msgid "Reports the necessary libraries to link to."
 msgstr "Afficher les bibliothèques nécessaires pour l'édition des liens."
 
 # type: TP
 #. type: TP
-#: cups-config.man:82
+#: cups-config.1:75
 #, no-wrap
 msgid "B<--serverbin>"
 msgstr "B<--serverbin>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:85
+#: cups-config.1:78
 msgid ""
 "Reports the default CUPS binary directory, where filters and backends are "
 "stored."
@@ -2116,27 +2324,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-config.man:85
+#: cups-config.1:78
 #, no-wrap
 msgid "B<--serverroot>"
 msgstr "B<--serverroot>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:88
+#: cups-config.1:81
 msgid "Reports the default CUPS configuration file directory."
 msgstr "Afficher le répertoire du fichier de configuration par défaut de CUPS."
 
 # type: TP
 #. type: TP
-#: cups-config.man:88
+#: cups-config.1:81
 #, no-wrap
 msgid "B<--static>"
 msgstr "B<--static>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:91
+#: cups-config.1:84
 msgid ""
 "When used with I<--libs>, reports the static libraries instead of the "
 "default (shared) libraries."
@@ -2146,14 +2354,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-config.man:91 ippfind.man:199 ipptool.man:101
+#: cups-config.1:84 ippeveprinter.1:91 ippfind.1:196 ipptool.1:106
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:94
+#: cups-config.1:87
 msgid ""
 "Reports the full version number of the CUPS installation (major.minor.patch)."
 msgstr ""
@@ -2161,24 +2369,24 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:96
+#: cups-config.1:89
 msgid "Show the currently installed version of CUPS:"
 msgstr "Afficher la version actuellement installée de CUPS :"
 
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:99
+#: cups-config.1:92
 #, no-wrap
 msgid "    cups-config --version\n"
 msgstr "    cups-config --version\n"
 
 #. type: Plain text
-#: cups-config.man:102
+#: cups-config.1:95
 msgid "Compile a simple one-file CUPS filter:"
 msgstr "Compiler un filtre CUPS constitué d’un seul fichier :"
 
 #. type: Plain text
-#: cups-config.man:106
+#: cups-config.1:99
 #, no-wrap
 msgid ""
 "    cc `cups-config --cflags --ldflags` -o filter filter.c \\e\n"
@@ -2187,36 +2395,59 @@ msgstr ""
 "    cc `cups-config --cflags --ldflags` -o filter filter.c \\e\n"
 "        `cups-config --libs`\n"
 
+# type: SH
+#. type: SH
+#: cups-config.1:100 lpadmin.8:186
+#, fuzzy, no-wrap
+msgid "DEPRECATED OPTIONS"
+msgstr "DIRECTIVES OBSOLÈTES"
+
+#. type: Plain text
+#: cups-config.1:102
+msgid ""
+"The following options are deprecated but continue to work for backwards "
+"compatibility:"
+msgstr ""
+
+# type: TP
+#. type: TP
+#: cups-config.1:102
+#, no-wrap
+msgid "B<--image>"
+msgstr "B<--image>"
+
+# type: Plain text
+#. type: Plain text
+#: cups-config.1:105
+#, fuzzy
+msgid "Formerly used to add the CUPS imaging library to the list of libraries."
+msgstr ""
+"Lorsqu'elle est utilisée avec B<--libs>, cette option ajoute la bibliothèque "
+"de gestion des images CUPS aux bibliothèques."
+
 # type: Plain text
 #. type: Plain text
-#: cups-config.man:110
+#: cups-config.1:108
 msgid "B<cups>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 "B<cups>(1), aide en ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
 
 # type: TH
 #. type: TH
-#: cupsctl.man:13
+#: cupsctl.8:10
 #, no-wrap
 msgid "cupsctl"
 msgstr "cupsctl"
 
-# type: TH
-#. type: TH
-#: cupsctl.man:13
-#, no-wrap
-msgid "30 May 2016"
-msgstr "30 mai 2016"
-
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:16
+#: cupsctl.8:13
 msgid "cupsctl - configure cupsd.conf options"
 msgstr "cupsctl - Configurer les options de cupsd.conf"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:39
+#: cupsctl.8:36
 msgid ""
 "B<cupsctl> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<server>[B<:>I<port>] ] "
 "[ B<-->[B<no->]B<debug-logging> ] [ B<-->[B<no->]B<remote-admin> ] [ B<--"
@@ -2230,7 +2461,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:43
+#: cupsctl.8:40
 msgid ""
 "B<cupsctl> updates or queries the I<cupsd.conf> file for a server. When no "
 "changes are requested, the current configuration values are written to the "
@@ -2243,19 +2474,19 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:45
+#: cupsctl.8:42
 msgid "The following options are recognized:"
 msgstr "Les options suivantes sont reconnues :"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:48
+#: cupsctl.8:45
 msgid "Enables encryption on the connection to the scheduler."
 msgstr "Activer le chiffrement de la connexion à l'ordonnanceur."
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:51
+#: cupsctl.8:48
 msgid ""
 "Specifies an alternate username to use when authenticating with the "
 "scheduler."
@@ -2265,28 +2496,28 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsctl.man:51 cupsenable.man:65 lpinfo.man:71 lpmove.man:50
-#: lpoptions.man.in:81 lpq.man:53 lpstat.man:104
+#: cupsctl.8:48 cupsenable.8:62 lpinfo.8:68 lpmove.8:47 lpoptions.1:78 lpq.1:50
+#: lpstat.1:100
 #, no-wrap
 msgid "B<-h >I<server>[B<:>I<port>]"
 msgstr "B<-h> I<serveur>[B<:>I<port>]"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:54
+#: cupsctl.8:51
 msgid "Specifies the server address."
 msgstr "Définir l'adresse du serveur."
 
 # type: TP
 #. type: TP
-#: cupsctl.man:54
+#: cupsctl.8:51
 #, no-wrap
 msgid "B<-->[B<no->]B<debug-logging>"
 msgstr "B<-->[B<no->]B<debug-logging>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:57
+#: cupsctl.8:54
 msgid "Enables (disables) debug logging to the I<error_log> file."
 msgstr ""
 "Activer ou désactiver la journalisation d'informations de débogage dans le "
@@ -2294,27 +2525,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsctl.man:57
+#: cupsctl.8:54
 #, no-wrap
 msgid "B<-->[B<no->]B<remote-admin>"
 msgstr "B<-->[B<no->]B<remote-admin>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:60
+#: cupsctl.8:57
 msgid "Enables (disables) remote administration."
 msgstr "Activer ou désactiver l'administration à distance."
 
 # type: TP
 #. type: TP
-#: cupsctl.man:60
+#: cupsctl.8:57
 #, no-wrap
 msgid "B<-->[B<no->]B<remote-any>"
 msgstr "B<-->[B<no->]B<remote-any>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:63
+#: cupsctl.8:60
 msgid "Enables (disables) printing from any address, e.g., the Internet."
 msgstr ""
 "Activer ou désactiver l'impression depuis n'importe quelle adresse, par "
@@ -2322,14 +2553,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsctl.man:63
+#: cupsctl.8:60
 #, no-wrap
 msgid "B<-->[B<no->]B<share-printers>"
 msgstr "B<-->[B<no->]B<share-printers>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:66
+#: cupsctl.8:63
 msgid "Enables (disables) sharing of local printers with other computers."
 msgstr ""
 "Activer ou désactiver le partage d'imprimantes locales avec d'autres "
@@ -2337,14 +2568,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsctl.man:66
+#: cupsctl.8:63
 #, no-wrap
 msgid "B<-->[B<no->]B<user-cancel-any>"
 msgstr "B<-->[B<no->]B<user-cancel-any>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:69
+#: cupsctl.8:66
 msgid "Allows (prevents) users to cancel jobs owned by others."
 msgstr ""
 "Permettre ou interdire aux utilisateurs d'annuler les travaux d'autres "
@@ -2352,65 +2583,65 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:71
+#: cupsctl.8:68
 msgid "Display the current settings:"
 msgstr "Afficher la configuration actuelle :"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:74
+#: cupsctl.8:71
 #, no-wrap
 msgid "    cupsctl\n"
 msgstr "    cupsctl\n"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:77
+#: cupsctl.8:74
 msgid "Enable debug logging:"
 msgstr "Activer la journalisation d'informations de débogage."
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:80
+#: cupsctl.8:77
 #, no-wrap
 msgid "    cupsctl --debug-logging\n"
 msgstr "    cupsctl --debug-logging\n"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:83
+#: cupsctl.8:80
 msgid "Get the current debug logging state:"
 msgstr "Récupérer l'état de la journalisation d'informations de débogage :"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:86
+#: cupsctl.8:83
 #, no-wrap
 msgid "    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'\n"
 msgstr "    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'\n"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:89
+#: cupsctl.8:86
 msgid "Disable printer sharing:"
 msgstr "Désactiver le partage d'imprimantes :"
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:92
+#: cupsctl.8:89
 #, no-wrap
 msgid "    cupsctl --no-share-printers\n"
 msgstr "    cupsctl --no-share-printers\n"
 
 # type: SH
 #. type: SH
-#: cupsctl.man:93
+#: cupsctl.8:90
 #, no-wrap
 msgid "KNOWN ISSUES"
 msgstr "PROBLÈMES CONNUS"
 
 #. type: Plain text
-#: cupsctl.man:95
+#: cupsctl.8:92
 msgid "You cannot set the Listen or Port directives using B<cupsctl>."
 msgstr ""
 "Il n’est pas possible de régler les paramètres I<Listen> ou I<Port> en "
@@ -2418,136 +2649,353 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsctl.man:98
+#: cupsctl.8:95
 msgid "B<cupsd.conf>(5), B<cupsd>(8),"
 msgstr "B<cupsd.conf>(5), B<cupsd>(8)"
 
 # type: TH
 #. type: TH
-#: cupsd.conf.man.in:13
-#, no-wrap
-msgid "cupsd.conf"
-msgstr "cupsd.conf"
-
-# type: TH
-#. type: TH
-#: cupsd.conf.man.in:13
+#: cupsd.8:10
 #, no-wrap
-msgid "2 May 2019"
-msgstr "2 mai 2019"
+msgid "cupsd"
+msgstr "cupsd"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:16
-msgid "cupsd.conf - server configuration file for cups"
-msgstr "cupsd.conf - Fichier de configuration du serveur CUPS."
+#: cupsd.8:13
+msgid "cupsd - cups scheduler"
+msgstr "cupsd - ordonnanceur cups"
 
+# type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:27
-#, fuzzy
+#: cupsd.8:32
 msgid ""
-"The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
-"normally located in the I</etc/cups> directory.  B<Note:> File, directory, "
-"and user configuration directives that used to be allowed in the B<cupsd."
-"conf> file are now stored in the B<cups-files.conf>(5)  file instead in "
-"order to prevent certain types of privilege escalation attacks."
+"B<cupsd> [ B<-c> I<cupsd.conf> ] [ B<-f> ] [ B<-F> ] [ B<-h> ] [ B<-l> ] "
+"[ B<-s> I<cups-files.conf> ] [ B<-t> ]"
 msgstr ""
-"Le fichier I<cupsd.conf> configure l'ordonnanceur CUPS, B<cupsd>(8). Il est "
-"normalement situé dans le répertoire I</etc/cups>. B<Remarque :> les "
-"directives de configuration des fichiers, des répertoires et des "
-"utilisateurs, qui étaient jusqu'alors autorisées dans le fichier I<cupsd."
-"conf>, sont maintenant stockées dans le fichier I<cups-files.conf> afin de "
-"prévenir certains types d'attaque visant une augmentation de privilèges."
+"B<cupsd> [ B<-c> I<cupsd.conf> ] [ B<-f> ] [ B<-F> ] [ B<-h> ] [ B<-l> ] "
+"[ B<-s> I<cups-files.conf> ] [ B<-t> ]"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:32 cups-files.conf.man.in:25 mailto.conf.man:23
+#: cupsd.8:37
 msgid ""
-"Each line in the file can be a configuration directive, a blank line, or a "
-"comment.  Configuration directives typically consist of a name and zero or "
-"more values separated by whitespace.  The configuration directive name and "
-"values are case-insensitive.  Comment lines start with the # character."
+"B<cupsd> is the scheduler for CUPS. It implements a printing system based "
+"upon the Internet Printing Protocol, version 2.1, and supports most of the "
+"requirements for IPP Everywhere. If no options are specified on the command-"
+"line then the default configuration file I</etc/cups/cupsd.conf> will be "
+"used."
 msgstr ""
-"Chaque ligne de ce fichier est soit une directive de configuration, une "
-"ligne vide ou un commentaire. Les directives de configuration consistent "
-"classiquement en un nom suivi de zéro ou plusieurs valeurs séparées par des "
-"espaces. Les noms des directives de configuration et les valeurs ne sont pas "
-"sensibles à la casse. Les lignes de commentaires débutent par le caractère "
-"« # »."
+"B<cupsd> est l'ordonnanceur pour CUPS. Il fournit un système d'impression "
+"basé sur l'Internet Printing Protocol, version 2.1, et prend en charge la "
+"plupart des exigences de IPP Everywhere. Si aucune option n'est indiquée sur "
+"la ligne de commande, alors le fichier de configuration par défaut I</etc/"
+"cups/cupsd.conf> sera utilisé."
 
-# type: SH
-#. type: SS
-#: cupsd.conf.man.in:32 ipptoolfile.man:86
+# type: TH
+#. type: TP
+#: cupsd.8:38
 #, no-wrap
-msgid "TOP-LEVEL DIRECTIVES"
-msgstr "DIRECTIVES PRINCIPALES"
+msgid "B<-c>I<\\ cupsd.conf>"
+msgstr "B<-c>I<\\ cupsd.conf>"
 
 # type: Plain text
-#. #AccessLogLevel
 #. type: Plain text
-#: cupsd.conf.man.in:36
-msgid "The following top-level directives are understood by B<cupsd>(8):"
-msgstr "Les directives principales suivantes sont comprises par B<cupsd>(8) :"
+#: cupsd.8:41
+msgid "Uses the named cupsd.conf configuration file."
+msgstr "Utiliser le fichier de configuration appelé cupsd.conf."
 
-# type: TP
 #. type: TP
-#: cupsd.conf.man.in:36
+#: cupsd.8:41
 #, no-wrap
-msgid "B<AccessLogLevel config>"
-msgstr "B<AccessLogLevel> I<config>"
+msgid "B<-f>"
+msgstr "B<-f>"
 
-# type: TP
-#. type: TP
-#: cupsd.conf.man.in:38
-#, no-wrap
-msgid "B<AccessLogLevel actions>"
-msgstr "B<AccessLogLevel> I<actions>"
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:46
+msgid ""
+"Run B<cupsd> in the foreground; the default is to run in the background as a "
+"\"daemon\"."
+msgstr ""
+"Forcer B<cupsd> à tourner au premier plan ; par défaut, cupsd tourne en "
+"arrière-plan comme « démon »."
 
-# type: TP
 #. type: TP
-#: cupsd.conf.man.in:40
+#: cupsd.8:46
 #, no-wrap
-msgid "B<AccessLogLevel all>"
-msgstr "B<AccessLogLevel> I<all>"
+msgid "B<-F>"
+msgstr "B<-F>"
 
-#. #AutoPurgeJobs
+# type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:48
+#: cupsd.8:54
 msgid ""
-"Specifies the logging level for the AccessLog file.  The \"config\" level "
-"logs when printers and classes are added, deleted, or modified and when "
-"configuration files are accessed or updated.  The \"actions\" level logs "
-"when print jobs are submitted, held, released, modified, or canceled, and "
-"any of the conditions for \"config\".  The \"all\" level logs all requests.  "
-"The default access log level is \"actions\"."
+"Run B<cupsd> in the foreground but detach the process from the controlling "
+"terminal and current directory. This is useful for running B<cupsd> from "
+"B<init>(8)."
 msgstr ""
-"Indiquer le niveau de journalisation pour le fichier I<AccessLog>. Le niveau "
-"« config » écrit dans le journal lorsque des imprimantes et des classes sont "
-"ajoutées, supprimées ou modifiées, et lors d’un accès ou mise à jour de "
-"fichiers de configuration. Le niveau « actions » écrit dans le journal "
-"lorsque des travaux d’impression sont demandés, mis en attente, terminés, "
-"modifiés ou annulés, et quelque soit l’état de « config ». Le niveau « all » "
-"écrit dans le journal toutes les requêtes. Le niveau de journalisation par "
-"défaut est « actions »."
+"Forcer B<cupsd> à tourner au premier plan, mais détacher le processus du "
+"terminal de contrôle et du répertoire de travail. Cette option est utile "
+"pour lancer B<cupsd> depuis B<init>(8)."
+
+#. type: TP
+#: cupsd.8:54 ipptool.1:163 lpr.1:88
+#, no-wrap
+msgid "B<-h>"
+msgstr "B<-h>"
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:57
+msgid "Shows the program usage."
+msgstr "Afficher un message d'aide."
+
+#. type: TP
+#: cupsd.8:57 ippfind.1:74 ipptool.1:172 lpinfo.8:71 lpoptions.1:81 lpq.1:53
+#: lpr.1:91 lpstat.1:103
+#, no-wrap
+msgid "B<-l>"
+msgstr "B<-l>"
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:65
+msgid ""
+"This option is passed to B<cupsd> when it is run from B<launchd>(8)  or "
+"B<systemd>(8)."
+msgstr ""
+"Cette option est passée à B<cupsd> lorsqu'il est lancé par B<launchd>(8) ou "
+"B<systemd>(8)."
+
+# type: TH
+#. type: TP
+#: cupsd.8:65
+#, no-wrap
+msgid "B<-s>I<\\ cups-files.conf>"
+msgstr "B<-s>I<\\ cups-files.conf>"
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:68 cupsfilter.8:72
+msgid "Uses the named cups-files.conf configuration file."
+msgstr "Utiliser le fichier de configuration appelé cups-files.conf."
+
+#. type: TP
+#: cupsd.8:68 ipptool.1:184 lpstat.1:121 ppdc.1:73
+#, no-wrap
+msgid "B<-t>"
+msgstr "B<-t>"
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:71
+msgid "Test the configuration file for syntax errors."
+msgstr "Tester le fichier de configuration pour les erreurs de syntaxe."
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:80
+#, no-wrap
+msgid ""
+"I</etc/cups/classes.conf>\n"
+"I</etc/cups/cups-files.conf>\n"
+"I</etc/cups/cupsd.conf>\n"
+"I</usr/share/cups/mime/mime.convs>\n"
+"I</usr/share/cups/mime/mime.types>\n"
+"I</etc/cups/printers.conf>\n"
+"I</etc/cups/subscriptions.conf>\n"
+msgstr ""
+"I</etc/cups/classes.conf>\n"
+"I</etc/cups/cups-files.conf>\n"
+"I</etc/cups/cupsd.conf>\n"
+"I</usr/share/cups/mime/mime.convs>\n"
+"I</usr/share/cups/mime/mime.types>\n"
+"I</etc/cups/printers.conf>\n"
+"I</etc/cups/subscriptions.conf>\n"
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:84
+msgid ""
+"B<cupsd> implements all of the required IPP/2.1 attributes and operations. "
+"It also implements several CUPS-specific administrative operations."
+msgstr ""
+"B<cupsd> fournit tous les attributs et opérations d’IPP/2.1. Il implémente "
+"aussi plusieurs opérations d'administration spécifiques à CUPS."
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:88
+msgid "Run B<cupsd> in the background with the default configuration file:"
+msgstr ""
+"Forcer B<cupsd> à tourner en arrière-plan avec le fichier de configuration "
+"par défaut :"
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:91
+#, no-wrap
+msgid "    cupsd\n"
+msgstr "    cupsd\n"
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:95
+msgid "Test a configuration file called I<test.conf>:"
+msgstr "Tester un fichier de configuration appelé I<test.conf> :"
+
+#. type: Plain text
+#: cupsd.8:98
+#, no-wrap
+msgid "    cupsd -t -c test.conf\n"
+msgstr "    cupsd -t -c test.conf\n"
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:104
+msgid ""
+"Run B<cupsd> in the foreground with a test configuration file called I<test."
+"conf>:"
+msgstr ""
+"Forcer B<cupsd> à tourner au premier plan avec un fichier de configuration "
+"appelé I<test.conf> :"
+
+# type: TH
+#. type: Plain text
+#: cupsd.8:107
+#, no-wrap
+msgid "    cupsd -f -c test.conf\n"
+msgstr "    cupsd -f -c test.conf\n"
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.8:125
+msgid ""
+"B<backend>(7), B<classes.conf>(5), B<cups>(1), B<cups-files.conf>(5), B<cups-"
+"lpd>(8), B<cupsd.conf>(5), B<cupsd-helper>(8), B<cupsd-logs>(8), "
+"B<filter>(7), B<launchd>(8), B<mime.convs>(5), B<mime.types>(5), B<printers."
+"conf>(5), B<systemd>(8), CUPS Online Help (http://localhost:631/help)"
+msgstr ""
+"B<backend>(7), B<classes.conf>(5), B<cups>(1), B<cups-files.conf>(5), B<cups-"
+"lpd>(8), B<cupsd.conf>(5), B<cupsd-helper>(8), B<cupsd-logs>(8), "
+"B<filter>(7), B<launchd>(8), B<mime.convs>(5), B<mime.types>(5), B<printers."
+"conf>(5), B<systemd>(8), aide en ligne de CUPS E<lt>URL:I<http://"
+"localhost:631/help>E<gt>"
+
+# type: TH
+#. type: TH
+#: cupsd.conf.5:10
+#, no-wrap
+msgid "cupsd.conf"
+msgstr "cupsd.conf"
+
+# type: TH
+#. type: TH
+#: cupsd.conf.5:10
+#, no-wrap
+#| msgid "16 July 2012"
+msgid "16 July 2019"
+msgstr "16 juillet 2019"
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.conf.5:13
+msgid "cupsd.conf - server configuration file for cups"
+msgstr "cupsd.conf - Fichier de configuration du serveur CUPS."
+
+# type: Plain text
+#. type: Plain text
+#: cupsd.conf.5:25
+#, fuzzy
+msgid ""
+"The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
+"normally located in the I</etc/cups> directory.  Each line in the file can "
+"be a configuration directive, a blank line, or a comment.  Configuration "
+"directives typically consist of a name and zero or more values separated by "
+"whitespace.  The configuration directive name and values are case-"
+"insensitive.  Comment lines start with the # character."
+msgstr ""
+"Chaque ligne de ce fichier est soit une directive de configuration, une "
+"ligne vide ou un commentaire. Les directives de configuration consistent "
+"classiquement en un nom suivi de zéro ou plusieurs valeurs séparées par des "
+"espaces. Les noms des directives de configuration et les valeurs ne sont pas "
+"sensibles à la casse. Les lignes de commentaires débutent par le caractère "
+"« # »."
+
+# type: SH
+#. type: SS
+#: cupsd.conf.5:25 ipptoolfile.5:83
+#, no-wrap
+msgid "TOP-LEVEL DIRECTIVES"
+msgstr "DIRECTIVES PRINCIPALES"
+
+# type: Plain text
+#. #AccessLogLevel
+#. type: Plain text
+#: cupsd.conf.5:29
+msgid "The following top-level directives are understood by B<cupsd>(8):"
+msgstr "Les directives principales suivantes sont comprises par B<cupsd>(8) :"
+
+# type: TP
+#. type: TP
+#: cupsd.conf.5:29
+#, no-wrap
+msgid "B<AccessLogLevel config>"
+msgstr "B<AccessLogLevel> I<config>"
+
+# type: TP
+#. type: TP
+#: cupsd.conf.5:31
+#, no-wrap
+msgid "B<AccessLogLevel actions>"
+msgstr "B<AccessLogLevel> I<actions>"
+
+# type: TP
+#. type: TP
+#: cupsd.conf.5:33
+#, no-wrap
+msgid "B<AccessLogLevel all>"
+msgstr "B<AccessLogLevel> I<all>"
+
+#. #AutoPurgeJobs
+#. type: Plain text
+#: cupsd.conf.5:41
+msgid ""
+"Specifies the logging level for the AccessLog file.  The \"config\" level "
+"logs when printers and classes are added, deleted, or modified and when "
+"configuration files are accessed or updated.  The \"actions\" level logs "
+"when print jobs are submitted, held, released, modified, or canceled, and "
+"any of the conditions for \"config\".  The \"all\" level logs all requests.  "
+"The default access log level is \"actions\"."
+msgstr ""
+"Indiquer le niveau de journalisation pour le fichier I<AccessLog>. Le niveau "
+"« config » écrit dans le journal lorsque des imprimantes et des classes sont "
+"ajoutées, supprimées ou modifiées, et lors d’un accès ou mise à jour de "
+"fichiers de configuration. Le niveau « actions » écrit dans le journal "
+"lorsque des travaux d’impression sont demandés, mis en attente, terminés, "
+"modifiés ou annulés, et quelque soit l’état de « config ». Le niveau « all » "
+"écrit dans le journal toutes les requêtes. Le niveau de journalisation par "
+"défaut est « actions »."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:48
+#: cupsd.conf.5:41
 #, no-wrap
 msgid "B<AutoPurgeJobs Yes>"
 msgstr "B<AutoPurgeJobs> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:50
+#: cupsd.conf.5:43
 #, no-wrap
 msgid "B<AutoPurgeJobs No>"
 msgstr "B<AutoPurgeJobs> I<No>"
 
 # type: Plain text
-#. #BrowseLocalProtocols
+#. #BrowseDNSSDSubTypes
 #. type: Plain text
-#: cupsd.conf.man.in:56
+#: cupsd.conf.5:49
 msgid ""
 "Specifies whether to purge job history data automatically when it is no "
 "longer required for quotas.  The default is \"No\"."
@@ -2556,30 +3004,47 @@ msgstr ""
 "les données ne sont plus nécessaires pour l'application des quotas. Par "
 "défaut, « No »"
 
+#. type: TP
+#: cupsd.conf.5:49
+#, no-wrap
+msgid "B<BrowseDNSSDSubTypes>I<_subtype[,...]>"
+msgstr ""
+
+#. #BrowseLocalProtocols
+#. type: Plain text
+#: cupsd.conf.5:55
+msgid ""
+"Specifies a list of Bonjour sub-types to advertise for each shared printer.  "
+"For example, \"BrowseDNSSDSubTypes _cups,_print\" will tell network clients "
+"that both CUPS sharing and IPP Everywhere are supported.  The default is "
+"\"_cups\" which is necessary for printer sharing to work between systems "
+"using CUPS."
+msgstr ""
+
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:56
+#: cupsd.conf.5:55
 #, no-wrap
 msgid "B<BrowseLocalProtocols all>"
 msgstr "B<BrowseLocalProtocols> I<all>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:58
+#: cupsd.conf.5:57
 #, no-wrap
 msgid "B<BrowseLocalProtocols dnssd>"
 msgstr "B<BrowseLocalProtocols> I<dnssd>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:60
+#: cupsd.conf.5:59
 #, no-wrap
 msgid "B<BrowseLocalProtocols none>"
 msgstr "B<BrowseLocalProtocols> I<none>"
 
 #. #BrowseWebIF
 #. type: Plain text
-#: cupsd.conf.man.in:65
+#: cupsd.conf.5:64
 msgid ""
 "Specifies which protocols to use for local printer sharing.  The default is "
 "\"dnssd\" on systems that support Bonjour and \"none\" otherwise."
@@ -2590,14 +3055,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:65
+#: cupsd.conf.5:64
 #, no-wrap
 msgid "B<BrowseWebIF Yes>"
 msgstr "B<BrowseWebIF> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:67
+#: cupsd.conf.5:66
 #, no-wrap
 msgid "B<BrowseWebIF No>"
 msgstr "B<BrowseWebIF> I<No>"
@@ -2605,7 +3070,7 @@ msgstr "B<BrowseWebIF> I<No>"
 # type: Plain text
 #. #Browsing
 #. type: Plain text
-#: cupsd.conf.man.in:73
+#: cupsd.conf.5:72
 msgid ""
 "Specifies whether the CUPS web interface is advertised.  The default is \"No"
 "\"."
@@ -2613,14 +3078,14 @@ msgstr "Indiquer si l'interface web de CUPS est avertie. Par défaut « No ».
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:73
+#: cupsd.conf.5:72
 #, no-wrap
 msgid "B<Browsing Yes>"
 msgstr "B<Browsing> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:75
+#: cupsd.conf.5:74
 #, no-wrap
 msgid "B<Browsing No>"
 msgstr "B<Browsing> I<No>"
@@ -2628,21 +3093,21 @@ msgstr "B<Browsing> I<No>"
 # type: Plain text
 #. #DefaultAuthType
 #. type: Plain text
-#: cupsd.conf.man.in:81
+#: cupsd.conf.5:80
 msgid ""
 "Specifies whether shared printers are advertised.  The default is \"No\"."
 msgstr "Définir si les imprimantes partagées sont averties. Par défaut « No »."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:81
+#: cupsd.conf.5:80
 #, no-wrap
 msgid "B<DefaultAuthType Basic>"
 msgstr "B<DefaultAuthType> I<Basic>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:83
+#: cupsd.conf.5:82
 #, no-wrap
 msgid "B<DefaultAuthType Negotiate>"
 msgstr "B<DefaultAuthType> I<Negotiate>"
@@ -2650,7 +3115,7 @@ msgstr "B<DefaultAuthType> I<Negotiate>"
 # type: Plain text
 #. #DefaultEncryption
 #. type: Plain text
-#: cupsd.conf.man.in:89
+#: cupsd.conf.5:88
 msgid ""
 "Specifies the default type of authentication to use.  The default is \"Basic"
 "\"."
@@ -2659,21 +3124,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:89
+#: cupsd.conf.5:88
 #, no-wrap
 msgid "B<DefaultEncryption Never>"
 msgstr "B<DefaultEncryption> I<Never>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:91
+#: cupsd.conf.5:90
 #, no-wrap
 msgid "B<DefaultEncryption IfRequested>"
 msgstr "B<DefaultEncryption> I<IfRequested>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:93
+#: cupsd.conf.5:92
 #, no-wrap
 msgid "B<DefaultEncryption Required>"
 msgstr "B<DefaultEncryption> I<Required>"
@@ -2681,7 +3146,7 @@ msgstr "B<DefaultEncryption> I<Required>"
 # type: Plain text
 #. #DefaultLanguage
 #. type: Plain text
-#: cupsd.conf.man.in:98
+#: cupsd.conf.5:97
 msgid ""
 "Specifies whether encryption will be used for authenticated requests.  The "
 "default is \"Required\"."
@@ -2691,7 +3156,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:98
+#: cupsd.conf.5:97
 #, no-wrap
 msgid "B<DefaultLanguage >I<locale>"
 msgstr "B<DefaultLanguage> I<locale>"
@@ -2699,7 +3164,7 @@ msgstr "B<DefaultLanguage> I<locale>"
 # type: Plain text
 #. #DefaultPaperSize
 #. type: Plain text
-#: cupsd.conf.man.in:103
+#: cupsd.conf.5:102
 msgid ""
 "Specifies the default language to use for text and web content.  The default "
 "is \"en\"."
@@ -2709,28 +3174,28 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:103
+#: cupsd.conf.5:102
 #, no-wrap
 msgid "B<DefaultPaperSize Auto>"
 msgstr "B<DefaultPaperSize> I<Auto>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:105
+#: cupsd.conf.5:104
 #, no-wrap
 msgid "B<DefaultPaperSize None>"
 msgstr "B<DefaultPaperSize> I<None>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:107
+#: cupsd.conf.5:106
 #, no-wrap
 msgid "B<DefaultPaperSize >I<sizename>"
 msgstr "B<DefaultPaperSize> I<nom_format>"
 
 #. #DefaultPolicy
 #. type: Plain text
-#: cupsd.conf.man.in:113
+#: cupsd.conf.5:112
 msgid ""
 "Specifies the default paper size for new print queues. \"Auto\" uses a "
 "locale-specific default, while \"None\" specifies there is no default paper "
@@ -2745,7 +3210,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:113
+#: cupsd.conf.5:112
 #, no-wrap
 msgid "B<DefaultPolicy >I<policy-name>"
 msgstr "B<DefaultPolicy> I<nom_politique>"
@@ -2753,7 +3218,7 @@ msgstr "B<DefaultPolicy> I<nom_politique>"
 # type: Plain text
 #. #DefaultShared
 #. type: Plain text
-#: cupsd.conf.man.in:118
+#: cupsd.conf.5:117
 msgid ""
 "Specifies the default access policy to use.  The default access policy is "
 "\"default\"."
@@ -2761,14 +3226,14 @@ msgstr "Indiquer la politique d'accès par défaut. Par défaut, « default »
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:118
+#: cupsd.conf.5:117
 #, no-wrap
 msgid "B<DefaultShared Yes>"
 msgstr "B<DefaultShared> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:120
+#: cupsd.conf.5:119
 #, no-wrap
 msgid "B<DefaultShared No>"
 msgstr "B<DefaultShared> I<No>"
@@ -2776,7 +3241,7 @@ msgstr "B<DefaultShared> I<No>"
 # type: Plain text
 #. #DirtyCleanInterval
 #. type: Plain text
-#: cupsd.conf.man.in:125
+#: cupsd.conf.5:124
 msgid ""
 "Specifies whether local printers are shared by default.  The default is \"Yes"
 "\"."
@@ -2786,14 +3251,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:125
+#: cupsd.conf.5:124
 #, no-wrap
 msgid "B<DirtyCleanInterval >I<seconds>"
 msgstr "B<DirtyCleanInterval> I<secondes>"
 
-#. #ErrorPolicy
+#. #DNSSDHostName
 #. type: Plain text
-#: cupsd.conf.man.in:131
+#: cupsd.conf.5:130
 msgid ""
 "Specifies the delay for updating of configuration and state files.  A value "
 "of 0 causes the update to happen as soon as possible, typically within a few "
@@ -2803,16 +3268,34 @@ msgstr ""
 "d'état. Une valeur de B<0> fait que la mise à jour se fera dès que possible, "
 "généralement en quelques millisecondes. Par défaut, B<30>."
 
+#. type: TP
+#: cupsd.conf.5:130
+#, no-wrap
+msgid "B<DNSSDHostName>I<hostname.example.com>"
+msgstr ""
+
+# type: Plain text
+#. #ErrorPolicy
+#. type: Plain text
+#: cupsd.conf.5:135
+#, fuzzy
+msgid ""
+"Specifies the fully-qualified domain name for the server that is used for "
+"Bonjour sharing.  The default is typically the server's \".local\" hostname."
+msgstr ""
+"Définir le nom d’hôte complet du serveur. Par défaut, la valeur indiquée par "
+"la commande B<hostname>(1) est utilisée."
+
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:131
+#: cupsd.conf.5:135
 #, no-wrap
 msgid "B<ErrorPolicy abort-job>"
 msgstr "B<ErrorPolicy> I<abort-job>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:134
+#: cupsd.conf.5:138
 msgid ""
 "Specifies that a failed print job should be aborted (discarded) unless "
 "otherwise specified for the printer."
@@ -2822,14 +3305,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:134
+#: cupsd.conf.5:138
 #, no-wrap
 msgid "B<ErrorPolicy retry-current-job>"
 msgstr "B<ErrorPolicy retry-current-job>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:137
+#: cupsd.conf.5:141
 msgid ""
 "Specifies that a failed print job should be retried immediately unless "
 "otherwise specified for the printer."
@@ -2839,14 +3322,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:137
+#: cupsd.conf.5:141
 #, no-wrap
 msgid "B<ErrorPolicy retry-job>"
 msgstr "B<ErrorPolicy> I<retry-job>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:140
+#: cupsd.conf.5:144
 msgid ""
 "Specifies that a failed print job should be retried at a later time unless "
 "otherwise specified for the printer. The 'retry-job' error policy is the "
@@ -2858,7 +3341,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:140
+#: cupsd.conf.5:144
 #, no-wrap
 msgid "B<ErrorPolicy stop-printer>"
 msgstr "B<ErrorPolicy> I<stop-printer>"
@@ -2866,7 +3349,7 @@ msgstr "B<ErrorPolicy> I<stop-printer>"
 # type: Plain text
 #. #FilterLimit
 #. type: Plain text
-#: cupsd.conf.man.in:144
+#: cupsd.conf.5:148
 msgid ""
 "Specifies that a failed print job should stop the printer unless otherwise "
 "specified for the printer."
@@ -2876,14 +3359,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:144
+#: cupsd.conf.5:148
 #, no-wrap
 msgid "B<FilterLimit >I<limit>"
 msgstr "B<FilterLimit >I<limite>"
 
 #. #FilterNice
 #. type: Plain text
-#: cupsd.conf.man.in:153
+#: cupsd.conf.5:157
 msgid ""
 "Specifies the maximum cost of filters that are run concurrently, which can "
 "be used to minimize disk, memory, and CPU resource problems.  A limit of 0 "
@@ -2904,7 +3387,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:153
+#: cupsd.conf.5:157
 #, no-wrap
 msgid "B<FilterNice >I<nice-value>"
 msgstr "B<FilterNice> I<priorité>"
@@ -2912,7 +3395,7 @@ msgstr "B<FilterNice> I<priorité>"
 # type: Plain text
 #. #GSSServiceName
 #. type: Plain text
-#: cupsd.conf.man.in:161
+#: cupsd.conf.5:165
 msgid ""
 "Specifies the scheduling priority ( B<nice>(8)  value) of filters that are "
 "run to print a job.  The nice value ranges from 0, the highest priority, to "
@@ -2923,7 +3406,7 @@ msgstr ""
 "haute, à B<19>, la priorité la plus basse. Par défaut B<0>."
 
 #. type: Plain text
-#: cupsd.conf.man.in:165
+#: cupsd.conf.5:169
 msgid ""
 "Specifies the service name when using Kerberos authentication.  The default "
 "service name is \"http.\""
@@ -2934,28 +3417,28 @@ msgstr ""
 # type: TP
 #. #HostNameLookups
 #. type: TP
-#: cupsd.conf.man.in:165
+#: cupsd.conf.5:169
 #, no-wrap
 msgid "B<HostNameLookups On>"
 msgstr "B<HostNameLookups> I<On>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:168
+#: cupsd.conf.5:172
 #, no-wrap
 msgid "B<HostNameLookups Off>"
 msgstr "B<HostNameLookups> I<Off>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:170
+#: cupsd.conf.5:174
 #, no-wrap
 msgid "B<HostNameLookups Double>"
 msgstr "B<HostNameLookups> I<Double>"
 
 #. #IdleExitTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:180
+#: cupsd.conf.5:184
 msgid ""
 "Specifies whether to do reverse lookups on connecting clients.  The \"Double"
 "\" setting causes B<cupsd>(8)  to verify that the hostname resolved from the "
@@ -2975,14 +3458,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:180
+#: cupsd.conf.5:184
 #, no-wrap
 msgid "B<IdleExitTimeout >I<seconds>"
 msgstr "B<IdleExitTimeout> I<secondes>"
 
 #. #JobKillDelay
 #. type: Plain text
-#: cupsd.conf.man.in:188
+#: cupsd.conf.5:192
 msgid ""
 "Specifies the length of time to wait before shutting down due to "
 "inactivity.  The default is \"60\" seconds.  Note: Only applicable when "
@@ -2993,14 +3476,14 @@ msgstr ""
 "B<cupsd>(8) est exécuté à la demande (par exemple, avec B<-l>)."
 
 #. type: TP
-#: cupsd.conf.man.in:188
+#: cupsd.conf.5:192
 #, no-wrap
 msgid "B<JobKillDelay >I<seconds>"
 msgstr "B<JobKillDelay> I<secondes>"
 
 #. #JobRetryInterval
 #. type: Plain text
-#: cupsd.conf.man.in:193
+#: cupsd.conf.5:197
 msgid ""
 "Specifies the number of seconds to wait before killing the filters and "
 "backend associated with a canceled or held job.  The default is \"30\"."
@@ -3011,14 +3494,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:193
+#: cupsd.conf.5:197
 #, no-wrap
 msgid "B<JobRetryInterval >I<seconds>"
 msgstr "B<JobRetryInterval> I<secondes>"
 
 #. #JobRetryLimit
 #. type: Plain text
-#: cupsd.conf.man.in:199
+#: cupsd.conf.5:203
 msgid ""
 "Specifies the interval between retries of jobs in seconds.  This is "
 "typically used for fax queues but can also be used with normal print queues "
@@ -3033,14 +3516,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:199
+#: cupsd.conf.5:203
 #, no-wrap
 msgid "B<JobRetryLimit >I<count>"
 msgstr "B<JobRetryLimit> I<nombre>"
 
 #. #KeepAlive
 #. type: Plain text
-#: cupsd.conf.man.in:205
+#: cupsd.conf.5:209
 msgid ""
 "Specifies the number of retries that are done for jobs.  This is typically "
 "used for fax queues but can also be used with normal print queues whose "
@@ -3054,14 +3537,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:205
+#: cupsd.conf.5:209
 #, no-wrap
 msgid "B<KeepAlive Yes>"
 msgstr "B<KeepAlive> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:207
+#: cupsd.conf.5:211
 #, no-wrap
 msgid "B<KeepAlive No>"
 msgstr "B<KeepAlive> I<No>"
@@ -3069,7 +3552,7 @@ msgstr "B<KeepAlive> I<No>"
 # type: Plain text
 #. #KeepAliveTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:212
+#: cupsd.conf.5:216
 msgid ""
 "Specifies whether to support HTTP keep-alive connections.  The default is "
 "\"Yes\"."
@@ -3079,14 +3562,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:212
+#: cupsd.conf.5:216
 #, no-wrap
 msgid "B<KeepAliveTimeout >I<seconds>"
 msgstr "B<KeepAliveTimeout> I<secondes>"
 
 #. #LimitIPP
 #. type: Plain text
-#: cupsd.conf.man.in:217
+#: cupsd.conf.5:221
 msgid ""
 "Specifies how long an idle client connection remains open.  The default is "
 "\"30\"."
@@ -3096,7 +3579,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:217
+#: cupsd.conf.5:221
 #, no-wrap
 msgid "B<E<lt>Limit >I<operation >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 msgstr "B<E<lt>Limit >I<opération >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
@@ -3104,7 +3587,7 @@ msgstr "B<E<lt>Limit >I<opération >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 # type: Plain text
 #. #Limit
 #. type: Plain text
-#: cupsd.conf.man.in:221
+#: cupsd.conf.5:225
 msgid ""
 "Specifies the IPP operations that are being limited inside a Policy section. "
 "IPP operation names are listed below in the section \"IPP OPERATION NAMES\"."
@@ -3114,14 +3597,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:221
+#: cupsd.conf.5:225
 #, no-wrap
 msgid "B<E<lt>Limit >I<method >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 msgstr "B<E<lt>Limit >I<methodes >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:224
+#: cupsd.conf.5:228
 #, no-wrap
 msgid "B<E<lt>LimitExcept >I<method >...B<E<gt> >... B<E<lt>/LimitExceptE<gt>>"
 msgstr "B<E<lt>LimitExcept >I<methodes >...B<E<gt> >... B<E<lt>/LimitExceptE<gt>>"
@@ -3129,7 +3612,7 @@ msgstr "B<E<lt>LimitExcept >I<methodes >...B<E<gt> >... B<E<lt>/LimitExceptE<gt>
 # type: Plain text
 #. #LimitRequestBody
 #. type: Plain text
-#: cupsd.conf.man.in:228
+#: cupsd.conf.5:232
 msgid ""
 "Specifies the HTTP methods that are being limited inside a Location section. "
 "HTTP method names are listed below in the section \"HTTP METHOD NAMES\"."
@@ -3139,14 +3622,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:228
+#: cupsd.conf.5:232
 #, no-wrap
 msgid "B<LimitRequestBody >I<size>"
 msgstr "B<LimitRequestBody >I<taille>"
 
 #. #Listen
 #. type: Plain text
-#: cupsd.conf.man.in:233
+#: cupsd.conf.5:237
 msgid ""
 "Specifies the maximum size of print files, IPP requests, and HTML form "
 "data.  The default is \"0\" which disables the limit check."
@@ -3157,35 +3640,35 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:233
+#: cupsd.conf.5:237
 #, no-wrap
 msgid "B<Listen >I<ipv4-address>B<:>I<port>"
 msgstr "B<Listen> I<adresse_ipv4>B<:>I<port>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:235
+#: cupsd.conf.5:239
 #, no-wrap
 msgid "B<Listen [>I<ipv6-address>B<]:>I<port>"
 msgstr "B<Listen> [I<adresse_ipv6>]B<:>I<port>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:237
+#: cupsd.conf.5:241
 #, no-wrap
 msgid "B<Listen *:>I<port>"
 msgstr "B<Listen *:>I<port>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:239
+#: cupsd.conf.5:243
 #, no-wrap
 msgid "B<Listen >I</path/to/domain/socket>"
 msgstr "B<Listen> I</chemin/vers/socket/domaine>"
 
 #. #ListenBackLog
 #. type: Plain text
-#: cupsd.conf.man.in:245
+#: cupsd.conf.5:249
 msgid ""
 "Listens to the specified address and port or domain socket path for "
 "connections.  Multiple Listen directives can be provided to listen on "
@@ -3199,14 +3682,14 @@ msgstr ""
 "particuliers."
 
 #. type: TP
-#: cupsd.conf.man.in:245
+#: cupsd.conf.5:249
 #, no-wrap
 msgid "B<ListenBackLog >I<number>"
 msgstr "B<ListenBackLog >I<nombre>"
 
 #. #Location
 #. type: Plain text
-#: cupsd.conf.man.in:252
+#: cupsd.conf.5:256
 msgid ""
 "Specifies the number of pending connections that will be allowed.  This "
 "normally only affects very busy servers that have reached the MaxClients "
@@ -3227,7 +3710,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:252
+#: cupsd.conf.5:256
 #, no-wrap
 msgid "B<E<lt>Location >I</path>B<E<gt> >... B<E<lt>/LocationE<gt>>"
 msgstr "B<E<lt>Emplacement >I</chemin>B<E<gt> >... B<E<lt>/EmplacementE<gt>>"
@@ -3235,7 +3718,7 @@ msgstr "B<E<lt>Emplacement >I</chemin>B<E<gt> >... B<E<lt>/EmplacementE<gt>>"
 # type: Plain text
 #. #LogDebugHistory
 #. type: Plain text
-#: cupsd.conf.man.in:257
+#: cupsd.conf.5:261
 msgid ""
 "Specifies access control for the named location.  Paths are documented below "
 "in the section \"LOCATION PATHS\"."
@@ -3245,7 +3728,7 @@ msgstr ""
 
 # type: Plain text
 #. type: TP
-#: cupsd.conf.man.in:257
+#: cupsd.conf.5:261
 #, no-wrap
 msgid "B<LogDebugHistory >I<number>"
 msgstr "B<LogDebugHistory >I<nombre>"
@@ -3253,7 +3736,7 @@ msgstr "B<LogDebugHistory >I<nombre>"
 # type: Plain text
 #. #LogLevel
 #. type: Plain text
-#: cupsd.conf.man.in:261
+#: cupsd.conf.5:265
 msgid ""
 "Specifies the number of debugging messages that are retained for logging if "
 "an error occurs in a print job. Debug messages are logged regardless of the "
@@ -3265,77 +3748,77 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:261
+#: cupsd.conf.5:265
 #, no-wrap
 msgid "B<LogLevel >none"
 msgstr "B<LogLevel> I<none>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:263
+#: cupsd.conf.5:267
 #, no-wrap
 msgid "B<LogLevel >emerg"
 msgstr "B<LogLevel> I<emerg>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:265
+#: cupsd.conf.5:269
 #, no-wrap
 msgid "B<LogLevel >alert"
 msgstr "B<LogLevel> I<alert>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:267
+#: cupsd.conf.5:271
 #, no-wrap
 msgid "B<LogLevel >crit"
 msgstr "B<LogLevel> I<crit>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:269
+#: cupsd.conf.5:273
 #, no-wrap
 msgid "B<LogLevel >error"
 msgstr "B<LogLevel> I<error>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:271
+#: cupsd.conf.5:275
 #, no-wrap
 msgid "B<LogLevel >warn"
 msgstr "B<LogLevel> I<warn>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:273
+#: cupsd.conf.5:277
 #, no-wrap
 msgid "B<LogLevel >notice"
 msgstr "B<LogLevel> I<notice>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:275
+#: cupsd.conf.5:279
 #, no-wrap
 msgid "B<LogLevel >info"
 msgstr "B<LogLevel> I<info>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:277
+#: cupsd.conf.5:281
 #, no-wrap
 msgid "B<LogLevel >debug"
 msgstr "B<LogLevel> I<debug>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:279
+#: cupsd.conf.5:283
 #, no-wrap
 msgid "B<LogLevel >debug2"
 msgstr "B<LogLevel> I<debug2>"
 
 #. #LogTimeFormat
 #. type: Plain text
-#: cupsd.conf.man.in:285
+#: cupsd.conf.5:289
 msgid ""
 "Specifies the level of logging for the ErrorLog file.  The value \"none\" "
 "stops all logging while \"debug2\" logs everything.  The default is \"warn\"."
@@ -3345,21 +3828,21 @@ msgstr ""
 "Par défaut, « warn »."
 
 #. type: TP
-#: cupsd.conf.man.in:285
+#: cupsd.conf.5:289
 #, no-wrap
 msgid "B<LogTimeFormat >standard"
 msgstr "B<LogTimeFormat> I<standard>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:287
+#: cupsd.conf.5:291
 #, no-wrap
 msgid "B<LogTimeFormat >usecs"
 msgstr "B<LogTimeFormat> I<usecs>"
 
 #. #MaxClients
 #. type: Plain text
-#: cupsd.conf.man.in:292
+#: cupsd.conf.5:296
 msgid ""
 "Specifies the format of the date and time in the log files.  The value "
 "\"standard\" is the default and logs whole seconds while \"usecs\" logs "
@@ -3371,7 +3854,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:292
+#: cupsd.conf.5:296
 #, no-wrap
 msgid "B<MaxClients >I<number>"
 msgstr "B<MaxClients> I<nombre>"
@@ -3379,7 +3862,7 @@ msgstr "B<MaxClients> I<nombre>"
 # type: Plain text
 #. #MaxClientPerHost
 #. type: Plain text
-#: cupsd.conf.man.in:297
+#: cupsd.conf.5:301
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed by the "
 "scheduler.  The default is \"100\"."
@@ -3389,7 +3872,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:297
+#: cupsd.conf.5:301
 #, no-wrap
 msgid "B<MaxClientsPerHost >I<number>"
 msgstr "B<MaxClientsPerHost> I<nombre>"
@@ -3397,7 +3880,7 @@ msgstr "B<MaxClientsPerHost> I<nombre>"
 # type: Plain text
 #. #MaxCopies
 #. type: Plain text
-#: cupsd.conf.man.in:303
+#: cupsd.conf.5:307
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed from a "
 "single address.  The default is the MaxClients value."
@@ -3407,7 +3890,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:303
+#: cupsd.conf.5:307
 #, no-wrap
 msgid "B<MaxCopies >I<number>"
 msgstr "B<MaxCopies> I<nombre>"
@@ -3415,7 +3898,7 @@ msgstr "B<MaxCopies> I<nombre>"
 # type: Plain text
 #. #MaxHoldTime
 #. type: Plain text
-#: cupsd.conf.man.in:308
+#: cupsd.conf.5:312
 msgid ""
 "Specifies the maximum number of copies that a user can print of each job.  "
 "The default is \"9999\"."
@@ -3425,14 +3908,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:308
+#: cupsd.conf.5:312
 #, no-wrap
 msgid "B<MaxHoldTime >I<seconds>"
 msgstr "B<MaxHoldTime> I<secondes>"
 
 #. #MaxJobs
 #. type: Plain text
-#: cupsd.conf.man.in:313
+#: cupsd.conf.5:317
 msgid ""
 "Specifies the maximum time a job may remain in the \"indefinite\" hold state "
 "before it is canceled.  The default is \"0\" which disables cancellation of "
@@ -3444,14 +3927,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:313
+#: cupsd.conf.5:317
 #, no-wrap
 msgid "B<MaxJobs >I<number>"
 msgstr "B<MaxJobs> I<nombre>"
 
 #. #MaxJobsPerPrinter
 #. type: Plain text
-#: cupsd.conf.man.in:319
+#: cupsd.conf.5:323
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed.  Set to "
 "\"0\" to allow an unlimited number of jobs.  The default is \"500\"."
@@ -3461,7 +3944,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:319
+#: cupsd.conf.5:323
 #, no-wrap
 msgid "B<MaxJobsPerPrinter >I<number>"
 msgstr "B<MaxJobsPerPrinter> I<nombre>"
@@ -3469,7 +3952,7 @@ msgstr "B<MaxJobsPerPrinter> I<nombre>"
 # type: Plain text
 #. #MaxJobsPerUser
 #. type: Plain text
-#: cupsd.conf.man.in:324
+#: cupsd.conf.5:328
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "printer.  The default is \"0\" which allows up to MaxJobs jobs per printer."
@@ -3479,7 +3962,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:324
+#: cupsd.conf.5:328
 #, no-wrap
 msgid "B<MaxJobsPerUser >I<number>"
 msgstr "B<MaxJobsPerUser> I<nombre>"
@@ -3487,7 +3970,7 @@ msgstr "B<MaxJobsPerUser> I<nombre>"
 # type: Plain text
 #. #MaxJobTime
 #. type: Plain text
-#: cupsd.conf.man.in:329
+#: cupsd.conf.5:333
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "user.  The default is \"0\" which allows up to MaxJobs jobs per user."
@@ -3497,14 +3980,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:329
+#: cupsd.conf.5:333
 #, no-wrap
 msgid "B<MaxJobTime >I<seconds>"
 msgstr "B<MaxJobTime> I<secondes>"
 
 #. #MaxLogSize
 #. type: Plain text
-#: cupsd.conf.man.in:335
+#: cupsd.conf.5:339
 msgid ""
 "Specifies the maximum time a job may take to print before it is canceled.  "
 "Set to \"0\" to disable cancellation of \"stuck\" jobs.  The default is "
@@ -3515,7 +3998,7 @@ msgstr ""
 "bloquées. La valeur par défaut est de 10 800 secondes (3 heures). "
 
 #. type: TP
-#: cupsd.conf.man.in:335
+#: cupsd.conf.5:339
 #, no-wrap
 msgid "B<MaxLogSize >I<size>"
 msgstr "B<MaxLogSize >I<taille>"
@@ -3523,7 +4006,7 @@ msgstr "B<MaxLogSize >I<taille>"
 # type: Plain text
 #. #MultipleOperationTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:341
+#: cupsd.conf.5:345
 msgid ""
 "Specifies the maximum size of the log files before they are rotated.  The "
 "value \"0\" disables log rotation.  The default is \"1048576\" (1MB)."
@@ -3533,7 +4016,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:341
+#: cupsd.conf.5:345
 #, no-wrap
 msgid "B<MultipleOperationTimeout >I<seconds>"
 msgstr "B<MultipleOperationTimeout> I<secondes>"
@@ -3541,7 +4024,7 @@ msgstr "B<MultipleOperationTimeout> I<secondes>"
 # type: Plain text
 #. #Policy
 #. type: Plain text
-#: cupsd.conf.man.in:346
+#: cupsd.conf.5:350
 #, fuzzy
 msgid ""
 "Specifies the maximum amount of time to allow between files in a multiple "
@@ -3552,7 +4035,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:346
+#: cupsd.conf.5:350
 #, no-wrap
 msgid "B<E<lt>Policy >I<name>B<E<gt> >... B<E<lt>/PolicyE<gt>>"
 msgstr "B<E<lt>Policy >I<nom>B<E<gt> >... B<E<lt>/PolicyE<gt>>"
@@ -3560,13 +4043,13 @@ msgstr "B<E<lt>Policy >I<nom>B<E<gt> >... B<E<lt>/PolicyE<gt>>"
 # type: Plain text
 #. #Port
 #. type: Plain text
-#: cupsd.conf.man.in:350
+#: cupsd.conf.5:354
 msgid "Specifies access control for the named policy."
 msgstr "Définir les contrôles d'accès pour la politique donnée."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:350
+#: cupsd.conf.5:354
 #, no-wrap
 msgid "B<Port >I<number>"
 msgstr "B<Port> I<nombre>"
@@ -3574,34 +4057,34 @@ msgstr "B<Port> I<nombre>"
 # type: Plain text
 #. #PreserveJobFiles
 #. type: Plain text
-#: cupsd.conf.man.in:354
+#: cupsd.conf.5:358
 msgid "Listens to the specified port number for connections."
 msgstr "Écouter sur le numéro de port indiqué pour des connexions."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:354
+#: cupsd.conf.5:358
 #, no-wrap
 msgid "B<PreserveJobFiles Yes>"
 msgstr "B<PreserveJobFiles> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:356
+#: cupsd.conf.5:360
 #, no-wrap
 msgid "B<PreserveJobFiles No>"
 msgstr "B<PreserveJobFiles> I<No>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:358
+#: cupsd.conf.5:362
 #, no-wrap
 msgid "B<PreserveJobFiles >I<seconds>"
 msgstr "B<PreserveJobFiles> I<secondes>"
 
 #. #PreserveJobHistory
 #. type: Plain text
-#: cupsd.conf.man.in:364
+#: cupsd.conf.5:368
 msgid ""
 "Specifies whether job files (documents) are preserved after a job is "
 "printed.  If a numeric value is specified, job files are preserved for the "
@@ -3615,28 +4098,28 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:364
+#: cupsd.conf.5:368
 #, no-wrap
 msgid "B<PreserveJobHistory Yes>"
 msgstr "B<PreserveJobHistory> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:366
+#: cupsd.conf.5:370
 #, no-wrap
 msgid "B<PreserveJobHistory No>"
 msgstr "B<PreserveJobHistory> I<No>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:368
+#: cupsd.conf.5:372
 #, no-wrap
 msgid "B<PreserveJobHistory >I<seconds>"
 msgstr "B<PreserveJobHistory> I<secondes>"
 
 #. #ReloadTimeout
 #. type: Plain text
-#: cupsd.conf.man.in:375
+#: cupsd.conf.5:379
 msgid ""
 "Specifies whether the job history is preserved after a job is printed.  If a "
 "numeric value is specified, the job history is preserved for the indicated "
@@ -3651,7 +4134,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:375
+#: cupsd.conf.5:379
 #, no-wrap
 msgid "B<ReloadTimeout >I<seconds>"
 msgstr "B<ReloadTimeout> I<secondes>"
@@ -3659,7 +4142,7 @@ msgstr "B<ReloadTimeout> I<secondes>"
 # type: Plain text
 #. #ServerAdmin
 #. type: Plain text
-#: cupsd.conf.man.in:380
+#: cupsd.conf.5:384
 msgid ""
 "Specifies the amount of time to wait for job completion before restarting "
 "the scheduler.  The default is \"30\"."
@@ -3668,7 +4151,7 @@ msgstr ""
 "redémarrer l'ordonnanceur. Par défaut, B<30>."
 
 #. type: TP
-#: cupsd.conf.man.in:380
+#: cupsd.conf.5:384
 #, no-wrap
 msgid "B<ServerAdmin >I<email-address>"
 msgstr "B<ServerAdmin >I<adresse_courriel>"
@@ -3676,7 +4159,7 @@ msgstr "B<ServerAdmin >I<adresse_courriel>"
 # type: Plain text
 #. #ServerAlias
 #. type: Plain text
-#: cupsd.conf.man.in:385
+#: cupsd.conf.5:389
 msgid ""
 "Specifies the email address of the server administrator.  The default value "
 "is \"root@ServerName\"."
@@ -3686,20 +4169,20 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:385
+#: cupsd.conf.5:389
 #, no-wrap
 msgid "B<ServerAlias >I<hostname >[ ... I<hostname >]"
 msgstr "B<ServerAlias> I<nom_hôte> [... I<nom_hôte>]"
 
 #. type: TP
-#: cupsd.conf.man.in:387
+#: cupsd.conf.5:391
 #, no-wrap
 msgid "B<ServerAlias *>"
 msgstr "B<ServerAlias *>"
 
 #. #ServerName
 #. type: Plain text
-#: cupsd.conf.man.in:393
+#: cupsd.conf.5:397
 msgid ""
 "The ServerAlias directive is used for HTTP Host header validation when "
 "clients connect to the scheduler from external interfaces.  Using the "
@@ -3718,7 +4201,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:393
+#: cupsd.conf.5:397
 #, no-wrap
 msgid "B<ServerName >I<hostname>"
 msgstr "B<ServerName> I<nom_hôte>"
@@ -3726,7 +4209,7 @@ msgstr "B<ServerName> I<nom_hôte>"
 # type: Plain text
 #. #ServerTokens
 #. type: Plain text
-#: cupsd.conf.man.in:400
+#: cupsd.conf.5:404
 msgid ""
 "Specifies the fully-qualified hostname of the server.  The default is the "
 "value reported by the B<hostname>(1)  command."
@@ -3736,64 +4219,65 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:400
+#: cupsd.conf.5:404
 #, no-wrap
 msgid "B<ServerTokens None>"
 msgstr "B<ServerTokens> I<None>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:402
+#: cupsd.conf.5:406
 #, no-wrap
 msgid "B<ServerTokens ProductOnly>"
 msgstr "B<ServerTokens> I<ProductOnly>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:404
+#: cupsd.conf.5:408
 #, no-wrap
 msgid "B<ServerTokens Major>"
 msgstr "B<ServerTokens> I<Major>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:406
+#: cupsd.conf.5:410
 #, no-wrap
 msgid "B<ServerTokens Minor>"
 msgstr "B<ServerTokens> I<Minor>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:408
+#: cupsd.conf.5:412
 #, no-wrap
 msgid "B<ServerTokens Minimal>"
 msgstr "B<ServerTokens> I<Minimal>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:410
+#: cupsd.conf.5:414
 #, no-wrap
 msgid "B<ServerTokens OS>"
 msgstr "B<ServerTokens> I<OS>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:412
+#: cupsd.conf.5:416
 #, no-wrap
 msgid "B<ServerTokens Full>"
 msgstr "B<ServerTokens> I<Full>"
 
 #. #SSLListen
 #. type: Plain text
-#: cupsd.conf.man.in:426
+#: cupsd.conf.5:428
 #, fuzzy
 msgid ""
 "Specifies what information is included in the Server header of HTTP "
 "responses.  \"None\" disables the Server header.  \"ProductOnly\" reports "
-"\"CUPS\".  \"Major\" reports \"CUPS 2\".  \"Minor\" reports \"CUPS 2.0\".  "
-"\"Minimal\" reports \"CUPS 2.0.0\".  \"OS\" reports \"CUPS 2.0.0 (UNAME)\" "
-"where UNAME is the output of the B<uname>(1)  command.  \"Full\" reports "
-"\"CUPS 2.0.0 (UNAME) IPP/2.0\".  The default is \"Minimal\"."
+"\"CUPS\".  \"Major\" reports \"CUPS/major IPP/2\".  \"Minor\" reports \"CUPS/"
+"major.minor IPP/2.1\".  \"Minimal\" reports \"CUPS/major.minor.patch "
+"IPP/2.1\".  \"OS\" reports \"CUPS/major.minor.path (osname osversion) "
+"IPP/2.1\".  \"Full\" reports \"CUPS/major.minor.path (osname osversion; "
+"architecture) IPP/2.1\".  The default is \"Minimal\"."
 msgstr ""
 "Indiquer l’information à inclure dans l’en-tête du serveur pour les réponses "
 "HTTP. « None » désactive l’en-tête, « ProductOnly » renvoie « CUPS », "
@@ -3804,21 +4288,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:426
+#: cupsd.conf.5:428
 #, no-wrap
 msgid "B<SSLListen >I<ipv4-address>B<:>I<port>"
 msgstr "B<SSLListen> I<adresse_ipv4>B<:>I<port>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:428
+#: cupsd.conf.5:430
 #, no-wrap
 msgid "B<SSLListen [>I<ipv6-address>B<]:>I<port>"
 msgstr "B<SSListen> I<adresse_ipv6>B<:>I<port>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:430
+#: cupsd.conf.5:432
 #, no-wrap
 msgid "B<SSLListen *:>I<port>"
 msgstr "B<SSListen *:>I<port>"
@@ -3826,43 +4310,14 @@ msgstr "B<SSListen *:>I<port>"
 # type: Plain text
 #. #SSLOptions
 #. type: Plain text
-#: cupsd.conf.man.in:434
+#: cupsd.conf.5:436
 msgid "Listens on the specified address and port for encrypted connections."
 msgstr ""
 "Écouter à l'adresse et au port indiqués pour les connexions sécurisées."
 
-#. #SSLPort
-#. type: Plain text
-#: cupsd.conf.man.in:448
-msgid ""
-"Sets encryption options.  By default, CUPS only supports encryption using "
-"TLS v1.0 or higher using known secure cipher suites.  Security is reduced "
-"when I<Allow> options are used.  Security is enhanced when I<Deny> options "
-"are used.  The I<AllowDH> option enables cipher suites using plain Diffie-"
-"Hellman key negotiation (not supported on systems using GNU TLS).  The "
-"I<AllowRC4> option enables the 128-bit RC4 cipher suites, which are required "
-"for some older clients.  The I<AllowSSL3> option enables SSL v3.0, which is "
-"required for some older clients that do not support TLS v1.0.  The "
-"I<DenyCBC> option disables all CBC cipher suites.  The I<DenyTLS1.0> option "
-"disables TLS v1.0 support - this sets the minimum protocol version to TLS "
-"v1.1."
-msgstr ""
-"Définir les options de chiffrement. Par défaut, CUPS prend en charge le "
-"chiffrement avec TLS versions 1.0 ou postérieures en utilisant les suites de "
-"chiffrement fiables. La sécurité est diminuée lorsque des options I<Allow> "
-"sont utilisées. La sécurité est améliorée lorsque des options I<Deny> sont "
-"utilisées. L’option I<AllowDH> autorise les suites de chiffrement utilisant "
-"la négociation de clefs stricte Diffie-Hellman (non prise en charge dans les "
-"systèmes utilisant GNU TLS). L’option I<AllowRC4> autorise les suites de "
-"chiffrement RC4 128 bits qui sont nécessaires pour quelques clients anciens. "
-"L’option I<AllowSSL3> autorise SSL version 3.0 nécessaire pour certains "
-"anciens clients qui ne prennent pas en charge TLS version 1.0. L’option "
-"I<DenyTLS1.0> désactive la prise en charge de TLS version 1.0 – cela oblige "
-"la version minimale du protocole à TLS version 1.1."
-
-# type: TP
-#. type: TP
-#: cupsd.conf.man.in:448
+# type: TP
+#. type: TP
+#: cupsd.conf.5:454
 #, no-wrap
 msgid "B<SSLPort >I<port>"
 msgstr "B<SSLPort >I<port>"
@@ -3870,25 +4325,25 @@ msgstr "B<SSLPort >I<port>"
 # type: Plain text
 #. #StrictConformance
 #. type: Plain text
-#: cupsd.conf.man.in:452
+#: cupsd.conf.5:458
 msgid "Listens on the specified port for encrypted connections."
 msgstr "Écouter sur le port indiqué pour les connexions sécurisées."
 
 #. type: TP
-#: cupsd.conf.man.in:452
+#: cupsd.conf.5:458
 #, no-wrap
 msgid "B<StrictConformance Yes>"
 msgstr "B<StrictConformance> I<Yes>"
 
 #. type: TP
-#: cupsd.conf.man.in:454
+#: cupsd.conf.5:460
 #, no-wrap
 msgid "B<StrictConformance No>"
 msgstr "B<StrictConformance> I<No>"
 
 #. #Timeout
 #. type: Plain text
-#: cupsd.conf.man.in:459
+#: cupsd.conf.5:465
 msgid ""
 "Specifies whether the scheduler requires clients to strictly adhere to the "
 "IPP specifications.  The default is \"No\"."
@@ -3898,7 +4353,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:459
+#: cupsd.conf.5:465
 #, no-wrap
 msgid "B<Timeout >I<seconds>"
 msgstr "B<Timeout> I<secondes>"
@@ -3906,7 +4361,7 @@ msgstr "B<Timeout> I<secondes>"
 # type: Plain text
 #. #WebInterface
 #. type: Plain text
-#: cupsd.conf.man.in:464
+#: cupsd.conf.5:470
 #, fuzzy
 msgid ""
 "Specifies the HTTP request timeout.  The default is \"900\" (15 minutes)."
@@ -3914,43 +4369,43 @@ msgstr ""
 "Définir le délai d'attente des requêtes HTTP. Par défaut, B<300> (5 minutes)."
 
 #. type: TP
-#: cupsd.conf.man.in:464
+#: cupsd.conf.5:470
 #, no-wrap
 msgid "B<WebInterface yes>"
 msgstr "B<WebInterface> I<yes>"
 
 #. type: TP
-#: cupsd.conf.man.in:466
+#: cupsd.conf.5:472
 #, no-wrap
 msgid "B<WebInterface no>"
 msgstr "B<WebInterface> I<no>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:470
+#: cupsd.conf.5:476
 msgid "Specifies whether the web interface is enabled.  The default is \"No\"."
 msgstr "Indiquer si l'interface web est activée. Par défaut, « No »."
 
 #. type: SS
-#: cupsd.conf.man.in:470
+#: cupsd.conf.5:476
 #, no-wrap
 msgid "HTTP METHOD NAMES"
 msgstr "NOMS DES MÉTHODES HTTP"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:473
+#: cupsd.conf.5:479
 msgid "The following HTTP methods are supported by B<cupsd>(8):"
 msgstr "Les méthodes suivantes sont reconnues par B<cupsd>(8) :"
 
 #. type: TP
-#: cupsd.conf.man.in:473
+#: cupsd.conf.5:479
 #, no-wrap
 msgid "GET"
 msgstr "GET"
 
 #. type: Plain text
-#: cupsd.conf.man.in:476
+#: cupsd.conf.5:482
 msgid ""
 "Used by a client to download icons and other printer resources and to access "
 "the CUPS web interface."
@@ -3959,13 +4414,13 @@ msgstr ""
 "et accession à l’interface web de CUPS."
 
 #. type: TP
-#: cupsd.conf.man.in:476
+#: cupsd.conf.5:482
 #, no-wrap
 msgid "HEAD"
 msgstr "HEAD"
 
 #. type: Plain text
-#: cupsd.conf.man.in:479
+#: cupsd.conf.5:485
 msgid ""
 "Used by a client to get the type, size, and modification date of resources."
 msgstr ""
@@ -3973,18 +4428,18 @@ msgstr ""
 "ressources."
 
 #. type: Plain text
-#: cupsd.conf.man.in:482
+#: cupsd.conf.5:488
 msgid "Used by a client to establish a secure (SSL/TLS) connection."
 msgstr "Établissement par un client d’une connexion sécurisée (SSL ou TLS)."
 
 #. type: TP
-#: cupsd.conf.man.in:482
+#: cupsd.conf.5:488
 #, no-wrap
 msgid "POST"
 msgstr "POST"
 
 #. type: Plain text
-#: cupsd.conf.man.in:485
+#: cupsd.conf.5:491
 msgid ""
 "Used by a client to submit IPP requests and HTML forms from the CUPS web "
 "interface."
@@ -3993,426 +4448,426 @@ msgstr ""
 "de l’interface web de CUPS."
 
 #. type: TP
-#: cupsd.conf.man.in:485
+#: cupsd.conf.5:491
 #, no-wrap
 msgid "PUT"
 msgstr "PUT"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:488
+#: cupsd.conf.5:494
 msgid "Used by a client to upload configuration files."
 msgstr "Téléversement par un client de fichiers de configuration."
 
 # type: SH
 #. type: SS
-#: cupsd.conf.man.in:488
+#: cupsd.conf.5:494
 #, no-wrap
 msgid "IPP OPERATION NAMES"
 msgstr "NOMS D’OPÉRATIONS IPP"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:491
+#: cupsd.conf.5:497
 msgid "The following IPP operations are supported by B<cupsd>(8):"
 msgstr "Les opérations IPP suivantes sont reconnues par B<cupsd>(8) :"
 
 #. type: TP
-#: cupsd.conf.man.in:491
+#: cupsd.conf.5:497
 #, no-wrap
 msgid "CUPS-Accept-Jobs"
 msgstr "CUPS-Accept-Jobs"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:494
+#: cupsd.conf.5:500
 msgid "Allows a printer to accept new jobs."
 msgstr "Permettre à l'imprimante d’accepter de nouveaux travaux d'impression."
 
 #. type: TP
-#: cupsd.conf.man.in:494
+#: cupsd.conf.5:500
 #, no-wrap
 msgid "CUPS-Add-Modify-Class"
 msgstr "CUPS-Add-Modify-Class"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:497
+#: cupsd.conf.5:503
 msgid "Adds or modifies a printer class."
 msgstr "Ajouter ou modifier une classe d'imprimantes."
 
 #. type: TP
-#: cupsd.conf.man.in:497
+#: cupsd.conf.5:503
 #, no-wrap
 msgid "CUPS-Add-Modify-Printer"
 msgstr "CUPS-Add-Modify-Printer"
 
 #. type: Plain text
-#: cupsd.conf.man.in:500
+#: cupsd.conf.5:506
 msgid "Adds or modifies a printer."
 msgstr "Ajouter ou modifier une imprimante."
 
 #. type: TP
-#: cupsd.conf.man.in:500
+#: cupsd.conf.5:506
 #, no-wrap
 msgid "CUPS-Authenticate-Job"
 msgstr "CUPS-Authenticate-Job"
 
 #. type: Plain text
-#: cupsd.conf.man.in:503
+#: cupsd.conf.5:509
 msgid "Releases a job that is held for authentication."
 msgstr "Valider un travail mis en attente pour authentification."
 
 #. type: TP
-#: cupsd.conf.man.in:503
+#: cupsd.conf.5:509
 #, no-wrap
 msgid "CUPS-Delete-Class"
 msgstr "CUPS-Delete-Class"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:506
+#: cupsd.conf.5:512
 msgid "Deletes a printer class."
 msgstr "Supprimer une classe d'imprimantes."
 
 #. type: TP
-#: cupsd.conf.man.in:506
+#: cupsd.conf.5:512
 #, no-wrap
 msgid "CUPS-Delete-Printer"
 msgstr "CUPS-Delete-Printer"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:509
+#: cupsd.conf.5:515
 msgid "Deletes a printer."
 msgstr "Supprimer une imprimante."
 
 #. type: TP
-#: cupsd.conf.man.in:509
+#: cupsd.conf.5:515
 #, no-wrap
 msgid "CUPS-Get-Classes"
 msgstr "CUPS-Get-Classes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:512
+#: cupsd.conf.5:518
 msgid "Gets a list of printer classes."
 msgstr "Obtenir une liste de classes d'imprimantes."
 
 #. type: TP
-#: cupsd.conf.man.in:512
+#: cupsd.conf.5:518
 #, no-wrap
 msgid "CUPS-Get-Default"
 msgstr "CUPS-Get-Default"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:515
+#: cupsd.conf.5:521
 msgid "Gets the server default printer or printer class."
 msgstr "Obtenir l’imprimante ou la classe d’imprimantes par défaut du serveur."
 
 #. type: TP
-#: cupsd.conf.man.in:515
+#: cupsd.conf.5:521
 #, no-wrap
 msgid "CUPS-Get-Devices"
 msgstr "CUPS-Get-Devices"
 
 #. type: Plain text
-#: cupsd.conf.man.in:518
+#: cupsd.conf.5:524
 msgid "Gets a list of devices that are currently available."
 msgstr "Obtenir la liste des périphériques disponibles à ce moment."
 
 #. type: TP
-#: cupsd.conf.man.in:518
+#: cupsd.conf.5:524
 #, no-wrap
 msgid "CUPS-Get-Document"
 msgstr "CUPS-Get-Document"
 
 #. type: Plain text
-#: cupsd.conf.man.in:521
+#: cupsd.conf.5:527
 msgid "Gets a document file for a job."
 msgstr "Obtenir un fichier de document à imprimer."
 
 #. type: TP
-#: cupsd.conf.man.in:521
+#: cupsd.conf.5:527
 #, no-wrap
 msgid "CUPS-Get-PPD"
 msgstr "CUPS-Get-PPD"
 
 #. type: Plain text
-#: cupsd.conf.man.in:524
+#: cupsd.conf.5:530
 msgid "Gets a PPD file."
 msgstr "Obtenir un fichier PPD."
 
 #. type: TP
-#: cupsd.conf.man.in:524
+#: cupsd.conf.5:530
 #, no-wrap
 msgid "CUPS-Get-PPDs"
 msgstr "CUPS-Get-PPDs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:527
+#: cupsd.conf.5:533
 msgid "Gets a list of installed PPD files."
 msgstr "Obtenir la liste des fichiers installés."
 
 #. type: TP
-#: cupsd.conf.man.in:527
+#: cupsd.conf.5:533
 #, no-wrap
 msgid "CUPS-Get-Printers"
 msgstr "CUPS-Get-Printers"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:530
+#: cupsd.conf.5:536
 msgid "Gets a list of printers."
 msgstr "Obtenir la liste des imprimantes."
 
 #. type: TP
-#: cupsd.conf.man.in:530
+#: cupsd.conf.5:536
 #, no-wrap
 msgid "CUPS-Move-Job"
 msgstr "CUPS-Move-Job"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:533
+#: cupsd.conf.5:539
 msgid "Moves a job."
 msgstr "Déplacer un travail."
 
 #. type: TP
-#: cupsd.conf.man.in:533
+#: cupsd.conf.5:539
 #, no-wrap
 msgid "CUPS-Reject-Jobs"
 msgstr "CUPS-Reject-Jobs"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:536
+#: cupsd.conf.5:542
 msgid "Prevents a printer from accepting new jobs."
 msgstr "Empêcher une imprimante d’accepter de nouveaux travaux."
 
 #. type: TP
-#: cupsd.conf.man.in:536
+#: cupsd.conf.5:542
 #, no-wrap
 msgid "CUPS-Set-Default"
 msgstr "CUPS-Set-Default"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:539
+#: cupsd.conf.5:545
 msgid "Sets the server default printer or printer class."
 msgstr "Définir l’imprimante ou la classe d’imprimantes par défaut du serveur."
 
 # type: TH
 #. type: TP
-#: cupsd.conf.man.in:539
+#: cupsd.conf.5:545
 #, no-wrap
 msgid "Cancel-Job"
 msgstr "Cancel-Job"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:542
+#: cupsd.conf.5:548
 msgid "Cancels a job."
 msgstr "Annuler un travail."
 
 #. type: TP
-#: cupsd.conf.man.in:542
+#: cupsd.conf.5:548
 #, no-wrap
 msgid "Cancel-Jobs"
 msgstr "Cancel-Jobs"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:545
+#: cupsd.conf.5:551
 msgid "Cancels one or more jobs."
 msgstr "Annuler un ou plusieurs travaux."
 
 #. type: TP
-#: cupsd.conf.man.in:545
+#: cupsd.conf.5:551
 #, no-wrap
 msgid "Cancel-My-Jobs"
 msgstr "Cancel-My-Jobs"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:548
+#: cupsd.conf.5:554
 msgid "Cancels one or more jobs creates by a user."
 msgstr "Annuler un ou plusieurs travaux d’un utilisateur."
 
 #. type: TP
-#: cupsd.conf.man.in:548
+#: cupsd.conf.5:554
 #, no-wrap
 msgid "Cancel-Subscription"
 msgstr "Cancel-Subscription"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:551
+#: cupsd.conf.5:557
 msgid "Cancels a subscription."
 msgstr "Annuler un abonnement."
 
 #. type: TP
-#: cupsd.conf.man.in:551
+#: cupsd.conf.5:557
 #, no-wrap
 msgid "Close-Job"
 msgstr "Close-Job"
 
 #. type: Plain text
-#: cupsd.conf.man.in:554
+#: cupsd.conf.5:560
 msgid "Closes a job that is waiting for more documents."
 msgstr "Arrêter un travail attendant plus de documents."
 
 #. type: TP
-#: cupsd.conf.man.in:554
+#: cupsd.conf.5:560
 #, no-wrap
 msgid "Create-Job"
 msgstr "Create-Job"
 
 #. type: Plain text
-#: cupsd.conf.man.in:557
+#: cupsd.conf.5:563
 msgid "Creates a new job with no documents."
 msgstr "Créer un nouveau travail sans document."
 
 #. type: TP
-#: cupsd.conf.man.in:557
+#: cupsd.conf.5:563
 #, no-wrap
 msgid "Create-Job-Subscriptions"
 msgstr "Create-Job-Subscriptions"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:560
+#: cupsd.conf.5:566
 msgid "Creates a subscription for job events."
 msgstr "Créer un abonnement pour les évènements concernant les travaux."
 
 #. type: TP
-#: cupsd.conf.man.in:560
+#: cupsd.conf.5:566
 #, no-wrap
 msgid "Create-Printer-Subscriptions"
 msgstr "Create-Printer-Subscriptions"
 
 #. type: Plain text
-#: cupsd.conf.man.in:563
+#: cupsd.conf.5:569
 msgid "Creates a subscription for printer events."
 msgstr "Créer un abonnement pour les évènements concernant les imprimantes."
 
 #. type: TP
-#: cupsd.conf.man.in:563
+#: cupsd.conf.5:569
 #, no-wrap
 msgid "Get-Job-Attributes"
 msgstr "Get-Job-Attributes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:566
+#: cupsd.conf.5:572
 msgid "Gets information about a job."
 msgstr "Obtenir des informations concernant un travail."
 
 #. type: TP
-#: cupsd.conf.man.in:566
+#: cupsd.conf.5:572
 #, no-wrap
 msgid "Get-Jobs"
 msgstr "Get-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:569
+#: cupsd.conf.5:575
 msgid "Gets a list of jobs."
 msgstr "Obtenir la liste des travaux."
 
 #. type: TP
-#: cupsd.conf.man.in:569
+#: cupsd.conf.5:575
 #, no-wrap
 msgid "Get-Notifications"
 msgstr "Get-Notifications"
 
 #. type: Plain text
-#: cupsd.conf.man.in:572
+#: cupsd.conf.5:578
 msgid "Gets a list of event notifications for a subscription."
 msgstr "Obtenir la liste des notifications d’évènement pour un abonnement."
 
 #. type: TP
-#: cupsd.conf.man.in:572
+#: cupsd.conf.5:578
 #, no-wrap
 msgid "Get-Printer-Attributes"
 msgstr "Get-Printer-Attributes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:575
+#: cupsd.conf.5:581
 msgid "Gets information about a printer or printer class."
 msgstr "Obtenir des informations sur une imprimante ou une classe."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:575
+#: cupsd.conf.5:581
 #, no-wrap
 msgid "Get-Subscription-Attributes"
 msgstr "Get-Subscription-Attributes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:578
+#: cupsd.conf.5:584
 msgid "Gets information about a subscription."
 msgstr "Obtenir des informations à propos d’un abonnement."
 
 # type: TH
 #. type: TP
-#: cupsd.conf.man.in:578
+#: cupsd.conf.5:584
 #, no-wrap
 msgid "Get-Subscriptions"
 msgstr "Get-Subscriptions"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:581
+#: cupsd.conf.5:587
 msgid "Gets a list of subscriptions."
 msgstr "Obtenir une liste d’abonnements."
 
 #. type: TP
-#: cupsd.conf.man.in:581
+#: cupsd.conf.5:587
 #, no-wrap
 msgid "Hold-Job"
 msgstr "Hold-Job"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:584
+#: cupsd.conf.5:590
 msgid "Holds a job from printing."
 msgstr "Suspendre l'impression d'un travail."
 
 #. type: TP
-#: cupsd.conf.man.in:584
+#: cupsd.conf.5:590
 #, no-wrap
 msgid "Hold-New-Jobs"
 msgstr "Hold-New-Jobs"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:587
+#: cupsd.conf.5:593
 msgid "Holds all new jobs from printing."
 msgstr "Suspendre l'impression de tous les nouveaux travaux."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:587
+#: cupsd.conf.5:593
 #, no-wrap
 msgid "Pause-Printer"
 msgstr "Pause-Printer"
 
 #. type: Plain text
-#: cupsd.conf.man.in:590
+#: cupsd.conf.5:596
 msgid "Stops processing of jobs by a printer or printer class."
 msgstr "Arrêter le déroulement des travaux pour une imprimante ou une classe."
 
 #. type: TP
-#: cupsd.conf.man.in:590
+#: cupsd.conf.5:596
 #, no-wrap
 msgid "Pause-Printer-After-Current-Job"
 msgstr "Pause-Printer-After-Current-Job"
 
 #. type: Plain text
-#: cupsd.conf.man.in:593
+#: cupsd.conf.5:599
 msgid ""
 "Stops processing of jobs by a printer or printer class after the current job "
 "is finished."
@@ -4422,156 +4877,156 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:593
+#: cupsd.conf.5:599
 #, no-wrap
 msgid "Print-Job"
 msgstr "Print-Job"
 
 #. type: Plain text
-#: cupsd.conf.man.in:596
+#: cupsd.conf.5:602
 msgid "Creates a new job with a single document."
 msgstr "Créer un nouveau travail avec un document unique."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:596
+#: cupsd.conf.5:602
 #, no-wrap
 msgid "Purge-Jobs"
 msgstr "Purge-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:599
+#: cupsd.conf.5:605
 msgid "Cancels one or more jobs and deletes the job history."
 msgstr "Annuler un ou plusieurs travaux et supprimer l’historique des travaux."
 
 #. type: TP
-#: cupsd.conf.man.in:599
+#: cupsd.conf.5:605
 #, no-wrap
 msgid "Release-Held-New-Jobs"
 msgstr "Release-Held-New-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:602
+#: cupsd.conf.5:608
 msgid "Allows previously held jobs to print."
 msgstr "Autoriser des travaux précédemment suspendus."
 
 #. type: TP
-#: cupsd.conf.man.in:602
+#: cupsd.conf.5:608
 #, no-wrap
 msgid "Release-Job"
 msgstr "Release-Job"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:605
+#: cupsd.conf.5:611
 msgid "Allows a job to print."
 msgstr "Autoriser l’impression d’un travail."
 
 # type: Plain text
 #. type: TP
-#: cupsd.conf.man.in:605
+#: cupsd.conf.5:611
 #, no-wrap
 msgid "Renew-Subscription"
 msgstr "Renew-Subscription"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:608
+#: cupsd.conf.5:614
 msgid "Renews a subscription."
 msgstr "Renouveler un abonnement."
 
 #. type: TP
-#: cupsd.conf.man.in:608
+#: cupsd.conf.5:614
 #, no-wrap
 msgid "Restart-Job"
 msgstr "Restart-Job"
 
 #. type: Plain text
-#: cupsd.conf.man.in:611
+#: cupsd.conf.5:617
 msgid "Reprints a job, if possible."
 msgstr "Réimprimer un travail si possible."
 
 #. type: TP
-#: cupsd.conf.man.in:611
+#: cupsd.conf.5:617
 #, no-wrap
 msgid "Send-Document"
 msgstr "Send-Document"
 
 #. type: Plain text
-#: cupsd.conf.man.in:614
+#: cupsd.conf.5:620
 msgid "Adds a document to a job."
 msgstr "Ajouter un document au travail."
 
 #. type: TP
-#: cupsd.conf.man.in:614
+#: cupsd.conf.5:620
 #, no-wrap
 msgid "Set-Job-Attributes"
 msgstr "Set-Job-Attributes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:617
+#: cupsd.conf.5:623
 msgid "Changes job information."
 msgstr "Modifier l’information sur le travail."
 
 #. type: TP
-#: cupsd.conf.man.in:617
+#: cupsd.conf.5:623
 #, no-wrap
 msgid "Set-Printer-Attributes"
 msgstr "Set-Printer-Attributes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:620
+#: cupsd.conf.5:626
 msgid "Changes printer or printer class information."
 msgstr "Modifier l’information sur une imprimante ou une classe d’imprimantes."
 
 #. type: TP
-#: cupsd.conf.man.in:620
+#: cupsd.conf.5:626
 #, no-wrap
 msgid "Validate-Job"
 msgstr "Validate-Job"
 
 #. type: Plain text
-#: cupsd.conf.man.in:623
+#: cupsd.conf.5:629
 msgid "Validates options for a new job."
 msgstr "Valider les options pour un nouveau travail."
 
 #. type: SS
-#: cupsd.conf.man.in:623
+#: cupsd.conf.5:629
 #, no-wrap
 msgid "LOCATION PATHS"
 msgstr "CHEMINS D’ACCÈS"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:626
+#: cupsd.conf.5:632
 msgid "The following paths are commonly used when configuring B<cupsd>(8):"
 msgstr ""
 "Les chemins suivants sont couramment utilisés lors de la configuration de "
 "B<cupsd>(8) :"
 
 #. type: TP
-#: cupsd.conf.man.in:626
+#: cupsd.conf.5:632
 #, no-wrap
 msgid "/"
 msgstr "/"
 
 #. type: Plain text
-#: cupsd.conf.man.in:629
+#: cupsd.conf.5:635
 msgid "The path for all get operations (get-printers, get-jobs, etc.)"
 msgstr ""
 "Chemin pour toutes les opérations « get » (get-printers, get-jobs, etc.)"
 
 # type: TH
 #. type: TP
-#: cupsd.conf.man.in:629
+#: cupsd.conf.5:635
 #, no-wrap
 msgid "/admin"
 msgstr "/admin"
 
 #. type: Plain text
-#: cupsd.conf.man.in:632
+#: cupsd.conf.5:638
 msgid ""
 "The path for all administration operations (add-printer, delete-printer, "
 "start-printer, etc.)"
@@ -4580,13 +5035,13 @@ msgstr ""
 "printer, start-printer, etc.)"
 
 #. type: TP
-#: cupsd.conf.man.in:632
+#: cupsd.conf.5:638
 #, no-wrap
 msgid "/admin/conf"
 msgstr "/admin/conf"
 
 #. type: Plain text
-#: cupsd.conf.man.in:635
+#: cupsd.conf.5:641
 msgid ""
 "The path for access to the CUPS configuration files (cupsd.conf, client."
 "conf, etc.)"
@@ -4595,13 +5050,13 @@ msgstr ""
 "client.conf, etc.)"
 
 #. type: TP
-#: cupsd.conf.man.in:635
+#: cupsd.conf.5:641
 #, no-wrap
 msgid "/admin/log"
 msgstr "/admin/log"
 
 #. type: Plain text
-#: cupsd.conf.man.in:638
+#: cupsd.conf.5:644
 msgid ""
 "The path for access to the CUPS log files (access_log, error_log, page_log)"
 msgstr ""
@@ -4610,112 +5065,112 @@ msgstr ""
 
 # type: TH
 #. type: TP
-#: cupsd.conf.man.in:638
+#: cupsd.conf.5:644
 #, no-wrap
 msgid "/classes"
 msgstr "/classes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:641
+#: cupsd.conf.5:647
 msgid "The path for all printer classes"
 msgstr "Chemin pour toutes les classes d’imprimantes."
 
 # type: TH
 #. type: TP
-#: cupsd.conf.man.in:641
+#: cupsd.conf.5:647
 #, no-wrap
 msgid "/classes/name"
 msgstr "/classes/nom"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:644
+#: cupsd.conf.5:650
 msgid "The resource for the named printer class"
 msgstr "Ressource pour la classe d’imprimantes nommée."
 
 #. type: TP
-#: cupsd.conf.man.in:644
+#: cupsd.conf.5:650
 #, no-wrap
 msgid "/jobs"
 msgstr "/jobs"
 
 #. type: Plain text
-#: cupsd.conf.man.in:647
+#: cupsd.conf.5:653
 msgid "The path for all jobs (hold-job, release-job, etc.)"
 msgstr "Chemin pour tous les travaux (hold-job, release-job, etc.)"
 
 #. type: TP
-#: cupsd.conf.man.in:647
+#: cupsd.conf.5:653
 #, no-wrap
 msgid "/jobs/id"
 msgstr "/jobs/id"
 
 #. type: Plain text
-#: cupsd.conf.man.in:650
+#: cupsd.conf.5:656
 msgid "The path for the specified job"
 msgstr "Chemin pour le travail indiqué"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:650
+#: cupsd.conf.5:656
 #, no-wrap
 msgid "/printers"
 msgstr "/printers"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:653
+#: cupsd.conf.5:659
 msgid "The path for all printers"
 msgstr "Chemin pour toutes les imprimantes."
 
 # type: TH
 #. type: TP
-#: cupsd.conf.man.in:653
+#: cupsd.conf.5:659
 #, no-wrap
 msgid "/printers/name"
 msgstr "/printers/nom"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:656
+#: cupsd.conf.5:662
 msgid "The path for the named printer"
 msgstr "Chemin pour l'imprimante nommée."
 
 # type: TH
 #. type: TP
-#: cupsd.conf.man.in:656
+#: cupsd.conf.5:662
 #, no-wrap
 msgid "/printers/name.png"
 msgstr "/printers/nom.png"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:659
+#: cupsd.conf.5:665
 msgid "The icon file path for the named printer"
 msgstr "Chemin du fichier de l’icône pour l'imprimante donnée."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:659
+#: cupsd.conf.5:665
 #, no-wrap
 msgid "/printers/name.ppd"
 msgstr "/printers/nom.ppd"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:662
+#: cupsd.conf.5:668
 msgid "The PPD file path for the named printer"
 msgstr "Chemin du fichier PPD pour l'imprimante donnée."
 
 #. type: SS
-#: cupsd.conf.man.in:662
+#: cupsd.conf.5:668
 #, no-wrap
 msgid "DIRECTIVES VALID WITHIN LOCATION AND LIMIT SECTIONS"
 msgstr "DIRECTIVES VALABLES DANS LES SECTIONS CHEMINS ET LIMITES "
 
 #. type: Plain text
-#: cupsd.conf.man.in:664
+#: cupsd.conf.5:670
 msgid ""
 "The following directives may be placed inside Location and Limit sections in "
 "the B<cupsd.conf> file:"
@@ -4725,122 +5180,122 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:664
+#: cupsd.conf.5:670
 #, no-wrap
 msgid "B<Allow all>"
 msgstr "B<Allow> I<all>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:666
+#: cupsd.conf.5:672
 #, no-wrap
 msgid "B<Allow none>"
 msgstr "B<Allow> I<none>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:668
+#: cupsd.conf.5:674
 #, no-wrap
 msgid "B<Allow >I<host.domain.com>"
 msgstr "B<Allow> I<hôte.domaine.com>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:670
+#: cupsd.conf.5:676
 #, no-wrap
 msgid "B<Allow *.>I<domain.com>"
 msgstr "B<Allow *.>I<domaine.com>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:672
+#: cupsd.conf.5:678
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>"
 msgstr "B<Allow> I<adresse_ipv4>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:674
+#: cupsd.conf.5:680
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>B</>I<netmask>"
 msgstr "B<Allow> I<adresse_ipv4>B</>I<masque_sous_réseau>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:676
+#: cupsd.conf.5:682
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>B</>I<mm>"
 msgstr "B<Allow> I<adresse_ipv4>B</>I<mm>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:678
+#: cupsd.conf.5:684
 #, no-wrap
 msgid "B<Allow [>I<ipv6-address>B<]>"
 msgstr "B<Allow [>I<adresse_ipv6>B<]>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:680
+#: cupsd.conf.5:686
 #, no-wrap
 msgid "B<Allow [>I<ipv6-address>B<]/>I<mm>"
 msgstr "B<Allow [>I<address_ipv6>B<]/>I<mm>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:682
+#: cupsd.conf.5:688
 #, no-wrap
 msgid "B<Allow @IF(>I<name>B<)>"
 msgstr "B<Allow @IF(>I<nom>B<)>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:684
+#: cupsd.conf.5:690
 #, no-wrap
 msgid "B<Allow @LOCAL>"
 msgstr "B<Allow @LOCAL>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:688
+#: cupsd.conf.5:696
 msgid ""
 "Allows access from the named hosts, domains, addresses, or interfaces.  The "
-"Order directive controls whether Allow lines are evaluated before or after "
-"Deny lines."
+"@IF(name) form uses the current subnets configured for the named interface.  "
+"The @LOCAL form uses the current subnets configured for all interfaces that "
+"are not point-to-point, for example Ethernet and Wi-Fi interfaces are used "
+"but DSL and VPN interfaces are not.  The Order directive controls whether "
+"Allow lines are evaluated before or after Deny lines."
 msgstr ""
-"Autoriser l’accès à partir des hôtes nommés, domaines, adresses ou "
-"interfaces.La directive Order décide si les lignes Allow sont évaluées avant "
-"ou après les lignes Deny."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:688
+#: cupsd.conf.5:696
 #, no-wrap
 msgid "B<AuthType None>"
 msgstr "B<AuthType> I<None>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:690
+#: cupsd.conf.5:698
 #, no-wrap
 msgid "B<AuthType Basic>"
 msgstr "B<AuthType> I<Basic>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:692
+#: cupsd.conf.5:700
 #, no-wrap
 msgid "B<AuthType Default>"
 msgstr "B<AuthType> I<Digest>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:694
+#: cupsd.conf.5:702
 #, no-wrap
 msgid "B<AuthType Negotiate>"
 msgstr "B<AuthType> I<Negotiate>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:698
+#: cupsd.conf.5:706
 msgid ""
 "Specifies the type of authentication required.  The value \"Default\" "
 "corresponds to the DefaultAuthType value."
@@ -4850,95 +5305,95 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:698
+#: cupsd.conf.5:706
 #, no-wrap
 msgid "B<Deny all>"
 msgstr "B<Deny> I<all>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:700
+#: cupsd.conf.5:708
 #, no-wrap
 msgid "B<Deny none>"
 msgstr "B<Deny> I<none>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:702
+#: cupsd.conf.5:710
 #, no-wrap
 msgid "B<Deny >I<host.domain.com>"
 msgstr "B<Deny> I<hôte.domaine.com>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:704
+#: cupsd.conf.5:712
 #, no-wrap
 msgid "B<Deny *.>I<domain.com>"
 msgstr "B<Deny *.>I<domaine.com>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:706
+#: cupsd.conf.5:714
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>"
 msgstr "B<Deny> I<adresse_ipv4>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:708
+#: cupsd.conf.5:716
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>B</>I<netmask>"
 msgstr "B<Deny> I<adresse_ipv4>B</>I<masque_réseau>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:710
+#: cupsd.conf.5:718
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>B</>I<mm>"
 msgstr "B<Deny> I<adresse_ipv4>B</>I<mm>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:712
+#: cupsd.conf.5:720
 #, no-wrap
 msgid "B<Deny [>I<ipv6-address>B<]>"
 msgstr "B<Deny [>I<adresse_ipv6>B<]>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:714
+#: cupsd.conf.5:722
 #, no-wrap
 msgid "B<Deny [>I<ipv6-address>B<]/>I<mm>"
 msgstr "B<Deny> [I<adresse_ipv6>]B</>I<mm>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:716
+#: cupsd.conf.5:724
 #, no-wrap
 msgid "B<Deny @IF(>I<name>B<)>"
 msgstr "B<Deny @IF(>I<nom>B<)>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:718
+#: cupsd.conf.5:726
 #, no-wrap
 msgid "B<Deny @LOCAL>"
 msgstr "B<Deny @LOCAL>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:722
+#: cupsd.conf.5:732
 msgid ""
 "Denies access from the named hosts, domains, addresses, or interfaces.  The "
-"Order directive controls whether Deny lines are evaluated before or after "
-"Allow lines."
+"@IF(name) form uses the current subnets configured for the named interface.  "
+"The @LOCAL form uses the current subnets configured for all interfaces that "
+"are not point-to-point, for example Ethernet and Wi-Fi interfaces are used "
+"but DSL and VPN interfaces are not.  The Order directive controls whether "
+"Deny lines are evaluated before or after Allow lines."
 msgstr ""
-"Refuser l’accès à partir des hôtes nommés, domaines, adresses ou interfaces."
-"La directive Order décide si les lignes Allow sont évaluées avant ou après "
-"les lignes Deny."
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:730
+#: cupsd.conf.5:740
 msgid ""
 "Specifies the level of encryption that is required for a particular "
 "location.  The default value is \"IfRequested\"."
@@ -4948,13 +5403,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:730
+#: cupsd.conf.5:740
 #, no-wrap
 msgid "B<Order allow,deny>"
 msgstr "B<Order> I<allow,deny>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:733
+#: cupsd.conf.5:743
 msgid ""
 "Specifies that access is denied by default. Allow lines are then processed "
 "followed by Deny lines to determine whether a client may access a particular "
@@ -4966,13 +5421,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:733
+#: cupsd.conf.5:743
 #, no-wrap
 msgid "B<Order deny,allow>"
 msgstr "B<Order> I<deny,allow>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:736
+#: cupsd.conf.5:746
 msgid ""
 "Specifies that access is allowed by default. Deny lines are then processed "
 "followed by Allow lines to determine whether a client may access a "
@@ -4984,14 +5439,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:736
+#: cupsd.conf.5:746
 #, no-wrap
 msgid "B<Require group >I<group-name >[ I<group-name >... ]"
 msgstr "B<Require group> I<groupe> [I<groupe> ...]"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:739
+#: cupsd.conf.5:749
 msgid ""
 "Specifies that an authenticated user must be a member of one of the named "
 "groups."
@@ -5000,13 +5455,13 @@ msgstr ""
 "indiqués."
 
 #. type: TP
-#: cupsd.conf.man.in:739
+#: cupsd.conf.5:749
 #, no-wrap
 msgid "B<Require user {>I<user-name>|B<@>I<group-name>} ..."
 msgstr "B<Require user {>I<identifiant>|B<@>I<groupe>} ..."
 
 #. type: Plain text
-#: cupsd.conf.man.in:747
+#: cupsd.conf.5:757
 msgid ""
 "Specifies that an authenticated user must match one of the named users or be "
 "a member of one of the named groups.  The group name \"@SYSTEM\" corresponds "
@@ -5027,27 +5482,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:747
+#: cupsd.conf.5:757
 #, no-wrap
 msgid "B<Require valid-user>"
 msgstr "B<Require valid-user>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:750
+#: cupsd.conf.5:760
 msgid "Specifies that any authenticated user is acceptable."
 msgstr "Indiquer que tout utilisateur authentifié est autorisé."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:750
+#: cupsd.conf.5:760
 #, no-wrap
 msgid "B<Satisfy all>"
 msgstr "B<Satisfy> I<all>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:753
+#: cupsd.conf.5:763
 msgid ""
 "Specifies that all Allow, AuthType, Deny, Order, and Require conditions must "
 "be satisfied to allow access."
@@ -5057,13 +5512,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:753
+#: cupsd.conf.5:763
 #, no-wrap
 msgid "B<Satisfy any>"
 msgstr "B<Satisfy> I<any>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:757
+#: cupsd.conf.5:767
 msgid ""
 "Specifies that any a client may access a resource if either the "
 "authentication (AuthType/Require) or address (Allow/Deny/Order) conditions "
@@ -5076,13 +5531,13 @@ msgstr ""
 "l’authentification seulement pour les accès distants."
 
 #. type: SS
-#: cupsd.conf.man.in:757
+#: cupsd.conf.5:767
 #, no-wrap
 msgid "DIRECTIVES VALID WITHIN POLICY SECTIONS"
 msgstr "DIRECTIVES VALABLES À L’INTÉRIEUR DES SECTIONS DE POLITIQUE"
 
 #. type: Plain text
-#: cupsd.conf.man.in:759
+#: cupsd.conf.5:769
 msgid ""
 "The following directives may be placed inside Policy sections in the B<cupsd."
 "conf> file:"
@@ -5091,25 +5546,25 @@ msgstr ""
 "dans le fichier I<cupsd.conf> :"
 
 #. type: TP
-#: cupsd.conf.man.in:759
+#: cupsd.conf.5:769
 #, no-wrap
 msgid "B<JobPrivateAccess all>"
 msgstr "B<JobPrivateAccess> I<all>"
 
 #. type: TP
-#: cupsd.conf.man.in:761
+#: cupsd.conf.5:771
 #, no-wrap
 msgid "B<JobPrivateAccess default>"
 msgstr "B<JobPrivateAccess> I<défault>"
 
 #. type: TP
-#: cupsd.conf.man.in:763
+#: cupsd.conf.5:773
 #, no-wrap
 msgid "B<JobPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 msgstr "B<JobPrivateAccess >{I<identifiant>|B<@>I<groupe>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 
 #. type: Plain text
-#: cupsd.conf.man.in:772
+#: cupsd.conf.5:782
 msgid ""
 "Specifies an access list for a job's private values.  The \"default\" access "
 "list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's requesting-user-"
@@ -5125,31 +5580,31 @@ msgstr ""
 "I<cups-files.conf>."
 
 #. type: TP
-#: cupsd.conf.man.in:772
+#: cupsd.conf.5:782
 #, no-wrap
 msgid "B<JobPrivateValues all>"
 msgstr "B<JobPrivateValues> I<all>"
 
 #. type: TP
-#: cupsd.conf.man.in:774
+#: cupsd.conf.5:784
 #, no-wrap
 msgid "B<JobPrivateValues default>"
 msgstr "B<JobPrivateValues> I<défault>"
 
 #. type: TP
-#: cupsd.conf.man.in:776
+#: cupsd.conf.5:786
 #, no-wrap
 msgid "B<JobPrivateValues none>"
 msgstr "B<JobPrivateValues> I<none>"
 
 #. type: TP
-#: cupsd.conf.man.in:778
+#: cupsd.conf.5:788
 #, no-wrap
 msgid "B<JobPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
 msgstr "B<JobPrivateValues> I<nom_attribut> [ ... I<nom_attribut> ]"
 
 #. type: Plain text
-#: cupsd.conf.man.in:782
+#: cupsd.conf.5:792
 msgid ""
 "Specifies the list of job values to make private.  The \"default\" values "
 "are \"job-name\", \"job-originating-host-name\", \"job-originating-user-name"
@@ -5160,25 +5615,25 @@ msgstr ""
 "tâche », et « nom d'utilisateur ayant créé la tâche » et « téléphone »."
 
 #. type: TP
-#: cupsd.conf.man.in:782
+#: cupsd.conf.5:792
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess all>"
 msgstr "B<SubscriptionPrivateAccess> I<all>"
 
 #. type: TP
-#: cupsd.conf.man.in:784
+#: cupsd.conf.5:794
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess default>"
 msgstr "B<SubscriptionPrivateAccess> I<default>"
 
 #. type: TP
-#: cupsd.conf.man.in:786
+#: cupsd.conf.5:796
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 msgstr "B<SubscriptionPrivateAccess >{I<identifiant>|B<@>I<groupe>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 
 #. type: Plain text
-#: cupsd.conf.man.in:795
+#: cupsd.conf.5:805
 msgid ""
 "Specifies an access list for a subscription's private values.  The \"default"
 "\" access list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's "
@@ -5194,31 +5649,31 @@ msgstr ""
 "I<cups-files.conf>."
 
 #. type: TP
-#: cupsd.conf.man.in:795
+#: cupsd.conf.5:805
 #, no-wrap
 msgid "B<SubscriptionPrivateValues all>"
 msgstr "B<SubscriptionPrivateValues> I<all>"
 
 #. type: TP
-#: cupsd.conf.man.in:797
+#: cupsd.conf.5:807
 #, no-wrap
 msgid "B<SubscriptionPrivateValues default>"
 msgstr "B<SubscriptionPrivateValues> I<default>"
 
 #. type: TP
-#: cupsd.conf.man.in:799
+#: cupsd.conf.5:809
 #, no-wrap
 msgid "B<SubscriptionPrivateValues none>"
 msgstr "B<SubscriptionPrivateValues> I<none>"
 
 #. type: TP
-#: cupsd.conf.man.in:801
+#: cupsd.conf.5:811
 #, no-wrap
 msgid "B<SubscriptionPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
 msgstr "B<SubscriptionPrivateValues> I<nom_attribut> [ ... I<nom_attribut> ]"
 
 #. type: Plain text
-#: cupsd.conf.man.in:805
+#: cupsd.conf.5:815
 msgid ""
 "Specifies the list of subscription values to make private.  The \"default\" "
 "values are \"notify-events\", \"notify-pull-method\", \"notify-recipient-uri"
@@ -5230,14 +5685,14 @@ msgstr ""
 
 # type: SH
 #. type: SS
-#: cupsd.conf.man.in:805 cups-files.conf.man.in:233
+#: cupsd.conf.5:815 cups-files.conf.5:230
 #, no-wrap
 msgid "DEPRECATED DIRECTIVES"
 msgstr "DIRECTIVES OBSOLÈTES"
 
 #. #Classification
 #. type: Plain text
-#: cupsd.conf.man.in:808
+#: cupsd.conf.5:818
 msgid ""
 "The following directives are deprecated and will be removed in a future "
 "release of CUPS:"
@@ -5248,14 +5703,14 @@ msgstr ""
 # NOTE: bannière à traduire ?
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:808
+#: cupsd.conf.5:818
 #, no-wrap
 msgid "B<Classification >I<banner>"
 msgstr "B<Classification> I<bannière>"
 
 #. #ClassifyOverride
 #. type: Plain text
-#: cupsd.conf.man.in:815
+#: cupsd.conf.5:825
 msgid ""
 "Specifies the security classification of the server.  Any valid banner name "
 "can be used, including \"classified\", \"confidential\", \"secret\", "
@@ -5270,14 +5725,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:815
+#: cupsd.conf.5:825
 #, no-wrap
 msgid "B<ClassifyOverride Yes>"
 msgstr "B<ClassifyOverride> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:817
+#: cupsd.conf.5:827
 #, no-wrap
 msgid "B<ClassifyOverride No>"
 msgstr "B<ClassifyOverride> I<No>"
@@ -5285,7 +5740,7 @@ msgstr "B<ClassifyOverride> I<No>"
 # type: Plain text
 #. #PageLogFormat
 #. type: Plain text
-#: cupsd.conf.man.in:823
+#: cupsd.conf.5:833
 msgid ""
 "Specifies whether users may override the classification (cover page) of "
 "individual print jobs using the \"job-sheets\" option.  The default is \"No"
@@ -5296,13 +5751,13 @@ msgstr ""
 "l’option « job-sheets ». Par défaut « No »."
 
 #. type: TP
-#: cupsd.conf.man.in:823
+#: cupsd.conf.5:833
 #, no-wrap
 msgid "B<PageLogFormat >I<format-string>"
 msgstr "B<PageLogFormat> I<format_chaîne>"
 
 #. type: Plain text
-#: cupsd.conf.man.in:828
+#: cupsd.conf.5:838
 msgid ""
 "Specifies the format of PageLog lines.  Sequences beginning with percent (%) "
 "characters are replaced with the corresponding information, while all other "
@@ -5315,7 +5770,7 @@ msgstr ""
 "avec pour cent suivantes sont reconnues :"
 
 #. type: Plain text
-#: cupsd.conf.man.in:838
+#: cupsd.conf.5:848
 #, no-wrap
 msgid ""
 "    \"%%\" inserts a single percent character.\n"
@@ -5338,12 +5793,15 @@ msgstr ""
 
 #. #RIPCache
 #. type: Plain text
-#: cupsd.conf.man.in:843
+#: cupsd.conf.5:854
 #, fuzzy
 msgid ""
 "The default is the empty string, which disables page logging.  The string "
 "\"%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} "
-"%{media} %{sides}\" creates a page log with the standard items."
+"%{media} %{sides}\" creates a page log with the standard items.  Use \"%{job-"
+"impressions-completed}\" to insert the number of pages (sides) that were "
+"printed, or \"%{job-media-sheets-completed}\" to insert the number of sheets "
+"that were printed."
 msgstr ""
 "Par défaut, c’est une chaîne vide désactivant la journalisation. La chaîne "
 "« %p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} "
@@ -5352,14 +5810,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.man.in:843
+#: cupsd.conf.5:854
 #, no-wrap
 msgid "B<RIPCache >I<size>"
 msgstr "B<RIPCache> I<taille>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:847
+#: cupsd.conf.5:858
 msgid ""
 "Specifies the maximum amount of memory to use when converting documents into "
 "bitmaps for a printer.  The default is \"128m\"."
@@ -5368,7 +5826,37 @@ msgstr ""
 "documents en fichiers bitmap pour une imprimante. Par défaut, B<30>."
 
 #. type: Plain text
-#: cupsd.conf.man.in:849
+#: cupsd.conf.5:862
+#, fuzzy
+msgid ""
+"File, directory, and user configuration directives that used to be allowed "
+"in the B<cupsd.conf> file are now stored in the B<cups-files.conf>(5)  file "
+"instead in order to prevent certain types of privilege escalation attacks."
+msgstr ""
+"Le fichier I<cupsd.conf> configure l'ordonnanceur CUPS, B<cupsd>(8). Il est "
+"normalement situé dans le répertoire I</etc/cups>. B<Remarque :> les "
+"directives de configuration des fichiers, des répertoires et des "
+"utilisateurs, qui étaient jusqu'alors autorisées dans le fichier I<cupsd."
+"conf>, sont maintenant stockées dans le fichier I<cups-files.conf> afin de "
+"prévenir certains types d'attaque visant une augmentation de privilèges."
+
+#. type: Plain text
+#: cupsd.conf.5:869
+msgid ""
+"The scheduler MUST be restarted manually after making changes to the B<cupsd."
+"conf> file.  On Linux this is typically done using the B<systemctl>(8)  "
+"command, while on macOS the B<launchctl>(8)  command is used instead."
+msgstr ""
+
+#. type: Plain text
+#: cupsd.conf.5:873
+msgid ""
+"The @LOCAL macro name can be confusing since the system running B<cupsd> "
+"often belongs to a different set of subnets from its clients."
+msgstr ""
+
+#. type: Plain text
+#: cupsd.conf.5:875
 msgid ""
 "The B<cupsd.conf> file format is based on the Apache HTTP Server "
 "configuration file format."
@@ -5377,12 +5865,12 @@ msgstr ""
 "configuration du serveur HTTP Apache."
 
 #. type: Plain text
-#: cupsd.conf.man.in:851
+#: cupsd.conf.5:877
 msgid "Log everything with a maximum log file size of 32 megabytes:"
 msgstr "Tout journaliser dans un fichier de taille maximale de 32 Mo :"
 
 #. type: Plain text
-#: cupsd.conf.man.in:856
+#: cupsd.conf.5:882
 #, no-wrap
 msgid ""
 "    AccessLogLevel all\n"
@@ -5394,13 +5882,13 @@ msgstr ""
 "    MaxLogSize 32m\n"
 
 #. type: Plain text
-#: cupsd.conf.man.in:859
+#: cupsd.conf.5:885
 msgid "Require authentication for accesses from outside the 10. network:"
 msgstr ""
 "Demander l’authentification pour accéder au réseau 10… depuis l'extérieur :"
 
 #. type: Plain text
-#: cupsd.conf.man.in:868
+#: cupsd.conf.5:894
 #, no-wrap
 msgid ""
 "    E<lt>Location /E<gt>\n"
@@ -5421,7 +5909,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.man.in:878
+#: cupsd.conf.5:904
 msgid ""
 "B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<mime.convs>(5), "
 "B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), CUPS Online "
@@ -5431,46 +5919,40 @@ msgstr ""
 "B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), aide en "
 "ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
 
-# type: Plain text
-#. type: Plain text
-#: cupsd.conf.man.in:879 ipptoolfile.man:652
-msgid "Copyright \\[co] 2007-2019 by Apple Inc."
-msgstr "Copyright 2007-2019 par Apple Inc."
-
 # type: TH
 #. type: TH
-#: cupsd-helper.man:13
+#: cupsd-helper.8:10
 #, no-wrap
 msgid "cupsd-helper"
 msgstr "cupsd-helper"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd-helper.man:16
+#: cupsd-helper.8:13
 #, fuzzy
-msgid "cupsd-helper - cupsd helper programs"
+msgid "cupsd-helper - cupsd helper programs (deprecated)"
 msgstr "cupsd-helper - Programmes d’assistance pour cupsd"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd-helper.man:22
+#: cupsd-helper.8:19
 msgid "B<cups-deviced> I<request-id> I<limit> I<user-id> I<options>"
 msgstr "B<cups-deviced> I<id_requête> I<limite> I<identifiant> I<options>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd-helper.man:26
+#: cupsd-helper.8:23
 msgid "B<cups-driverd> B<cat> I<ppd-name>"
 msgstr "B<cups-driverd> B<cat> I<nom_ppd>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd-helper.man:32
+#: cupsd-helper.8:29
 msgid "B<cups-driverd> B<list> I<request_id> I<limit> I<options>"
 msgstr "B<cups-driverd list> I<id_requête> I<limite> I<options>"
 
 #. type: Plain text
-#: cupsd-helper.man:49
+#: cupsd-helper.8:46
 msgid ""
 "B<cups-exec> I<sandbox-profile> [ I<-g> I<group-id> ] [ I<-n> I<nice-"
 "value> ] [ I<-u> I<user-id> ] I</path/to/program> I<argv0> I<...> I<argvN>"
@@ -5479,7 +5961,7 @@ msgstr ""
 "[ B<-u> I<identifiant> ] I</chemin/vers/programme> I<argv0> I<...> I<argvN>"
 
 #. type: Plain text
-#: cupsd-helper.man:55
+#: cupsd-helper.8:52
 msgid ""
 "The B<cupsd-helper> programs perform long-running operations on behalf of "
 "the scheduler, B<cupsd>(8).  The B<cups-deviced> helper program runs each "
@@ -5492,7 +5974,7 @@ msgstr ""
 "imprimantes disponibles."
 
 #. type: Plain text
-#: cupsd-helper.man:57
+#: cupsd-helper.8:54
 msgid ""
 "The B<cups-driverd> helper program lists all available printer drivers, a "
 "subset of \"matching\" printer drivers, or a copy of a specific driver PPD "
@@ -5503,7 +5985,7 @@ msgstr ""
 "une copie d’un fichier de pilote PPD particulier."
 
 #. type: Plain text
-#: cupsd-helper.man:59
+#: cupsd-helper.8:56
 msgid ""
 "The B<cups-exec> helper program runs backends, filters, and other programs. "
 "On macOS these programs are run in a secure sandbox."
@@ -5513,7 +5995,7 @@ msgstr ""
 "dans un bac à sable (« sandbox »)."
 
 #. type: Plain text
-#: cupsd-helper.man:61
+#: cupsd-helper.8:58
 msgid ""
 "The B<cups-driverd> program looks for PPD and driver information files in "
 "the following directories:"
@@ -5522,7 +6004,7 @@ msgstr ""
 "d’information dans les répertoires suivants :"
 
 #. type: Plain text
-#: cupsd-helper.man:70
+#: cupsd-helper.8:67
 #, no-wrap
 msgid ""
 "    I</Library/Printers>\n"
@@ -5542,7 +6024,7 @@ msgstr ""
 "    I</usr/share/ppd>\n"
 
 #. type: Plain text
-#: cupsd-helper.man:77
+#: cupsd-helper.8:74
 msgid ""
 "PPD files can be compressed using the B<gzip>(1)  program or placed in "
 "compressed B<tar>(1)  archives to further reduce their size."
@@ -5551,7 +6033,7 @@ msgstr ""
 "incorporés dans une archive B<tar>(1) compressée pour diminuer leur taille."
 
 #. type: Plain text
-#: cupsd-helper.man:80
+#: cupsd-helper.8:77
 msgid ""
 "Driver information files must conform to the format defined in "
 "B<ppdcfile>(5)."
@@ -5561,7 +6043,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsd-helper.man:88
+#: cupsd-helper.8:89
 msgid ""
 "B<backend>(7), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), B<filter>(7), "
 "B<ppdcfile>(5), CUPS Online Help (http://localhost:631/help)"
@@ -5572,27 +6054,20 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: cupsd-logs.man:13
+#: cupsd-logs.5:10
 #, no-wrap
 msgid "cupsd-logs"
 msgstr "cupsd-logs"
 
-# type: TH
-#. type: TH
-#: cupsd-logs.man:13
-#, no-wrap
-msgid "8 November 2017"
-msgstr "8 novembre 2017"
-
 #. type: Plain text
-#: cupsd-logs.man:16
+#: cupsd-logs.5:13
 msgid "cupsd-logs - cupsd log files (access_log, error_log, and page_log)"
 msgstr ""
 "cupsd-logs - Fichiers de journalisation de cupsd (access_log, error_log et "
 "page_log)"
 
 #. type: Plain text
-#: cupsd-logs.man:24
+#: cupsd-logs.5:21
 msgid ""
 "B<cupsd>(8)  normally maintains three log files: I<access_log> to track "
 "requests that are submitted to the scheduler, I<error_log> to track progress "
@@ -5608,13 +6083,13 @@ msgstr ""
 "journalisées et leur lieu de stockage."
 
 #. type: SS
-#: cupsd-logs.man:24
+#: cupsd-logs.5:21
 #, no-wrap
 msgid "ACCESS LOG FILE FORMAT"
 msgstr "FORMAT DU FICHIER ACCES LOG"
 
 #. type: Plain text
-#: cupsd-logs.man:27
+#: cupsd-logs.5:24
 msgid ""
 "The I<access_log> file lists each HTTP resource that is accessed by a web "
 "browser or client.  Each line is in an extended version of the so-called "
@@ -5626,7 +6101,7 @@ msgstr ""
 "de compte-rendu web :"
 
 #. type: Plain text
-#: cupsd-logs.man:31
+#: cupsd-logs.5:28
 #, no-wrap
 msgid ""
 "    I<host group user date-time >\"I<method resource version>\" I<status bytes\n"
@@ -5636,12 +6111,12 @@ msgstr ""
 "      ipp-opération ipp-état>\n"
 
 #. type: Plain text
-#: cupsd-logs.man:34 cupsd-logs.man:129
+#: cupsd-logs.5:31 cupsd-logs.5:126
 msgid "For example:"
 msgstr "Par exemple :"
 
 #. type: Plain text
-#: cupsd-logs.man:47
+#: cupsd-logs.5:44
 #, no-wrap
 msgid ""
 "    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] \"POST / HTTP/1.1\" 200 317\n"
@@ -5669,7 +6144,7 @@ msgstr ""
 "      200 6667 - -\n"
 
 #. type: Plain text
-#: cupsd-logs.man:50
+#: cupsd-logs.5:47
 msgid ""
 "The I<host> field will normally only be an IP address unless you have "
 "enabled the HostNameLookups directive in the I<cupsd.conf> file or if the IP "
@@ -5680,12 +6155,12 @@ msgstr ""
 "corresponde à votre machine locale."
 
 #. type: Plain text
-#: cupsd-logs.man:52
+#: cupsd-logs.5:49
 msgid "The I<group> field always contains \"-\"."
 msgstr "Le champ I<groupe> contient toujours « - »."
 
 #. type: Plain text
-#: cupsd-logs.man:55
+#: cupsd-logs.5:52
 msgid ""
 "The I<user> field is the authenticated username of the requesting user.  If "
 "no username and password is supplied for the request then this field "
@@ -5696,7 +6171,7 @@ msgstr ""
 "requête, alors ce champ contient « - »."
 
 #. type: Plain text
-#: cupsd-logs.man:57
+#: cupsd-logs.5:54
 msgid ""
 "The I<date-time> field is the date and time of the request in local time and "
 "is in the format \"[DD/MON/YYYY:HH:MM:SS +ZZZZ]\"."
@@ -5705,7 +6180,7 @@ msgstr ""
 "dans le format « [DD/MON/YYYY:HH:MM:SS +ZZZZ] »."
 
 #. type: Plain text
-#: cupsd-logs.man:64
+#: cupsd-logs.5:61
 msgid ""
 "The I<method> field is the HTTP method used: \"GET\", \"HEAD\", \"OPTIONS\", "
 "\"POST\", or \"PUT\".  \"GET\" requests are used to get files from the "
@@ -5726,12 +6201,12 @@ msgstr ""
 "fichiers de configuration."
 
 #. type: Plain text
-#: cupsd-logs.man:66
+#: cupsd-logs.5:63
 msgid "The I<resource> field is the filename of the requested resource."
 msgstr "Le champ I<ressource> est le nom de fichier de la ressource demandée."
 
 #. type: Plain text
-#: cupsd-logs.man:69
+#: cupsd-logs.5:66
 msgid ""
 "The I<version> field is the HTTP specification version used by the client.  "
 "For CUPS clients this will always be \"HTTP/1.1\"."
@@ -5740,7 +6215,7 @@ msgstr ""
 "client. Pour les clients, cela sera toujours « HTTP/1.1 »."
 
 #. type: Plain text
-#: cupsd-logs.man:71
+#: cupsd-logs.5:68
 msgid ""
 "The I<status> field contains the HTTP result status of the request, as "
 "follows:"
@@ -5749,46 +6224,46 @@ msgstr ""
 "qui suit :"
 
 #. type: TP
-#: cupsd-logs.man:72
+#: cupsd-logs.5:69
 #, no-wrap
 msgid "200"
 msgstr "200"
 
 #. type: Plain text
-#: cupsd-logs.man:75
+#: cupsd-logs.5:72
 msgid "Successful operation."
 msgstr "Opération réussie."
 
 #. type: TP
-#: cupsd-logs.man:75
+#: cupsd-logs.5:72
 #, no-wrap
 msgid "201"
 msgstr "201"
 
 #. type: Plain text
-#: cupsd-logs.man:78
+#: cupsd-logs.5:75
 msgid "File created/modified successfully."
 msgstr "Fichier créé ou modifié avec succès."
 
 #. type: TP
-#: cupsd-logs.man:78
+#: cupsd-logs.5:75
 #, no-wrap
 msgid "304"
 msgstr "304"
 
 #. type: Plain text
-#: cupsd-logs.man:81
+#: cupsd-logs.5:78
 msgid "The requested file has not changed."
 msgstr "Le fichier demandé n’a pas changé."
 
 #. type: TP
-#: cupsd-logs.man:81
+#: cupsd-logs.5:78
 #, no-wrap
 msgid "400"
 msgstr "400"
 
 #. type: Plain text
-#: cupsd-logs.man:84
+#: cupsd-logs.5:81
 msgid ""
 "Bad HTTP request; typically this means that you have a malicious program "
 "trying to access your server."
@@ -5797,26 +6272,26 @@ msgstr ""
 "essaie d’accéder au serveur."
 
 #. type: TP
-#: cupsd-logs.man:84
+#: cupsd-logs.5:81
 #, no-wrap
 msgid "401"
 msgstr "401"
 
 #. type: Plain text
-#: cupsd-logs.man:87
+#: cupsd-logs.5:84
 msgid "Unauthorized, authentication (username + password) is required."
 msgstr ""
 "Non autorisé, une authentification est nécessaire (identifiant + mot de "
 "passe)."
 
 #. type: TP
-#: cupsd-logs.man:87
+#: cupsd-logs.5:84
 #, no-wrap
 msgid "403"
 msgstr "403"
 
 #. type: Plain text
-#: cupsd-logs.man:90
+#: cupsd-logs.5:87
 msgid ""
 "Access is forbidden; typically this means that a client tried to access a "
 "file or resource they do not have permission to access."
@@ -5825,24 +6300,24 @@ msgstr ""
 "un fichier ou à une ressource, sans la permission d’accès."
 
 #. type: TP
-#: cupsd-logs.man:90
+#: cupsd-logs.5:87
 #, no-wrap
 msgid "404"
 msgstr "404"
 
 #. type: Plain text
-#: cupsd-logs.man:93
+#: cupsd-logs.5:90
 msgid "The file or resource does not exist."
 msgstr "Ce fichier ou cette ressource n’existe pas."
 
 #. type: TP
-#: cupsd-logs.man:93
+#: cupsd-logs.5:90
 #, no-wrap
 msgid "405"
 msgstr "405"
 
 #. type: Plain text
-#: cupsd-logs.man:96
+#: cupsd-logs.5:93
 msgid ""
 "URL access method is not allowed; typically this means you have a web "
 "browser using your server as a proxy."
@@ -5851,13 +6326,13 @@ msgstr ""
 "que le navigateur web utilise le serveur comme un mandataire."
 
 #. type: TP
-#: cupsd-logs.man:96
+#: cupsd-logs.5:93
 #, no-wrap
 msgid "413"
 msgstr "413"
 
 #. type: Plain text
-#: cupsd-logs.man:99
+#: cupsd-logs.5:96
 msgid ""
 "Request too large; typically this means that a client tried to print a file "
 "larger than the MaxRequestSize allows."
@@ -5866,24 +6341,24 @@ msgstr ""
 "d’imprimer un fichier plus important que MaxRequestSize n’autorise."
 
 #. type: TP
-#: cupsd-logs.man:99
+#: cupsd-logs.5:96
 #, no-wrap
 msgid "426"
 msgstr "426"
 
 #. type: Plain text
-#: cupsd-logs.man:102
+#: cupsd-logs.5:99
 msgid "Upgrading to TLS-encrypted connection."
 msgstr "Basculer en connexion chiffrée avec TLS."
 
 #. type: TP
-#: cupsd-logs.man:102
+#: cupsd-logs.5:99
 #, no-wrap
 msgid "500"
 msgstr "500"
 
 #. type: Plain text
-#: cupsd-logs.man:105
+#: cupsd-logs.5:102
 msgid ""
 "Server error; typically this happens when the server is unable to open/"
 "create a file - consult the error_log file for details."
@@ -5893,13 +6368,13 @@ msgstr ""
 "plus de détails."
 
 #. type: TP
-#: cupsd-logs.man:105
+#: cupsd-logs.5:102
 #, no-wrap
 msgid "501"
 msgstr "501"
 
 #. type: Plain text
-#: cupsd-logs.man:108
+#: cupsd-logs.5:105
 msgid ""
 "The client requested encryption but encryption support is not enabled/"
 "compiled in."
@@ -5908,13 +6383,13 @@ msgstr ""
 "n’est pas activée ou intégrée."
 
 #. type: TP
-#: cupsd-logs.man:108
+#: cupsd-logs.5:105
 #, no-wrap
 msgid "505"
 msgstr "505"
 
 #. type: Plain text
-#: cupsd-logs.man:111
+#: cupsd-logs.5:108
 msgid ""
 "HTTP version number not supported; typically this means that you have a "
 "malicious program trying to access your server."
@@ -5923,7 +6398,7 @@ msgstr ""
 "programme malicieux essaie d’accéder au serveur."
 
 #. type: Plain text
-#: cupsd-logs.man:115
+#: cupsd-logs.5:112
 msgid ""
 "The I<bytes> field contains the number of bytes in the request.  For POST "
 "requests the bytes field contains the number of bytes of non-IPP data that "
@@ -5934,7 +6409,7 @@ msgstr ""
 "IPP reçues du client."
 
 #. type: Plain text
-#: cupsd-logs.man:117
+#: cupsd-logs.5:114
 msgid ""
 "The I<ipp-operation> field contains either \"-\" for non-IPP requests or the "
 "IPP operation name for POST requests containing an IPP request."
@@ -5943,7 +6418,7 @@ msgstr ""
 "le nom d’opération IPP pour les requêtes POST contenant une requête IPP."
 
 #. type: Plain text
-#: cupsd-logs.man:119
+#: cupsd-logs.5:116
 msgid ""
 "The I<ipp-status> field contains either \"-\" for non-IPP requests or the "
 "IPP status code name for POST requests containing an IPP response."
@@ -5952,13 +6427,13 @@ msgstr ""
 "nom de code d’état IPP pour les requêtes POST contenant une réponse IPP."
 
 #. type: SS
-#: cupsd-logs.man:119
+#: cupsd-logs.5:116
 #, no-wrap
 msgid "ERROR LOG FILE FORMAT"
 msgstr "FORMAT DU FICHIER DE JOURNAL D’ERREURS"
 
 #. type: Plain text
-#: cupsd-logs.man:123
+#: cupsd-logs.5:120
 msgid ""
 "The I<error_log> file lists messages from the scheduler - errors, warnings, "
 "etc. The LogLevel directive in the B<cupsd.conf>(5)  file controls which "
@@ -5969,13 +6444,13 @@ msgstr ""
 "détermine quels messages sont journalisés :"
 
 #. type: Plain text
-#: cupsd-logs.man:126
+#: cupsd-logs.5:123
 #, no-wrap
 msgid "    level date-time message\n"
 msgstr "    niveau date-heure message\n"
 
 #. type: Plain text
-#: cupsd-logs.man:143
+#: cupsd-logs.5:140
 #, no-wrap
 msgid ""
 "    I [20/May/1999:19:18:28 +0000] [Job 1] Queued on 'DeskJet' by 'mike'.\n"
@@ -6005,116 +6480,116 @@ msgstr ""
 "    I [20/May/1999:19:22:24 +0000] [Job 2] Canceled by 'mike'.\n"
 
 #. type: Plain text
-#: cupsd-logs.man:146
+#: cupsd-logs.5:143
 msgid "The I<level> field contains the type of message:"
 msgstr "Le champ I<level> contient le type of message :"
 
 #. type: TP
-#: cupsd-logs.man:146
+#: cupsd-logs.5:143
 #, no-wrap
 msgid "A"
 msgstr "A"
 
 #. type: Plain text
-#: cupsd-logs.man:149
+#: cupsd-logs.5:146
 msgid "Alert message (LogLevel alert)"
 msgstr "Message d’alerte (LogLevel alert)"
 
 #. type: TP
-#: cupsd-logs.man:149
+#: cupsd-logs.5:146
 #, no-wrap
 msgid "C"
 msgstr "C"
 
 #. type: Plain text
-#: cupsd-logs.man:152
+#: cupsd-logs.5:149
 msgid "Critical error message (LogLevel crit)"
 msgstr "Message d’erreur critique (LogLevel crit)"
 
 #. type: TP
-#: cupsd-logs.man:152
+#: cupsd-logs.5:149
 #, no-wrap
 msgid "D"
 msgstr "D"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd-logs.man:155
+#: cupsd-logs.5:152
 msgid "Debugging message (LogLevel debug)"
 msgstr "Messages de débogage (LogLevel debug)"
 
 # type: TP
 #. type: TP
-#: cupsd-logs.man:155
+#: cupsd-logs.5:152
 #, no-wrap
 msgid "d"
 msgstr "d"
 
 #. type: Plain text
-#: cupsd-logs.man:158
+#: cupsd-logs.5:155
 msgid "Detailed debugging message (LogLevel debug2)"
 msgstr "Messages de débogage détaillés (LogLevel debug2)"
 
 # type: TP
 #. type: TP
-#: cupsd-logs.man:158
+#: cupsd-logs.5:155
 #, no-wrap
 msgid "E"
 msgstr "E"
 
 #. type: Plain text
-#: cupsd-logs.man:161
+#: cupsd-logs.5:158
 msgid "Normal error message (LogLevel error)"
 msgstr "Messages d’erreur normaux (LogLevel error)"
 
 #. type: TP
-#: cupsd-logs.man:161
+#: cupsd-logs.5:158
 #, no-wrap
 msgid "I"
 msgstr "I"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd-logs.man:164
+#: cupsd-logs.5:161
 msgid "Informational message (LogLevel info)"
 msgstr "Messages d'information (LogLevel info)."
 
 #. type: TP
-#: cupsd-logs.man:164
+#: cupsd-logs.5:161
 #, no-wrap
 msgid "N"
 msgstr "N"
 
 # type: TP
 #. type: Plain text
-#: cupsd-logs.man:167
+#: cupsd-logs.5:164
 msgid "Notice message (LogLevel notice)"
 msgstr "Messages d’annonce (LogLevel notice)"
 
 #. type: TP
-#: cupsd-logs.man:167
+#: cupsd-logs.5:164
 #, no-wrap
 msgid "W"
 msgstr "W"
 
 #. type: Plain text
-#: cupsd-logs.man:170
+#: cupsd-logs.5:167
 msgid "Warning message (LogLevel warn)"
 msgstr "Messages d’avertissement (LogLevel warn)"
 
 #. type: TP
-#: cupsd-logs.man:170
+#: cupsd-logs.5:167
 #, no-wrap
 msgid "X"
 msgstr "X"
 
 #. type: Plain text
-#: cupsd-logs.man:173
+#: cupsd-logs.5:170
 msgid "Emergency error message (LogLevel emerg)"
 msgstr "Messages d’erreur urgents (LogLevel emerg)"
 
 #. type: Plain text
-#: cupsd-logs.man:175
+#: cupsd-logs.5:172
 msgid ""
 "The I<date-time> field contains the date and time of when the page started "
 "printing. The format of this field is identical to the data-time field in "
@@ -6125,7 +6600,7 @@ msgstr ""
 "fichier I<access_log>."
 
 #. type: Plain text
-#: cupsd-logs.man:178
+#: cupsd-logs.5:175
 msgid ""
 "The I<message> field contains a free-form textual message.  Messages from "
 "job filters are prefixed with \"[Job NNN]\" where \"NNN\" is the job ID."
@@ -6135,13 +6610,13 @@ msgstr ""
 "l’identifiant du travail."
 
 #. type: SS
-#: cupsd-logs.man:178
+#: cupsd-logs.5:175
 #, no-wrap
 msgid "PAGE LOG FILE FORMAT"
 msgstr "FORMAT DE PAGE DE JOURNAL"
 
 #. type: Plain text
-#: cupsd-logs.man:181
+#: cupsd-logs.5:178
 #, fuzzy
 msgid ""
 "The I<page_log> file lists the total number of pages (sheets) that are "
@@ -6151,7 +6626,7 @@ msgstr ""
 "l’imprimante. Par défaut, chaque ligne contient les informations suivantes :"
 
 #. type: Plain text
-#: cupsd-logs.man:185
+#: cupsd-logs.5:182
 #, fuzzy, no-wrap
 msgid ""
 "    I<printer user job-id date-time >B<total >I<num-sheets job-billing\n"
@@ -6162,7 +6637,7 @@ msgstr ""
 "      nom_travail media faces>\n"
 
 #. type: Plain text
-#: cupsd-logs.man:188
+#: cupsd-logs.5:185
 #, fuzzy
 msgid ""
 "For example the entry for a two page job called \"myjob\" might look like:"
@@ -6171,7 +6646,7 @@ msgstr ""
 "ressembler à :"
 
 #. type: Plain text
-#: cupsd-logs.man:192
+#: cupsd-logs.5:189
 #, no-wrap
 msgid ""
 "    DeskJet root 1 [20/May/1999:19:21:06 +0000] total 2 acme-123\n"
@@ -6181,7 +6656,7 @@ msgstr ""
 "      localhost myjob na_letter_8.5x11in one-sided\n"
 
 #. type: Plain text
-#: cupsd-logs.man:197
+#: cupsd-logs.5:194
 msgid ""
 "The PageLogFormat directive in the B<cupsd.conf>(5)  file can be used to "
 "change this information."
@@ -6190,7 +6665,7 @@ msgstr ""
 "pour changer cette information."
 
 #. type: Plain text
-#: cupsd-logs.man:200
+#: cupsd-logs.5:197
 msgid ""
 "The I<printer> field contains the name of the printer that printed the "
 "page.  If you send a job to a printer class, this field will contain the "
@@ -6201,7 +6676,7 @@ msgstr ""
 "nom de l’imprimante à laquelle la tâche est assignée."
 
 #. type: Plain text
-#: cupsd-logs.man:202
+#: cupsd-logs.5:199
 msgid ""
 "The I<user> field contains the name of the user (the IPP requesting-user-"
 "name attribute) that submitted this file for printing."
@@ -6210,14 +6685,14 @@ msgstr ""
 "requesting-user-name) qui a demandé l’impression."
 
 #. type: Plain text
-#: cupsd-logs.man:204
+#: cupsd-logs.5:201
 msgid "The I<job-id> field contains the job number of the page being printed."
 msgstr ""
 "Le champ I<identifiant_travail> contient le numéro de travail de la page en "
 "cours d’impression."
 
 #. type: Plain text
-#: cupsd-logs.man:207
+#: cupsd-logs.5:204
 msgid ""
 "The I<date-time> field contains the date and time of when the page started "
 "printing.  The format of this field is identical to the data-time field in "
@@ -6228,7 +6703,7 @@ msgstr ""
 "champ date_heure du fichier I<access_log>."
 
 #. type: Plain text
-#: cupsd-logs.man:209
+#: cupsd-logs.5:206
 #, fuzzy
 msgid ""
 "The I<num-sheets> field provides the total number of pages (sheets) that "
@@ -6239,7 +6714,7 @@ msgstr ""
 "(faces) faites pendant le travail."
 
 #. type: Plain text
-#: cupsd-logs.man:211
+#: cupsd-logs.5:208
 msgid ""
 "The I<job-billing> field contains a copy of the job-billing or job-account-"
 "id attributes provided with the IPP Create-Job or Print-Job requests or \"-"
@@ -6250,7 +6725,7 @@ msgstr ""
 "« - » si aucune n’a été faite."
 
 #. type: Plain text
-#: cupsd-logs.man:213
+#: cupsd-logs.5:210
 msgid ""
 "The I<job-originating-host-name> field contains the hostname or IP address "
 "of the client that printed the job."
@@ -6259,7 +6734,7 @@ msgstr ""
 "du client qui a imprimé le travail."
 
 #. type: Plain text
-#: cupsd-logs.man:215
+#: cupsd-logs.5:212
 msgid ""
 "The I<job-name> field contains a copy of the job-name attribute provided "
 "with the IPP Create-Job or Print-Job requests or \"-\" if none was provided."
@@ -6268,7 +6743,7 @@ msgstr ""
 "les requêtes IPP Create-Job ou Print-Job ou « - » si aucune n’a été faite."
 
 #. type: Plain text
-#: cupsd-logs.man:217
+#: cupsd-logs.5:214
 msgid ""
 "The I<media> field contains a copy of the media or media-col/media-size "
 "attribute provided with the IPP Create-Job or Print-Job requests or \"-\" if "
@@ -6279,7 +6754,7 @@ msgstr ""
 "n’a été faite."
 
 #. type: Plain text
-#: cupsd-logs.man:219
+#: cupsd-logs.5:216
 msgid ""
 "The I<sides> field contains a copy of the sides attribute provided with the "
 "IPP Create-Job or Print-Job requests or \"-\" if none was provided."
@@ -6289,7 +6764,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsd-logs.man:224
+#: cupsd-logs.5:221
 msgid ""
 "B<cupsd>(8), B<cupsd.conf>(5), B<cups-files.conf>(5), CUPS Online Help "
 "(http://localhost:631/help)"
@@ -6297,260 +6772,16 @@ msgstr ""
 "B<cupsd>(8), B<cupsd.conf>(5), B<cups-files.conf>(5), aide en ligne de CUPS "
 "E<lt>URL:I<http://localhost:631/help>E<gt>"
 
-# type: Plain text
-#. type: Plain text
-#: cupsd-logs.man:225 cups-files.conf.man.in:287 lpadmin.man:217
-#: lpoptions.man.in:121
-msgid "Copyright \\[co] 2007-2018 by Apple Inc."
-msgstr "Copyright 2007-2018 par Apple Inc."
-
-# type: TH
-#. type: TH
-#: cupsd.man.in:13
-#, no-wrap
-msgid "cupsd"
-msgstr "cupsd"
-
-# type: TH
-#. type: TH
-#: cupsd.man.in:13
-#, no-wrap
-msgid "12 February 2016"
-msgstr "12 février 2016"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:16
-msgid "cupsd - cups scheduler"
-msgstr "cupsd - ordonnanceur cups"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:35
-msgid ""
-"B<cupsd> [ B<-c> I<cupsd.conf> ] [ B<-f> ] [ B<-F> ] [ B<-h> ] [ B<-l> ] "
-"[ B<-s> I<cups-files.conf> ] [ B<-t> ]"
-msgstr ""
-"B<cupsd> [ B<-c> I<cupsd.conf> ] [ B<-f> ] [ B<-F> ] [ B<-h> ] [ B<-l> ] "
-"[ B<-s> I<cups-files.conf> ] [ B<-t> ]"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:40
-msgid ""
-"B<cupsd> is the scheduler for CUPS. It implements a printing system based "
-"upon the Internet Printing Protocol, version 2.1, and supports most of the "
-"requirements for IPP Everywhere. If no options are specified on the command-"
-"line then the default configuration file I</etc/cups/cupsd.conf> will be "
-"used."
-msgstr ""
-"B<cupsd> est l'ordonnanceur pour CUPS. Il fournit un système d'impression "
-"basé sur l'Internet Printing Protocol, version 2.1, et prend en charge la "
-"plupart des exigences de IPP Everywhere. Si aucune option n'est indiquée sur "
-"la ligne de commande, alors le fichier de configuration par défaut I</etc/"
-"cups/cupsd.conf> sera utilisé."
-
-# type: TH
-#. type: TP
-#: cupsd.man.in:41
-#, no-wrap
-msgid "B<-c>I<\\ cupsd.conf>"
-msgstr "B<-c>I<\\ cupsd.conf>"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:44
-msgid "Uses the named cupsd.conf configuration file."
-msgstr "Utiliser le fichier de configuration appelé cupsd.conf."
-
-#. type: TP
-#: cupsd.man.in:44
-#, no-wrap
-msgid "B<-f>"
-msgstr "B<-f>"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:49
-msgid ""
-"Run B<cupsd> in the foreground; the default is to run in the background as a "
-"\"daemon\"."
-msgstr ""
-"Forcer B<cupsd> à tourner au premier plan ; par défaut, cupsd tourne en "
-"arrière-plan comme « démon »."
-
-#. type: TP
-#: cupsd.man.in:49
-#, no-wrap
-msgid "B<-F>"
-msgstr "B<-F>"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:57
-msgid ""
-"Run B<cupsd> in the foreground but detach the process from the controlling "
-"terminal and current directory. This is useful for running B<cupsd> from "
-"B<init>(8)."
-msgstr ""
-"Forcer B<cupsd> à tourner au premier plan, mais détacher le processus du "
-"terminal de contrôle et du répertoire de travail. Cette option est utile "
-"pour lancer B<cupsd> depuis B<init>(8)."
-
-#. type: TP
-#: cupsd.man.in:57 ../test/ippserver.man:89 ipptool.man:158 lpr.man:91
-#, no-wrap
-msgid "B<-h>"
-msgstr "B<-h>"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:60
-msgid "Shows the program usage."
-msgstr "Afficher un message d'aide."
-
-#. type: TP
-#: cupsd.man.in:60 ippfind.man:77 ipptool.man:167 lpinfo.man:74
-#: lpoptions.man.in:84 lpq.man:56 lpr.man:94 lpstat.man:107
-#, no-wrap
-msgid "B<-l>"
-msgstr "B<-l>"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:68
-msgid ""
-"This option is passed to B<cupsd> when it is run from B<launchd>(8)  or "
-"B<systemd>(8)."
-msgstr ""
-"Cette option est passée à B<cupsd> lorsqu'il est lancé par B<launchd>(8) ou "
-"B<systemd>(8)."
-
-# type: TH
-#. type: TP
-#: cupsd.man.in:68
-#, no-wrap
-msgid "B<-s>I<\\ cups-files.conf>"
-msgstr "B<-s>I<\\ cups-files.conf>"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:71 cupsfilter.man:75
-msgid "Uses the named cups-files.conf configuration file."
-msgstr "Utiliser le fichier de configuration appelé cups-files.conf."
-
-#. type: TP
-#: cupsd.man.in:71 ipptool.man:179 lpstat.man:125 ppdc.man:76
-#, no-wrap
-msgid "B<-t>"
-msgstr "B<-t>"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:74
-msgid "Test the configuration file for syntax errors."
-msgstr "Tester le fichier de configuration pour les erreurs de syntaxe."
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:83
-#, no-wrap
-msgid ""
-"I</etc/cups/classes.conf>\n"
-"I</etc/cups/cups-files.conf>\n"
-"I</etc/cups/cupsd.conf>\n"
-"I</usr/share/cups/mime/mime.convs>\n"
-"I</usr/share/cups/mime/mime.types>\n"
-"I</etc/cups/printers.conf>\n"
-"I</etc/cups/subscriptions.conf>\n"
-msgstr ""
-"I</etc/cups/classes.conf>\n"
-"I</etc/cups/cups-files.conf>\n"
-"I</etc/cups/cupsd.conf>\n"
-"I</usr/share/cups/mime/mime.convs>\n"
-"I</usr/share/cups/mime/mime.types>\n"
-"I</etc/cups/printers.conf>\n"
-"I</etc/cups/subscriptions.conf>\n"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:87
-msgid ""
-"B<cupsd> implements all of the required IPP/2.1 attributes and operations. "
-"It also implements several CUPS-specific administrative operations."
-msgstr ""
-"B<cupsd> fournit tous les attributs et opérations d’IPP/2.1. Il implémente "
-"aussi plusieurs opérations d'administration spécifiques à CUPS."
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:91
-msgid "Run B<cupsd> in the background with the default configuration file:"
-msgstr ""
-"Forcer B<cupsd> à tourner en arrière-plan avec le fichier de configuration "
-"par défaut :"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:94
-#, no-wrap
-msgid "    cupsd\n"
-msgstr "    cupsd\n"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:98
-msgid "Test a configuration file called I<test.conf>:"
-msgstr "Tester un fichier de configuration appelé I<test.conf> :"
-
-#. type: Plain text
-#: cupsd.man.in:101
-#, no-wrap
-msgid "    cupsd -t -c test.conf\n"
-msgstr "    cupsd -t -c test.conf\n"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:107
-msgid ""
-"Run B<cupsd> in the foreground with a test configuration file called I<test."
-"conf>:"
-msgstr ""
-"Forcer B<cupsd> à tourner au premier plan avec un fichier de configuration "
-"appelé I<test.conf> :"
-
-# type: TH
-#. type: Plain text
-#: cupsd.man.in:110
-#, no-wrap
-msgid "    cupsd -f -c test.conf\n"
-msgstr "    cupsd -f -c test.conf\n"
-
-# type: Plain text
-#. type: Plain text
-#: cupsd.man.in:128
-msgid ""
-"B<backend>(7), B<classes.conf>(5), B<cups>(1), B<cups-files.conf>(5), B<cups-"
-"lpd>(8), B<cupsd.conf>(5), B<cupsd-helper>(8), B<cupsd-logs>(8), "
-"B<filter>(7), B<launchd>(8), B<mime.convs>(5), B<mime.types>(5), B<printers."
-"conf>(5), B<systemd>(8), CUPS Online Help (http://localhost:631/help)"
-msgstr ""
-"B<backend>(7), B<classes.conf>(5), B<cups>(1), B<cups-files.conf>(5), B<cups-"
-"lpd>(8), B<cupsd.conf>(5), B<cupsd-helper>(8), B<cupsd-logs>(8), "
-"B<filter>(7), B<launchd>(8), B<mime.convs>(5), B<mime.types>(5), B<printers."
-"conf>(5), B<systemd>(8), aide en ligne de CUPS E<lt>URL:I<http://"
-"localhost:631/help>E<gt>"
-
 # type: TH
 #. type: TH
-#: cupsenable.man:13
+#: cupsenable.8:10
 #, no-wrap
 msgid "cupsenable"
 msgstr "cupsenable"
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:16
+#: cupsenable.8:13
 msgid "cupsdisable, cupsenable - stop/start printers and classes"
 msgstr ""
 "cupsdisable, cupsenable - Arrêter/démarrer des imprimantes ou classes "
@@ -6558,7 +6789,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:34
+#: cupsenable.8:31
 msgid ""
 "B<cupsdisable> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h "
 ">I<server>[B<:>I<port>] ] [ B<-r> I<reason> ] [ B<--hold> ] I<destination(s)>"
@@ -6568,7 +6799,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:49
+#: cupsenable.8:46
 msgid ""
 "B<cupsenable> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h >I<server>[B<:"
 ">I<port>] ] [ B<--release> ] I<destination(s)>"
@@ -6578,7 +6809,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:54
+#: cupsenable.8:51
 msgid ""
 "B<cupsenable> starts the named printers or classes while B<cupsdisable> "
 "stops the named printers or classes."
@@ -6587,49 +6818,49 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:56
+#: cupsenable.8:53
 msgid "The following options may be used:"
 msgstr "Les options suivantes sont reconnues :"
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:59
+#: cupsenable.8:56
 msgid "Forces encryption of the connection to the server."
 msgstr "Forcer le chiffrement de la connexion au serveur."
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:62
+#: cupsenable.8:59
 msgid "Uses the specified username when connecting to the server."
 msgstr "Utiliser l'identifiant indiqué pour les connexions au serveur."
 
 #. type: TP
-#: cupsenable.man:62 ipptool.man:149 lp.man:108
+#: cupsenable.8:59 ipptool.1:154 lp.1:105
 #, no-wrap
 msgid "B<-c>"
 msgstr "B<-c>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:65
+#: cupsenable.8:62
 msgid "Cancels all jobs on the named destination."
 msgstr "Annuler tous les travaux sur la destination donnée."
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:68
+#: cupsenable.8:65
 msgid "Uses the specified server and port."
 msgstr "Utiliser le serveur et le port indiqués."
 
 # type: TP
 #. type: TP
-#: cupsenable.man:68
+#: cupsenable.8:65
 #, no-wrap
 msgid "B<--hold>"
 msgstr "B<--hold>"
 
 #. type: Plain text
-#: cupsenable.man:72
+#: cupsenable.8:69
 msgid ""
 "Holds remaining jobs on the named printer.  Useful for allowing the current "
 "job to complete before performing maintenance."
@@ -6639,14 +6870,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsenable.man:72
+#: cupsenable.8:69
 #, no-wrap
 msgid "B<-r \">I<reason>B<\">"
 msgstr "B<-r \">I<raison>B<\">"
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:76
+#: cupsenable.8:73
 msgid ""
 "Sets the message associated with the stopped state.  If no reason is "
 "specified then the message is set to \"Reason Unknown\"."
@@ -6655,13 +6886,13 @@ msgstr ""
 "indiquée, alors le message sera « Reason Unknown » (« Raison Inconnue »)."
 
 #. type: TP
-#: cupsenable.man:76
+#: cupsenable.8:73
 #, no-wrap
 msgid "B<--release>"
 msgstr "B<--release>"
 
 #. type: Plain text
-#: cupsenable.man:80
+#: cupsenable.8:77
 msgid ""
 "Releases pending jobs for printing.  Use after running B<cupsdisable> with "
 "the I<--hold> option to resume printing."
@@ -6671,7 +6902,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:83 lp.man:235
+#: cupsenable.8:80 lp.1:199 lpadmin.8:200
 msgid ""
 "Unlike the System V printing system, CUPS allows printer names to contain "
 "any printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer "
@@ -6684,7 +6915,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:88
+#: cupsenable.8:85
 msgid ""
 "The System V versions of these commands are B<disable> and B<enable>, "
 "respectively.  They have been renamed to avoid conflicts with the "
@@ -6696,7 +6927,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:91
+#: cupsenable.8:88
 msgid ""
 "The CUPS versions of B<disable> and B<enable> may ask the user for an access "
 "password depending on the printing system configuration.  This differs from "
@@ -6709,7 +6940,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsenable.man:99
+#: cupsenable.8:96
 msgid ""
 "B<cupsaccept>(8), B<cupsreject>(8), B<cancel>(1), B<lp>(1), B<lpadmin>(8), "
 "B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
@@ -6720,21 +6951,14 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: cups-files.conf.man.in:13
+#: cups-files.conf.5:10
 #, no-wrap
 msgid "cups-files.conf"
 msgstr "cups-files.conf"
 
-# type: TH
-#. type: TH
-#: cups-files.conf.man.in:13
-#, no-wrap
-msgid "25 February 2018 "
-msgstr "25 février 2018"
-
 # type: Plain text
 #. type: Plain text
-#: cups-files.conf.man.in:16
+#: cups-files.conf.5:13
 msgid "cups-files.conf - file and directory configuration file for cups"
 msgstr ""
 "cups-files.conf - Fichier de configuration des fichiers et dossiers du "
@@ -6742,7 +6966,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cups-files.conf.man.in:20
+#: cups-files.conf.5:17
 msgid ""
 "The B<cups-files.conf> file configures the files and directories used by the "
 "CUPS scheduler, B<cupsd>(8).  It is normally located in the I</etc/cups> "
@@ -6752,43 +6976,59 @@ msgstr ""
 "dossiers utilisés par l'ordonnanceur CUPS, B<cupsd>(8). Il est généralement "
 "situé dans le répertoire I</etc/cups>."
 
+# type: Plain text
+#. type: Plain text
+#: cups-files.conf.5:22 mailto.conf.5:20
+msgid ""
+"Each line in the file can be a configuration directive, a blank line, or a "
+"comment.  Configuration directives typically consist of a name and zero or "
+"more values separated by whitespace.  The configuration directive name and "
+"values are case-insensitive.  Comment lines start with the # character."
+msgstr ""
+"Chaque ligne de ce fichier est soit une directive de configuration, une "
+"ligne vide ou un commentaire. Les directives de configuration consistent "
+"classiquement en un nom suivi de zéro ou plusieurs valeurs séparées par des "
+"espaces. Les noms des directives de configuration et les valeurs ne sont pas "
+"sensibles à la casse. Les lignes de commentaires débutent par le caractère "
+"« # »."
+
 # type: Plain text
 #. #AccessLog
 #. type: Plain text
-#: cups-files.conf.man.in:29
+#: cups-files.conf.5:26
 msgid "The following directives are understood by B<cupsd>(8):"
 msgstr "Les directives suivantes sont comprises par B<cupsd>(8) :"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:29
+#: cups-files.conf.5:26
 #, no-wrap
 msgid "B<AccessLog>"
 msgstr "B<AccessLog>"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:31
+#: cups-files.conf.5:28
 #, no-wrap
 msgid "B<AccessLog >I<filename>"
 msgstr "B<AccessLog> I<nom_fichier>"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:33
+#: cups-files.conf.5:30
 #, no-wrap
 msgid "B<AccessLog stderr>"
 msgstr "B<AccessLog stderr>"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:35
+#: cups-files.conf.5:32
 #, no-wrap
 msgid "B<AccessLog syslog>"
 msgstr "B<AccessLog syslog>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:42
+#: cups-files.conf.5:39
 msgid ""
 "Defines the access log filename.  Specifying a blank filename disables "
 "access log generation.  The value \"stderr\" causes log entries to be sent "
@@ -6807,27 +7047,27 @@ msgstr ""
 "utilisant la chaîne « %s », par exemple :"
 
 #. type: Plain text
-#: cups-files.conf.man.in:45
+#: cups-files.conf.5:42
 #, no-wrap
 msgid "    AccessLog /var/log/cups/%s-access_log\n"
 msgstr "    AccessLog /var/log/cups/%s-access_log\n"
 
 #. #CacheDir
 #. type: Plain text
-#: cups-files.conf.man.in:49
+#: cups-files.conf.5:46
 msgid "The default is \"/var/log/cups/access_log\"."
 msgstr "Par défaut, I</var/log/cups/access_log>."
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:49
+#: cups-files.conf.5:46
 #, no-wrap
 msgid "B<CacheDir >I<directory>"
 msgstr "B<CacheDir> I<répertoire>"
 
 #. #ConfigFilePerm
 #. type: Plain text
-#: cups-files.conf.man.in:54
+#: cups-files.conf.5:51
 msgid ""
 "Specifies the directory to use for long-lived temporary (cache) files.  The "
 "default is \"/var/spool/cups/cache\" or \"/var/cache/cups\" depending on the "
@@ -6839,14 +7079,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:54
+#: cups-files.conf.5:51
 #, no-wrap
 msgid "B<ConfigFilePerm >I<mode>"
 msgstr "B<ConfigFilePerm> I<mode>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-files.conf.man.in:58
+#: cups-files.conf.5:55
 msgid ""
 "Specifies the permissions for all configuration files that the scheduler "
 "writes.  The default is \"0644\" on macOS and \"0640\" on all other "
@@ -6858,7 +7098,7 @@ msgstr ""
 
 #. #CreateSelfSignedCerts
 #. type: Plain text
-#: cups-files.conf.man.in:63
+#: cups-files.conf.5:60
 msgid ""
 "B<Note:> The permissions for the I<printers.conf> file are currently masked "
 "to only allow access from the scheduler user (typically root).  This is done "
@@ -6874,20 +7114,20 @@ msgstr ""
 "de sécurité ne peut être désactivée."
 
 #. type: TP
-#: cups-files.conf.man.in:63
+#: cups-files.conf.5:60
 #, no-wrap
 msgid "B<CreateSelfSignedCerts yes>"
 msgstr "B<CreateSelfSignedCerts> I<yes>"
 
 #. type: TP
-#: cups-files.conf.man.in:65
+#: cups-files.conf.5:62
 #, no-wrap
 msgid "B<CreateSelfSignedCerts no>"
 msgstr "B<CreateSelfSignedCerts> I<no>"
 
 #. #DataDir
 #. type: Plain text
-#: cups-files.conf.man.in:70
+#: cups-files.conf.5:67
 msgid ""
 "Specifies whether the scheduler automatically creates self-signed "
 "certificates for client connections using TLS.  The default is yes."
@@ -6898,7 +7138,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:70
+#: cups-files.conf.5:67
 #, no-wrap
 msgid "B<DataDir >I<path>"
 msgstr "B<DataDir> I<chemin>"
@@ -6906,7 +7146,7 @@ msgstr "B<DataDir> I<chemin>"
 # type: Plain text
 #. #DocumentRoot
 #. type: Plain text
-#: cups-files.conf.man.in:75
+#: cups-files.conf.5:72
 msgid ""
 "Specifies the directory where data files can be found.  The default is "
 "usually \"/usr/share/cups\"."
@@ -6916,7 +7156,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:75
+#: cups-files.conf.5:72
 #, no-wrap
 msgid "B<DocumentRoot >I<directory>"
 msgstr "B<DocumentRoot> I<répertoire>"
@@ -6924,7 +7164,7 @@ msgstr "B<DocumentRoot> I<répertoire>"
 # type: Plain text
 #. #ErrorLog
 #. type: Plain text
-#: cups-files.conf.man.in:80
+#: cups-files.conf.5:77
 msgid ""
 "Specifies the root directory for the CUPS web interface content.  The "
 "default is usually \"/usr/share/doc/cups\"."
@@ -6934,34 +7174,34 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:80
+#: cups-files.conf.5:77
 #, no-wrap
 msgid "B<ErrorLog>"
 msgstr "B<ErrorLog>"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:82
+#: cups-files.conf.5:79
 #, no-wrap
 msgid "B<ErrorLog >I<filename>"
 msgstr "B<ErrorLog> I<nom_fichier>"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:84
+#: cups-files.conf.5:81
 #, no-wrap
 msgid "B<ErrorLog stderr>"
 msgstr "B<ErrorLog stderr>"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:86
+#: cups-files.conf.5:83
 #, no-wrap
 msgid "B<ErrorLog syslog>"
 msgstr "B<ErrorLog syslog>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:93
+#: cups-files.conf.5:90
 msgid ""
 "Defines the error log filename.  Specifying a blank filename disables error "
 "log generation.  The value \"stderr\" causes log entries to be sent to the "
@@ -6980,37 +7220,37 @@ msgstr ""
 "utilisant la chaîne « %s », par exemple :"
 
 #. type: Plain text
-#: cups-files.conf.man.in:96
+#: cups-files.conf.5:93
 #, no-wrap
 msgid "    ErrorLog /var/log/cups/%s-error_log\n"
 msgstr "    ErrorLog /var/log/cups/%s-error_log\n"
 
 #. #FatalErrors
 #. type: Plain text
-#: cups-files.conf.man.in:100
+#: cups-files.conf.5:97
 msgid "The default is \"/var/log/cups/error_log\"."
 msgstr "Par défaut, I</var/log/cups/error_log>."
 
 #. type: TP
-#: cups-files.conf.man.in:100
+#: cups-files.conf.5:97
 #, no-wrap
 msgid "B<FatalErrors none>"
 msgstr "B<FatalErrors> I<none>"
 
 #. type: TP
-#: cups-files.conf.man.in:102
+#: cups-files.conf.5:99
 #, no-wrap
 msgid "B<FatalErrors all >I<-kind >[ ... I<-kind >]"
 msgstr "B<FatalErrors all >I<-type> [... I<-type>]"
 
 #. type: TP
-#: cups-files.conf.man.in:104
+#: cups-files.conf.5:101
 #, no-wrap
 msgid "B<FatalErrors >I<kind >[ ... I<kind >]"
 msgstr "B<FatalErrors> I<type> [... I<type>]"
 
 #. type: Plain text
-#: cups-files.conf.man.in:109
+#: cups-files.conf.5:106
 msgid ""
 "Specifies which errors are fatal, causing the scheduler to exit.  The "
 "default is \"config\".  The I<kind> strings are:"
@@ -7019,35 +7259,35 @@ msgstr ""
 "Par défaut, « config ». Les chaînes I<type> sont les suivantes :"
 
 #. type: TP
-#: cups-files.conf.man.in:110
+#: cups-files.conf.5:107
 #, no-wrap
 msgid "B<none>"
 msgstr "B<none>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:113
+#: cups-files.conf.5:110
 msgid "No errors are fatal."
 msgstr "Aucune erreur n’est fatale."
 
 #. type: TP
-#: cups-files.conf.man.in:113
+#: cups-files.conf.5:110
 #, no-wrap
 msgid "B<all>"
 msgstr "B<all>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:116
+#: cups-files.conf.5:113
 msgid "All of the errors below are fatal."
 msgstr "Toutes les erreurs ci-dessous sont fatales."
 
 #. type: TP
-#: cups-files.conf.man.in:116
+#: cups-files.conf.5:113
 #, no-wrap
 msgid "B<browse>"
 msgstr "B<browse>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:119
+#: cups-files.conf.5:116
 msgid ""
 "Browsing initialization errors are fatal, for example failed connections to "
 "the DNS-SD daemon."
@@ -7057,25 +7297,25 @@ msgstr ""
 
 # type: Plain text
 #. type: TP
-#: cups-files.conf.man.in:119
+#: cups-files.conf.5:116
 #, no-wrap
 msgid "B<config>"
 msgstr "B<config>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-files.conf.man.in:122
+#: cups-files.conf.5:119
 msgid "Configuration file syntax errors are fatal."
 msgstr "Les erreurs de syntaxe du fichier de configuration sont fatales."
 
 #. type: TP
-#: cups-files.conf.man.in:122
+#: cups-files.conf.5:119
 #, no-wrap
 msgid "B<listen>"
 msgstr "B<listen>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:125
+#: cups-files.conf.5:122
 msgid ""
 "Listen or Port errors are fatal, except for IPv6 failures on the loopback or "
 "\"any\" addresses."
@@ -7084,25 +7324,25 @@ msgstr ""
 "sur loopback ou les adresses « any »."
 
 #. type: TP
-#: cups-files.conf.man.in:125
+#: cups-files.conf.5:122
 #, no-wrap
 msgid "B<log>"
 msgstr "B<log>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:128
+#: cups-files.conf.5:125
 msgid "Log file creation or write errors are fatal."
 msgstr ""
 "Les erreurs de création ou d’écriture du fichier de journal sont fatales."
 
 #. type: TP
-#: cups-files.conf.man.in:128
+#: cups-files.conf.5:125
 #, no-wrap
 msgid "B<permissions>"
 msgstr "B<permissions>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:131
+#: cups-files.conf.5:128
 msgid ""
 "Bad startup file permissions are fatal, for example shared TLS certificate "
 "and key files with world-read permissions."
@@ -7112,7 +7352,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:133
+#: cups-files.conf.5:130
 #, no-wrap
 msgid "B<Group >I<group-name-or-number>"
 msgstr "B<Group> I<nom_groupe>-ou-I<identifiant_numérique>"
@@ -7120,7 +7360,7 @@ msgstr "B<Group> I<nom_groupe>-ou-I<identifiant_numérique>"
 # type: Plain text
 #. #LogFilePerm
 #. type: Plain text
-#: cups-files.conf.man.in:138
+#: cups-files.conf.5:135
 msgid ""
 "Specifies the group name or ID that will be used when executing external "
 "programs.  The default group is operating system specific but is usually \"lp"
@@ -7132,7 +7372,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:138
+#: cups-files.conf.5:135
 #, no-wrap
 msgid "B<LogFilePerm >I<mode>"
 msgstr "B<LogFilePerm> I<mode>"
@@ -7140,7 +7380,7 @@ msgstr "B<LogFilePerm> I<mode>"
 # type: Plain text
 #. #PageLog
 #. type: Plain text
-#: cups-files.conf.man.in:143
+#: cups-files.conf.5:140
 msgid ""
 "Specifies the permissions of all log files that the scheduler writes.  The "
 "default is \"0644\"."
@@ -7150,27 +7390,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:143
+#: cups-files.conf.5:140
 #, no-wrap
 msgid "B<PageLog >[ I<filename> ]"
 msgstr "B<PageLog> [ I<nom_fichier> ]"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:145
+#: cups-files.conf.5:142
 #, no-wrap
 msgid "B<PageLog stderr>"
 msgstr "B<PageLog stderr>"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:147
+#: cups-files.conf.5:144
 #, no-wrap
 msgid "B<PageLog syslog>"
 msgstr "B<PageLog syslog>"
 
 #. type: Plain text
-#: cups-files.conf.man.in:154
+#: cups-files.conf.5:151
 msgid ""
 "Defines the page log filename.  The value \"stderr\" causes log entries to "
 "be sent to the standard error file when the scheduler is running in the "
@@ -7189,27 +7429,27 @@ msgstr ""
 "utilisant la chaîne « %s », par exemple :"
 
 #. type: Plain text
-#: cups-files.conf.man.in:157
+#: cups-files.conf.5:154
 #, no-wrap
 msgid "    PageLog /var/log/cups/%s-page_log\n"
 msgstr "    PageLog /var/log/cups/%s-page_log\n"
 
 #. #PassEnv
 #. type: Plain text
-#: cups-files.conf.man.in:161
+#: cups-files.conf.5:158
 msgid "The default is \"/var/log/cups/page_log\"."
 msgstr "Par défaut, I</var/log/cups/page_log>."
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:161
+#: cups-files.conf.5:158
 #, no-wrap
 msgid "B<PassEnv >I<variable >[ ... I<variable >]"
 msgstr "B<PassEnv> I<variable> [... I<variable>]"
 
 #. #RemoteRoot
 #. type: Plain text
-#: cups-files.conf.man.in:166
+#: cups-files.conf.5:163
 msgid ""
 "Passes the specified environment variable(s) to child processes.  Note: the "
 "standard CUPS filter and backend environment variables cannot be overridden "
@@ -7218,7 +7458,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:166
+#: cups-files.conf.5:163
 #, no-wrap
 msgid "B<RemoteRoot >I<username>"
 msgstr "B<RemoteRoot> I<identifiant>"
@@ -7226,7 +7466,7 @@ msgstr "B<RemoteRoot> I<identifiant>"
 # type: Plain text
 #. #RequestRoot
 #. type: Plain text
-#: cups-files.conf.man.in:171
+#: cups-files.conf.5:168
 msgid ""
 "Specifies the username that is associated with unauthenticated accesses by "
 "clients claiming to be the root user.  The default is \"remroot\"."
@@ -7236,7 +7476,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:171
+#: cups-files.conf.5:168
 #, no-wrap
 msgid "B<RequestRoot >I<directory>"
 msgstr "B<RequestRoot> I<répertoire>"
@@ -7244,7 +7484,7 @@ msgstr "B<RequestRoot> I<répertoire>"
 # type: Plain text
 #. #Sandboxing
 #. type: Plain text
-#: cups-files.conf.man.in:176
+#: cups-files.conf.5:173
 msgid ""
 "Specifies the directory that contains print jobs and other HTTP request "
 "data.  The default is \"/var/spool/cups\"."
@@ -7253,20 +7493,20 @@ msgstr ""
 "requêtes HTTP. Par défaut, I</var/spool/cups>."
 
 #. type: TP
-#: cups-files.conf.man.in:176
+#: cups-files.conf.5:173
 #, no-wrap
 msgid "B<Sandboxing relaxed>"
 msgstr "B<Sandboxing> I<relaxed>"
 
 #. type: TP
-#: cups-files.conf.man.in:178
+#: cups-files.conf.5:175
 #, no-wrap
 msgid "B<Sandboxing strict>"
 msgstr "B<Sandboxing> I<strict>"
 
 #. #ServerBin
 #. type: Plain text
-#: cups-files.conf.man.in:184
+#: cups-files.conf.5:181
 msgid ""
 "Specifies the level of security sandboxing that is applied to print filters, "
 "backends, and other child processes of the scheduler.  The default is "
@@ -7279,14 +7519,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:184
+#: cups-files.conf.5:181
 #, no-wrap
 msgid "B<ServerBin >I<directory>"
 msgstr "B<ServerBin> I<répertoire>"
 
 #. #ServerKeychain
 #. type: Plain text
-#: cups-files.conf.man.in:189
+#: cups-files.conf.5:186
 msgid ""
 "Specifies the directory containing the backends, CGI programs, filters, "
 "helper programs, notifiers, and port monitors.  The default is \"/usr/lib/"
@@ -7298,14 +7538,14 @@ msgstr ""
 "usr/libexec/cups> en fonction de la plateforme."
 
 #. type: TP
-#: cups-files.conf.man.in:189
+#: cups-files.conf.5:186
 #, no-wrap
 msgid "B<ServerKeychain >I<path>"
 msgstr "B<ServerKeychain >I<chemin>"
 
 #. #ServerRoot
 #. type: Plain text
-#: cups-files.conf.man.in:195
+#: cups-files.conf.5:192
 msgid ""
 "Specifies the location of TLS certificates and private keys.  The default is "
 "\"/Library/Keychains/System.keychain\" on macOS and \"/etc/cups/ssl\" on all "
@@ -7323,7 +7563,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:195
+#: cups-files.conf.5:192
 #, no-wrap
 msgid "B<ServerRoot >I<directory>"
 msgstr "B<ServerRoot> I<répertoire>"
@@ -7331,7 +7571,7 @@ msgstr "B<ServerRoot> I<répertoire>"
 # type: Plain text
 #. #SetEnv
 #. type: Plain text
-#: cups-files.conf.man.in:200
+#: cups-files.conf.5:197
 msgid ""
 "Specifies the directory containing the server configuration files.  The "
 "default is \"/etc/cups\"."
@@ -7341,14 +7581,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:200
+#: cups-files.conf.5:197
 #, no-wrap
 msgid "B<SetEnv >I<variable value>"
 msgstr "B<SetEnv variable> I<valeur>"
 
 #. #StateDir
 #. type: Plain text
-#: cups-files.conf.man.in:205
+#: cups-files.conf.5:202
 msgid ""
 "Set the specified environment variable to be passed to child processes.  "
 "Note: the standard CUPS filter and backend environment variables cannot be "
@@ -7357,14 +7597,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:205
+#: cups-files.conf.5:202
 #, no-wrap
 msgid "B<StateDir >I<directory>"
 msgstr "B<StateDir> I<répertoire>"
 
 #. #SyncOnClose
 #. type: Plain text
-#: cups-files.conf.man.in:210
+#: cups-files.conf.5:207
 msgid ""
 "Specifies the directory to use for PID and local certificate files.  The "
 "default is \"/var/run/cups\" or \"/etc/cups\" depending on the platform."
@@ -7374,20 +7614,20 @@ msgstr ""
 "plateforme."
 
 #. type: TP
-#: cups-files.conf.man.in:210
+#: cups-files.conf.5:207
 #, no-wrap
 msgid "B<SyncOnClose Yes>"
 msgstr "B<SyncOnClose> I<Yes>"
 
 #. type: TP
-#: cups-files.conf.man.in:212
+#: cups-files.conf.5:209
 #, no-wrap
 msgid "B<SyncOnClose No>"
 msgstr "B<SyncOnClose> I<No>"
 
 #. #SystemGroup
 #. type: Plain text
-#: cups-files.conf.man.in:219
+#: cups-files.conf.5:216
 msgid ""
 "Specifies whether the scheduler calls B<fsync>(2)  after writing "
 "configuration or state files.  The default is \"Yes\"."
@@ -7397,14 +7637,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:219
+#: cups-files.conf.5:216
 #, no-wrap
 msgid "B<SystemGroup >I<group-name >[ ... I<group-name> ]"
 msgstr "B<SystemGroup> I<groupe> [ ... I<groupe>]"
 
 #. #TempDir
 #. type: Plain text
-#: cups-files.conf.man.in:224
+#: cups-files.conf.5:221
 msgid ""
 "Specifies the group(s) to use for I<@SYSTEM> group authentication.  The "
 "default contains \"admin\", \"lpadmin\", \"root\", \"sys\", and/or \"system"
@@ -7416,7 +7656,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:224
+#: cups-files.conf.5:221
 #, no-wrap
 msgid "B<TempDir >I<directory>"
 msgstr "B<TempDir> I<répertoire>"
@@ -7424,7 +7664,7 @@ msgstr "B<TempDir> I<répertoire>"
 # type: Plain text
 #. #User
 #. type: Plain text
-#: cups-files.conf.man.in:229
+#: cups-files.conf.5:226
 msgid ""
 "Specifies the directory where short-term temporary files are stored.  The "
 "default is \"/var/spool/cups/tmp\"."
@@ -7434,14 +7674,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:229
+#: cups-files.conf.5:226
 #, no-wrap
 msgid "B<User >I<username>"
 msgstr "B<-U> I<identifiant>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-files.conf.man.in:233
+#: cups-files.conf.5:230
 msgid ""
 "Specifies the user name or ID that is used when running external programs.  "
 "The default is \"lp\"."
@@ -7451,7 +7691,7 @@ msgstr ""
 
 #. #FileDevice
 #. type: Plain text
-#: cups-files.conf.man.in:236
+#: cups-files.conf.5:233
 msgid ""
 "The following directives are deprecated and will be removed from a future "
 "version of CUPS:"
@@ -7461,21 +7701,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:236
+#: cups-files.conf.5:233
 #, no-wrap
 msgid "B<FileDevice Yes>"
 msgstr "B<FileDevice> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:238
+#: cups-files.conf.5:235
 #, no-wrap
 msgid "B<FileDevice No>"
 msgstr "B<FileDevice> I<No>"
 
 #. #FontPath
 #. type: Plain text
-#: cups-files.conf.man.in:246
+#: cups-files.conf.5:243
 msgid ""
 "Specifies whether the file pseudo-device can be used for new printer "
 "queues.  The URI \"file:///dev/null\" is always allowed.  File devices "
@@ -7492,14 +7732,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:246
+#: cups-files.conf.5:243
 #, no-wrap
 msgid "B<FontPath >I<directory[:...:directoryN]>"
 msgstr "B<FontPath> I<répertoire>[:...:I<répertoireN>]"
 
 #. #LPDConfigFile
 #. type: Plain text
-#: cups-files.conf.man.in:254
+#: cups-files.conf.5:251
 msgid ""
 "Specifies a colon separated list of directories where fonts can be found.  "
 "On Linux the B<font-config>(1)  mechanism is used instead.  On macOS the "
@@ -7512,7 +7752,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:254
+#: cups-files.conf.5:251
 #, no-wrap
 msgid " B<LPDConfigFile >I<filename>"
 msgstr " B<LPDConfigFile >I<nom-fichier>"
@@ -7520,13 +7760,13 @@ msgstr " B<LPDConfigFile >I<nom-fichier>"
 # type: Plain text
 #. #Printcap
 #. type: Plain text
-#: cups-files.conf.man.in:258
+#: cups-files.conf.5:255
 msgid "Specifies the LPD service configuration file to update."
 msgstr "Définir le fichier de configuration du service LPD à mettre à jour."
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:258
+#: cups-files.conf.5:255
 #, no-wrap
 msgid "B<Printcap >I<filename>"
 msgstr "B<Printcap> I<nom-fichier>"
@@ -7534,7 +7774,7 @@ msgstr "B<Printcap> I<nom-fichier>"
 # type: Plain text
 #. #PrintcapFormat
 #. type: Plain text
-#: cups-files.conf.man.in:262
+#: cups-files.conf.5:259
 msgid "Specifies a file that is filled with a list of local print queues."
 msgstr ""
 "Définir le fichier rempli par une liste de files d’attente d’impression "
@@ -7542,28 +7782,28 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:262
+#: cups-files.conf.5:259
 #, no-wrap
 msgid "B<PrintcapFormat bsd>"
 msgstr "B<PrintcapFormat> I<bsd>"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:264
+#: cups-files.conf.5:261
 #, no-wrap
 msgid "B<PrintcapFormat plist>"
 msgstr "B<PrintcapFormat> I<plist>"
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:266
+#: cups-files.conf.5:263
 #, no-wrap
 msgid "B<PrintcapFormat solaris>"
 msgstr "B<PrintcapFormat> I<solaris>"
 
 #. #SMBConfigFile
 #. type: Plain text
-#: cups-files.conf.man.in:273
+#: cups-files.conf.5:270
 msgid ""
 "Specifies the format to use for the Printcap file.  \"bsd\" is the "
 "historical LPD printcap file format.  \"plist\" is the Apple plist file "
@@ -7576,20 +7816,29 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-files.conf.man.in:273
+#: cups-files.conf.5:270
 #, no-wrap
 msgid "B<SMBConfigFile >I<filename>"
 msgstr "B<SMBConfigFile >I<nom-fichier>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-files.conf.man.in:276
+#: cups-files.conf.5:273
 msgid "Specifies the SMB service configuration file to update."
 msgstr "Définir le fichier de configuration du service SMB à mettre à jour."
 
+#. type: Plain text
+#: cups-files.conf.5:280
+msgid ""
+"The scheduler MUST be restarted manually after making changes to the B<cups-"
+"files.conf> file.  On Linux this is typically done using the "
+"B<systemctl>(8)  command, while on macOS the B<launchctl>(8)  command is "
+"used instead."
+msgstr ""
+
 # type: Plain text
 #. type: Plain text
-#: cups-files.conf.man.in:286
+#: cups-files.conf.5:290
 msgid ""
 "B<classes.conf>(5), B<cups>(1), B<cupsd>(8), B<cupsd.conf>(5), B<mime."
 "convs>(5), B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), "
@@ -7601,23 +7850,24 @@ msgstr ""
 
 # type: TP
 #. type: TH
-#: cupsfilter.man:12
+#: cupsfilter.8:9
 #, no-wrap
 msgid "cupsfilter"
 msgstr "cupsfilter"
 
 # type: Plain text
 #. type: Plain text
-#: cupsfilter.man:15
+#: cupsfilter.8:12
 #, fuzzy
-msgid "cupsfilter - convert a file to another format using cups filters"
+msgid ""
+"cupsfilter - convert a file to another format using cups filters (deprecated)"
 msgstr ""
 "cupsfilter - Convertir un fichier vers un autre format en utilisant les "
 "filtres CUPS"
 
 # type: Plain text
 #. type: Plain text
-#: cupsfilter.man:57
+#: cupsfilter.8:54
 msgid ""
 "B<cupsfilter> [ B<--list-filters> ] [ B<-D> ] [ B<-U> I<user> ] [ B<-c> "
 "I<config-file> ] [ B<-d> I<printer> ] [ B<-e> ] [ B<-i> I<mime/type> ] [ B<-"
@@ -7633,7 +7883,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsfilter.man:62
+#: cupsfilter.8:59
 msgid ""
 "B<cupsfilter> is a front-end to the CUPS filter subsystem which allows you "
 "to convert a file to a specific format, just as if you had printed the file "
@@ -7646,39 +7896,39 @@ msgstr ""
 "fichier PDF. Le fichier transformé est dirigé vers la sortie standard."
 
 #. type: TP
-#: cupsfilter.man:63
+#: cupsfilter.8:60
 #, no-wrap
 msgid "B<--list-filters>"
 msgstr "B<--list-filters>"
 
 #. type: Plain text
-#: cupsfilter.man:66
+#: cupsfilter.8:63
 msgid "Do not actually run the filters, just print the filters used to stdout."
 msgstr ""
 "Ne pas réellement exécuter les filtres, seulement afficher les filtres "
 "utilisés sur la sortie standard."
 
 #. type: TP
-#: cupsfilter.man:66
+#: cupsfilter.8:63
 #, no-wrap
 msgid "B<-D>"
 msgstr "B<-D>"
 
 #. type: Plain text
-#: cupsfilter.man:69
+#: cupsfilter.8:66
 msgid "Delete the input file after conversion."
 msgstr "Effacer le fichier d'entrée après la conversion."
 
 # type: TP
 #. type: TP
-#: cupsfilter.man:69
+#: cupsfilter.8:66
 #, no-wrap
 msgid "B<-U >I<user>"
 msgstr "B<-U> I<identifiant>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsfilter.man:72
+#: cupsfilter.8:69
 msgid ""
 "Specifies the username passed to the filters. The default is the name of the "
 "current user."
@@ -7688,45 +7938,45 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsfilter.man:72
+#: cupsfilter.8:69
 #, no-wrap
 msgid "B<-c >I<config-file>"
 msgstr "B<-c >I<fichier_configuration>"
 
 # type: TP
 #. type: TP
-#: cupsfilter.man:75
+#: cupsfilter.8:72
 #, no-wrap
 msgid "B<-d >I<printer>"
 msgstr "B<-d> I<imprimante>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsfilter.man:78
+#: cupsfilter.8:75
 msgid "Uses information from the named printer."
 msgstr "Utiliser des informations de l'imprimante nommée."
 
 #. type: TP
-#: cupsfilter.man:78 lpstat.man:101
+#: cupsfilter.8:75 lpstat.1:97
 #, no-wrap
 msgid "B<-e>"
 msgstr "B<-e>"
 
 #. type: Plain text
-#: cupsfilter.man:81
+#: cupsfilter.8:78
 msgid "Use every filter from the PPD file."
 msgstr "Utiliser tous les filtres du fichier PPD."
 
 # type: TH
 #. type: TP
-#: cupsfilter.man:81
+#: cupsfilter.8:78
 #, no-wrap
 msgid "B<-i >I<mime/type>"
 msgstr "B<-i> I<type/mime>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsfilter.man:84
+#: cupsfilter.8:81
 msgid ""
 "Specifies the source file type. The default file type is guessed using the "
 "filename and contents of the file."
@@ -7736,13 +7986,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsfilter.man:84
+#: cupsfilter.8:81
 #, no-wrap
 msgid "B<-j >I<job-id[,N]>"
 msgstr "B<-j> I<id_tâche[,N]>"
 
 #. type: Plain text
-#: cupsfilter.man:87
+#: cupsfilter.8:84
 msgid ""
 "Converts document N from the specified job. If N is omitted, document 1 is "
 "converted."
@@ -7752,14 +8002,14 @@ msgstr ""
 
 # type: TH
 #. type: TP
-#: cupsfilter.man:87
+#: cupsfilter.8:84
 #, no-wrap
 msgid "B<-m >I<mime/type>"
 msgstr "B<-m> I<type/mime>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsfilter.man:90
+#: cupsfilter.8:87
 msgid ""
 "Specifies the destination file type. The default file type is application/"
 "pdf. Use printer/foo to convert to the printer format defined by the filters "
@@ -7771,76 +8021,76 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsfilter.man:90 lp.man:124
+#: cupsfilter.8:87 lp.1:121
 #, no-wrap
 msgid "B<-n >I<copies>"
 msgstr "B<-n >I<copies>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsfilter.man:93
+#: cupsfilter.8:90
 msgid "Specifies the number of copies to generate."
 msgstr "Indiquer le nombre de copies à faire."
 
 # type: TP
 #. type: TP
-#: cupsfilter.man:93 cups-lpd.man.in:44
+#: cupsfilter.8:90 cups-lpd.8:41
 #, no-wrap
 msgid "B<-o >I<name=value>"
 msgstr "B<-o> I<nom=valeur>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsfilter.man:96
+#: cupsfilter.8:93
 msgid "Specifies options to pass to the CUPS filters."
 msgstr "Indiquer les options à fournir aux filtres CUPS."
 
 # type: TP
 #. type: TP
-#: cupsfilter.man:96
+#: cupsfilter.8:93
 #, no-wrap
 msgid "B<-p >I<filename.ppd>"
 msgstr "B<-p> I<nom_fichier.ppd>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsfilter.man:99
+#: cupsfilter.8:96
 msgid "Specifies the PPD file to use."
 msgstr "Définir le fichier PPD à utiliser."
 
 # type: TP
 #. type: TP
-#: cupsfilter.man:99
+#: cupsfilter.8:96
 #, no-wrap
 msgid "B<-t >I<title>"
 msgstr "B<-t> I<titre>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsfilter.man:102
+#: cupsfilter.8:99
 msgid "Specifies the document title."
 msgstr "Définir le titre du document."
 
 #. type: TP
-#: cupsfilter.man:102
+#: cupsfilter.8:99
 #, no-wrap
 msgid "B<-u>"
 msgstr "B<-u>"
 
 #. type: Plain text
-#: cupsfilter.man:105
+#: cupsfilter.8:102
 msgid "Delete the PPD file after conversion."
 msgstr "Effacer le fichier PPD après la conversion."
 
 #. type: Plain text
-#: cupsfilter.man:108
+#: cupsfilter.8:105
 msgid "B<cupsfilter> returns a non-zero exit status on any error."
 msgstr ""
 "B<cupsfilter> renvoie un état de sortie différent de zéro lors de toute "
 "erreur."
 
 #. type: Plain text
-#: cupsfilter.man:113
+#: cupsfilter.8:110
 msgid ""
 "All of the standard B<cups>(1)  environment variables affect the operation "
 "of B<cupsfilter>."
@@ -7849,7 +8099,7 @@ msgstr ""
 "opérations de B<cupsfilter>."
 
 #. type: Plain text
-#: cupsfilter.man:120
+#: cupsfilter.8:117
 #, no-wrap
 msgid ""
 "/etc/cups/cups-files.conf\n"
@@ -7865,7 +8115,16 @@ msgstr ""
 "/usr/share/cups/mime/*.types\n"
 
 #. type: Plain text
-#: cupsfilter.man:124
+#: cupsfilter.8:121
+msgid ""
+"CUPS printer drivers, filters, and backends are deprecated and will no "
+"longer be supported in a future feature release of CUPS.  Printers that do "
+"not support IPP can be supported using applications such as "
+"B<ippeveprinter>(1)."
+msgstr ""
+
+#. type: Plain text
+#: cupsfilter.8:125
 msgid ""
 "Unlike when printing, filters run using the B<cupsfilter> command use the "
 "current user and security session. This may result in different output or "
@@ -7878,13 +8137,13 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: cupsfilter.man:124 cups-lpd.man.in:86 lpadmin.man:203
+#: cupsfilter.8:125 cups-lpd.8:86 lpadmin.8:217
 #, no-wrap
 msgid "EXAMPLE"
 msgstr "EXEMPLE"
 
 #. type: Plain text
-#: cupsfilter.man:126
+#: cupsfilter.8:127
 msgid ""
 "The following command will generate a PDF preview of job 42 for a printer "
 "named \"myprinter\" and save it to a file named \"preview.pdf\":"
@@ -7894,13 +8153,13 @@ msgstr ""
 "« preview.pdf » :"
 
 #. type: Plain text
-#: cupsfilter.man:129
+#: cupsfilter.8:130
 #, no-wrap
 msgid "    cupsfilter -m application/pdf -d myprinter -j 42 E<gt>preview.pdf\n"
 msgstr "    cupsfilter -m application/pdf -d myprinter -j 42 E<gt>preview.pdf\n"
 
 #. type: Plain text
-#: cupsfilter.man:137
+#: cupsfilter.8:138
 msgid ""
 "B<cups>(1), B<cupsd.conf>(5), B<filter(7),> B<mime.convs>(7), B<mime."
 "types>(7), CUPS Online Help (http://localhost:631/help)"
@@ -7910,30 +8169,25 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: cups-lpd.man.in:13
+#: cups-lpd.8:10
 #, no-wrap
 msgid "cups-lpd"
 msgstr "cups-lpd"
 
-# type: TH
-#. type: TH
-#: cups-lpd.man.in:13
-#, no-wrap
-msgid "3 June 2014"
-msgstr "3 juin 2014"
-
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:16
+#: cups-lpd.8:13
 #, fuzzy
-msgid "cups-lpd - receive print jobs and report printer status to lpd clients"
+msgid ""
+"cups-lpd - receive print jobs and report printer status to lpd clients "
+"(deprecated)"
 msgstr ""
 "cups-lpd - Recevoir les travaux d'impression et renvoyer l'état des "
 "imprimantes aux clients lpd."
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:26
+#: cups-lpd.8:23
 msgid ""
 "B<cups-lpd> [ B<-h >I<hostname>[B<:>I<port>] ] [ B<-n> ] [ B<-o> "
 "I<option=value> ]"
@@ -7943,7 +8197,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:35
+#: cups-lpd.8:32
 msgid ""
 "B<cups-lpd> is the CUPS Line Printer Daemon (\"LPD\") mini-server that "
 "supports legacy client systems that use the LPD protocol.  B<cups-lpd> does "
@@ -7959,26 +8213,26 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-lpd.man.in:36 lp.man:115
+#: cups-lpd.8:33 lp.1:112
 #, no-wrap
 msgid "B<-h >I<hostname>[B<:>I<port>]"
 msgstr "B<-h> I<nom_hôte>[B<:>I<port>]"
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:39
+#: cups-lpd.8:36
 msgid "Sets the CUPS server (and port) to use."
 msgstr "Définir le serveur CUPS (et le port) à utiliser."
 
 #. type: TP
-#: cups-lpd.man.in:39
+#: cups-lpd.8:36
 #, no-wrap
 msgid "B<-n>"
 msgstr "B<-n>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:44
+#: cups-lpd.8:41
 msgid ""
 "Disables reverse address lookups; normally B<cups-lpd> will try to discover "
 "the hostname of the client via a reverse DNS lookup."
@@ -7988,7 +8242,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:49
+#: cups-lpd.8:46
 msgid ""
 "Inserts options for all print queues. Most often this is used to disable the "
 "\"l\" filter so that remote print jobs are filtered as needed for printing; "
@@ -8004,7 +8258,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:53
+#: cups-lpd.8:50
 msgid ""
 "B<cups-lpd> does not enforce the restricted source port number specified in "
 "RFC 1179, as using restricted ports does not prevent users from submitting "
@@ -8019,7 +8273,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:55
+#: cups-lpd.8:52
 msgid ""
 "The output of the status requests follows RFC 2569, Mapping between LPD and "
 "IPP Protocols. Since many LPD implementations stray from this definition, "
@@ -8031,18 +8285,18 @@ msgstr ""
 "être erronée."
 
 #. type: SH
-#: cups-lpd.man.in:55
+#: cups-lpd.8:52
 #, no-wrap
 msgid "ERRORS"
 msgstr "ERREURS"
 
 #. type: Plain text
-#: cups-lpd.man.in:57
+#: cups-lpd.8:54
 msgid "Errors are sent to the system log."
 msgstr "Les erreurs sont envoyées vers le journal système."
 
 #. type: Plain text
-#: cups-lpd.man.in:62
+#: cups-lpd.8:59
 #, no-wrap
 msgid ""
 "I</etc/inetd.conf>\n"
@@ -8053,16 +8307,26 @@ msgstr ""
 "I</etc/xinetd.d/cups-lpd>\n"
 "I</System/Library/LaunchDaemons/org.cups.cups-lpd.plist>\n"
 
+#. type: Plain text
+#: cups-lpd.8:64
+#, fuzzy
+msgid ""
+"The B<cups-lpd> program is deprecated and will no longer be supported in a "
+"future feature release of CUPS."
+msgstr ""
+"B<Ce programme est obsolète et sera supprimé dans une future version de CUPS."
+">"
+
 # type: SH
 #. type: SS
-#: cups-lpd.man.in:64
+#: cups-lpd.8:64
 #, no-wrap
 msgid "PERFORMANCE"
 msgstr "PERFORMANCE"
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:69
+#: cups-lpd.8:69
 msgid ""
 "B<cups-lpd> performs well with small numbers of clients and printers.  "
 "However, since a new process is created for each connection and since each "
@@ -8080,14 +8344,14 @@ msgstr ""
 
 # type: SH
 #. type: SS
-#: cups-lpd.man.in:69
+#: cups-lpd.8:69
 #, no-wrap
 msgid "SECURITY"
 msgstr "SÉCURITÉ"
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:76
+#: cups-lpd.8:76
 msgid ""
 "B<cups-lpd> currently does not perform any access control based on the "
 "settings in I<cupsd.conf(5)> or in the I<hosts.allow(5)> or I<hosts.deny(5)> "
@@ -8103,7 +8367,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:82
+#: cups-lpd.8:82
 msgid ""
 "While B<xinetd>(8)  has built-in access control support, you should use the "
 "TCP wrappers package with B<inetd>(8)  to limit access to only those "
@@ -8115,7 +8379,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:86
+#: cups-lpd.8:86
 msgid ""
 "B<cups-lpd> is not enabled by the standard CUPS distribution.  Please "
 "consult with your operating system vendor to determine whether it is enabled "
@@ -8126,7 +8390,7 @@ msgstr ""
 "s'il est activé sur votre système."
 
 #. type: Plain text
-#: cups-lpd.man.in:92
+#: cups-lpd.8:92
 msgid ""
 "If you are using B<inetd>(8), add the following line to the I<inetd.conf> "
 "file to enable the B<cups-lpd> mini-server:"
@@ -8136,7 +8400,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:96
+#: cups-lpd.8:96
 #, no-wrap
 msgid ""
 "    printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd \\e\n"
@@ -8147,7 +8411,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cups-lpd.man.in:102
+#: cups-lpd.8:102
 msgid ""
 "I<Note:> If you are using Solaris 10 or higher, you must run the "
 "B<inetdconv>(1m)  program to register the changes to the I<inetd.conf> file."
@@ -8157,7 +8421,7 @@ msgstr ""
 "fichier I<inetd.conf>."
 
 #. type: Plain text
-#: cups-lpd.man.in:111
+#: cups-lpd.8:111
 msgid ""
 "CUPS includes configuration files for B<launchd>(8), B<systemd>(8), and "
 "B<xinetd>(8).  Simply enable the B<cups-lpd> service using the corresponding "
@@ -8168,7 +8432,7 @@ msgstr ""
 "utilisant le programme de contrôle correspondant."
 
 #. type: Plain text
-#: cups-lpd.man.in:118
+#: cups-lpd.8:118
 msgid ""
 "B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), CUPS Online Help "
 "(http://localhost:631/help), RFC 2569"
@@ -8176,555 +8440,210 @@ msgstr ""
 "B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), aide en ligne de CUPS "
 "E<lt>URL:I<http://localhost:631/help>E<gt>, RFC 2569"
 
-# type: TH
 #. type: TH
-#: cups.man:13
+#: cups-snmp.8:9
 #, no-wrap
-msgid "cups"
-msgstr "cups"
-
-# type: TH
-#. type: TH
-#: cups.man:13
-#, fuzzy, no-wrap
-#| msgid "15 April 2014"
-msgid "16 April 2014"
-msgstr "15 avril 2014"
+msgid "cups-snmp"
+msgstr "cups-snmp"
 
 #. type: Plain text
-#: cups.man:16
-msgid "cups - a standards-based, open source printing system"
-msgstr ""
-"cups - Système d’impression au code source ouvert, basé sur les standards "
+#: cups-snmp.8:12
+#, fuzzy
+msgid "snmp - cups snmp backend (deprecated)"
+msgstr "snmp - Programme de transmission SNMP de CUPS"
 
 #. type: Plain text
-#: cups.man:19
-msgid ""
-"B<CUPS> is the software you use to print from applications like word "
-"processors, email readers, photo editors, and web browsers. It converts the "
-"page descriptions produced by your application (put a paragraph here, draw a "
-"line there, and so forth) into something your printer can understand and "
-"then sends the information to the printer for printing."
-msgstr ""
-"B<CUPS> est le logiciel utilisé pour imprimer à partir d’applications telles "
-"que traitement de texte, lecteur de courriels, éditeur d’images et "
-"navigateur web. Il convertit les descriptions de page (mettre un paragraphe "
-"ici, dessiner une ligne là, etc.) en quelque chose que l’imprimante puisse "
-"comprendre, et ensuite envoie l’information vers l’imprimante."
+#: cups-snmp.8:15
+msgid "B</usr/lib/cups/backend/snmp> I<ip-address-or-hostname>"
+msgstr "B</usr/lib/cups/backend/snmp> I<adresse_ip-ou-nom_hôte>"
 
 #. type: Plain text
-#: cups.man:25
-msgid ""
-"Now, since every printer manufacturer does things differently, printing can "
-"be very complicated.  B<CUPS> does its best to hide this from you and your "
-"application so that you can concentrate on printing and less on how to "
-"print. Generally, the only time you need to know anything about your printer "
-"is when you use it for the first time, and even then B<CUPS> can often "
-"figure things out on its own."
-msgstr ""
-"Maintenant, comme chaque fabricant fait les choses à sa manière, une "
-"impression peut être très compliquée. B<CUPS> fait au mieux pour dissimuler "
-"cela à l’application comme à l’utilisateur de façon que celui-ci se "
-"concentre sur l’impression sans se soucier de la manière de faire. "
-"Généralement, la seule fois que l’utilisateur se soucie de son imprimante, "
-"c’est lors de sa première utilisation, et même alors, B<CUPS> peut faire les "
-"choses de lui-même."
+#: cups-snmp.8:18
+msgid "B</usr/libexec/cups/backend/snmp> I<ip-address-or-hostname>"
+msgstr "B</usr/libexec/cups/backend/snmp> I<adresse_ip-ou-nom_hôte>"
 
-#. type: SS
-#: cups.man:25
-#, no-wrap
-msgid "HOW DOES IT WORK?"
-msgstr "COMMENT ÇA MARCHE ?"
+#. type: Plain text
+#: cups-snmp.8:23
+msgid "B<lpinfo> B<-v> B<--include-schemes> snmp"
+msgstr "B<lpinfo> B<-v> B<--include-schemes> I<snmp>"
 
 #. type: Plain text
-#: cups.man:29
+#: cups-snmp.8:27
+#, fuzzy
 msgid ""
-"The first time you print to a printer, B<CUPS> creates a queue to keep track "
-"of the current status of the printer (everything OK, out of paper, etc.) and "
-"any pages you have printed. Most of the time the queue points to a printer "
-"connected directly to your computer via a USB port, however it can also "
-"point to a printer on your network, a printer on the Internet, or multiple "
-"printers depending on the configuration. Regardless of where the queue "
-"points, it will look like any other printer to you and your applications."
+"The B<DEPRECATED> CUPS SNMP backend provides legacy discovery and "
+"identification of network printers using SNMPv1.  When used for discovery "
+"through the scheduler, the backend will list all printers that respond to a "
+"broadcast SNMPv1 query with the \"public\" community name.  Additional "
+"queries are then sent to printers that respond in order to determine the "
+"correct device URI, make and model, and other information needed for "
+"printing."
 msgstr ""
-"Lors de la première impression, B<CUPS> crée une file d’attente pour "
-"conserver une trace de l’état actuel de l’imprimante (toutes choses OK, plus "
-"de papier, etc.) et de toutes les pages imprimées. La plupart du temps la "
-"file d’attente concerne l’imprimante connectée à votre ordinateur sur la "
-"prise USB. Cependant, elle peut concerner une imprimante du réseau, une "
-"imprimante sur Internet ou plusieurs imprimantes suivant la configuration. "
-"Quelque soit l’endroit concerné par la file d’attente, celles-ci seront "
-"semblables à n’importe quelle autre imprimante pour les applications et "
-"l’utilisateur."
+"Le programme de transmission SNMP de CUPS permet la découverte et "
+"l’identification d’imprimantes réseau existantes en utilisant SNMP v1. "
+"Lorsqu’utilisé pour la recherche par l’ordonnanceur, le programme de "
+"transmission dressera la liste de toutes les imprimantes qui répondront à "
+"une requête SNMP v1 avec le nom de communauté « public ». Des requêtes "
+"supplémentaires sont alors envoyées aux imprimantes ayant répondues pour "
+"déterminer les URI, fabricant et modèle du périphérique corrects, et "
+"quelques autres informations nécessaires pour l’impression."
 
 #. type: Plain text
-#: cups.man:35
+#: cups-snmp.8:30
 msgid ""
-"Every time you print something, B<CUPS> creates a job which contains the "
-"queue you are sending the print to, the name of the document you are "
-"printing, and the page descriptions. Job are numbered (queue-1, queue-2, and "
-"so forth) so you can monitor the job as it is printed or cancel it if you "
-"see a mistake. When B<CUPS> gets a job for printing, it determines the best "
-"programs (filters, printer drivers, port monitors, and backends) to convert "
-"the pages into a printable format and then runs them to actually print the "
-"job."
+"In the first form, the SNMP backend is run directly by the user to look up "
+"the device URI and other information when you have an IP address or "
+"hostname.  This can be used for programs that need to configure print queues "
+"where the user has supplied an address but nothing else."
 msgstr ""
-"Chaque fois qu’une impression est réalisée, B<CUPS> crée un travail qui "
-"contient la file d’attente à laquelle l’impression est envoyée, le nom du "
-"document à imprimer, et les descriptions de page. Les travaux sont numérotés "
-"(queue-1, queue-2, etc.) pour pouvoir contrôler l’impression du travail ou "
-"son annulation en cas d’erreur. Lorsque B<CUPS> accepte un travail "
-"d’impression, il détermine les meilleurs programmes (filtres, pilotes "
-"d’imprimante, écoute de ports et programmes de transmission) pour convertir "
-"les pages dans un format imprimable et les exécuter pour réellement réaliser "
-"l’impression."
+"D’une première manière, le programme de transmission SNMP est exécuté "
+"directement par l’utilisateur pour chercher l’URI du périphérique et autres "
+"informations lorsque d’adresse IP ou le nom d’hôte est connu. Cela peut être "
+"utilisé par des programmes pour configurer des files d’attente quand "
+"l’utilisateur a fourni seulement une adresse."
 
 #. type: Plain text
-#: cups.man:39
+#: cups-snmp.8:37
 msgid ""
-"When the print job is completely printed, B<CUPS> removes the job from the "
-"queue and moves on to any other jobs you have submitted. You can also be "
-"notified when the job is finished, or if there are any errors during "
-"printing, in several different ways."
+"In the second form, the SNMP backend is run indirectly using the "
+"B<lpinfo>(8)  command.  The output provides all printers detected via SNMP "
+"on the configured broadcast addresses.  I<Note: no broadcast addresses are "
+"configured by default.>"
 msgstr ""
-"Lorsque le travail d’impression est complètement terminé, B<CUPS> retire le "
-"travail de la file d’attente et commence tout autre travail demandé. Une "
-"notification peut être aussi faite lorsque le travail est terminé, ou si une "
-"erreur s’est produite, de différentes manières."
-
-#. type: SS
-#: cups.man:39
-#, no-wrap
-msgid "WHERE DO I BEGIN?"
-msgstr "OÙ COMMENCER ?"
+"D’une seconde manière, le programme de transmission SNMP est exécuté "
+"indirectement par la commande B<lpinfo>(8). La sortie fournit toutes les "
+"adresses détectées à l’aide de SNMP sur les adresses d’émission configurées. "
+"B<Remarque : aucune adresse d’émission n’est configurée par défaut.>"
 
 #. type: Plain text
-#: cups.man:41
+#: cups-snmp.8:40
 msgid ""
-"The easiest way to start is by using the web interface to configure your "
-"printer. Go to \"http://localhost:631\" and choose the Administration tab at "
-"the top of the page. Click/press on the Add Printer button and follow the "
-"prompts."
+"The DebugLevel value can be overridden using the CUPS_DEBUG_LEVEL "
+"environment variable.  The MaxRunTime value can be overridden using the "
+"CUPS_MAX_RUN_TIME environment variable."
 msgstr ""
-"Le moyen le plus facile est de commencer avec l’interface web pour "
-"configurer l’imprimante. Allez à l’adresse « http://localhost:631 », "
-"choisissez l’onglet Administration au haut de la page, cliquez sur le bouton "
-"« Add Printer » (ajouter une imprimante) et suivez les indications."
+"La valeur DebugLevel peut être outrepassée en utilisant la variable "
+"d’environnement CUPS_DEBUG_LEVEL. La valeur MaxRunTime peut être outrepassée "
+"en utilisant la variable d’environnement CUPS_MAX_RUN_TIME."
 
 #. type: Plain text
-#: cups.man:43
+#: cups-snmp.8:44
 msgid ""
-"When you are asked for a username and password, enter your login username "
-"and password or the \"root\" username and password."
+"The SNMP backend reads the I</etc/cups/snmp.conf> configuration file, if "
+"present, to set the default broadcast address, community name, and logging "
+"level."
 msgstr ""
-"Lorsqu’un identifiant et un mot de passe sont demandés, entrez votre "
-"identifiant de connexion et votre mot de passe, ou l’identifiant et mot de "
-"passe du superutilisateur."
+"Le programme de transmission SNMP lit le fichier de configuration I</etc/"
+"cups/snmp.conf>, s’il existe, pour définir l’adresse d’émission par défaut, "
+"le nom de communauté et le niveau de journalisation."
 
 #. type: Plain text
-#: cups.man:45
+#: cups-snmp.8:47
+#, fuzzy
 msgid ""
-"After the printer is added you will be asked to set the default printer "
-"options (paper size, output mode, etc.) for the printer. Make any changes as "
-"needed and then click/press on the Set Default Options button to save them. "
-"Some printers also support auto-configuration - click/press on the Query "
-"Printer for Default Options button to update the options automatically."
+"The CUPS SNMP backend is deprecated and will no longer be supported in a "
+"future version of CUPS."
 msgstr ""
-"Après l’ajout de l’imprimante, les options par défaut de l’imprimante sont "
-"demandées (taille de papier, mode de sortie, etc.). Faites tous les "
-"changements nécessaires et cliquez sur le bouton « Set Default Options » "
-"pour les enregistrer. Quelques imprimantes peuvent aussi s’auto-configurer "
-"— cliquez sur les boutons « Query Printer » (recherche imprimante) puis "
-"« Default Options » (options par défaut) pour mettre à jour les options "
-"automatiquement."
+"B<Ce programme est obsolète et sera supprimé dans une future version de CUPS."
+">"
 
+# type: Plain text
 #. type: Plain text
-#: cups.man:47
+#: cups-snmp.8:49
 msgid ""
-"Once you have added the printer, you can print to it from any application. "
-"You can also choose Print Test Page from the maintenance menu to print a "
-"simple test page and verify that everything is working properly."
+"The CUPS SNMP backend uses the information from the Host, Printer, and Port "
+"Monitor MIBs along with some vendor private MIBs and intelligent port probes "
+"to determine the correct device URI and make and model for each printer."
 msgstr ""
-"Une fois l’imprimante ajoutée, elle peut être utilisée à partir de n’importe "
-"quelle application. Le bouton « Print Test Page » du menu de maintenance "
-"permet d’imprimer une page simple de test et de vérifier le bon "
-"fonctionnement général."
+"Le programme de transmission SNMP pour CUPS utilise les informations Host, "
+"Printer, et Port Monitor de la base MIP, en parallèle avec celle de quelques "
+"fournisseurs et des investigations intelligentes de ports, pour déterminer "
+"les URI du périphérique, fabricant et modèle corrects  pour chaque "
+"imprimante."
 
+# type: Plain text
 #. type: Plain text
-#: cups.man:55
+#: cups-snmp.8:55
 msgid ""
-"You can also use the B<lpadmin>(8)  and B<lpinfo>(8)  commands to add "
-"printers to B<CUPS>.  Additionally, your operating system may include "
-"graphical user interfaces or automatically create printer queues when you "
-"connect a printer to your computer."
+"B<backend>(7), B<cups-snmp.conf>(5), B<cupsd>(8), B<lpinfo>(8), CUPS Online "
+"Help (http://localhost:631/help)"
 msgstr ""
-"Les commandes B<lpadmin>(8) et B<lpinfo>(8) permettent d’ajouter des "
-"imprimantes à B<CUPS>. De plus, le système d’exploitation peut comporter une "
-"interface graphique ou automatiquement créer une file d’attente d’impression "
-"lors de la connexion de l’imprimante."
+"B<backend>(7), B<cups-snmp.conf>(5), B<cupsd>(8), B<lpinfo>(8), aide en "
+"ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
 
-#. type: SS
-#: cups.man:55
+# type: TH
+#. type: TH
+#: cups-snmp.conf.5:10
 #, no-wrap
-msgid "HOW DO I GET HELP?"
-msgstr "COMMENT OBTENIR DE L’AIDE ?"
+msgid "snmp.conf"
+msgstr "snmp.conf"
+
+# type: Plain text
+#. type: Plain text
+#: cups-snmp.conf.5:13
+#, fuzzy
+msgid "snmp.conf - snmp configuration file for cups (deprecated)"
+msgstr "snmp.conf - Fichier de configuration SNMP pour CUPS"
 
+# type: Plain text
 #. type: Plain text
-#: cups.man:63
+#: cups-snmp.conf.5:18
 msgid ""
-"The B<CUPS> web site (http://www.CUPS.org) provides access to the I<cups> "
-"and I<cups-devel> mailing lists, additional documentation and resources, and "
-"a bug report database. Most vendors also provide online discussion forums to "
-"ask printing questions for your operating system of choice."
+"The B<snmp.conf> file configures how the standard CUPS network backends "
+"(http, https, ipp, ipps, lpd, snmp, and socket) access printer information "
+"using SNMPv1 and is normally located in the I</etc/cups> directory.  Each "
+"line in the file can be a configuration directive, a blank line, or a "
+"comment. Comment lines start with the # character."
 msgstr ""
-"Le site web de B<CUPS> (E<lt>URL:I<http://www.CUPS.org>E<gt>) permet "
-"d’accéder aux listes de diffusion I<cups> et I<cups-devel>, à des "
-"informations et ressources complémentaires, et à la base de données des "
-"rapports de bogue. La plupart des fournisseurs maintiennent des forums de "
-"discussion en ligne, permettant de poser des questions pour votre système "
-"d’exploitation."
+"Le fichier I<snmp.conf> configure la façon dont les programmes de "
+"transmission réseau de CUPS (http, https, ipp, ipps, lpd, snmp et socket) "
+"accèdent aux informations de l'imprimante en utilisant SNMP version 1 et se "
+"trouve normalement dans le répertoire I</etc/cups>. Chaque ligne du fichier "
+"est une directive de configuration, une ligne vide ou un commentaire. Les "
+"commentaires commencent par le caractère « # »."
 
 #. type: Plain text
-#: cups.man:66
+#: cups-snmp.conf.5:21
 msgid ""
-"B<CUPS> commands use the following environment variables to override the "
-"default locations of files and so forth. For security reasons, these "
-"environment variables are ignored for setuid programs:"
+"The Community and DebugLevel directives are used by all backends. The "
+"remainder apply only to the SNMP backend - B<cups-snmp>(8)."
 msgstr ""
-"Les commandes de B<CUPS> utilisent les variables d’environnement suivantes "
-"pour outrepasser les emplacements de fichier, etc. Pour des raisons de "
-"sécurité, ces variables sont ignorées par les programmes setuid :"
-
-# type: TP
-#. type: TP
-#: cups.man:66
-#, no-wrap
-msgid "B<CUPS_ANYROOT>"
-msgstr "B<CUPS_ANYROOT>"
+"Les directives Community et DebugLevel sont utilisées par tous les "
+"programmes de transmission. Le reste ne s'applique qu'au programme de "
+"transmission SNMP (B<cups-snmp>(8))."
 
+# type: Plain text
 #. type: Plain text
-#: cups.man:69
-msgid "Whether to allow any X.509 certificate root (Y or N)."
-msgstr "Autoriser tout certificat racine X.509 (Oui ou Non)."
+#: cups-snmp.conf.5:23
+msgid "The following directives are understood by the CUPS network backends:"
+msgstr ""
+"Les directives suivantes sont comprises par les programmes de transmission "
+"réseau : "
 
 # type: TP
 #. type: TP
-#: cups.man:69 filter.man:159
+#: cups-snmp.conf.5:23
 #, no-wrap
-msgid "B<CUPS_CACHEDIR>"
-msgstr "B<CUPS_CACHEDIR>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:72
-msgid "The directory where semi-persistent cache files can be found."
-msgstr "Le répertoire où se trouvent les fichiers cache semi-persistant."
+msgid "B<Address @IF(>I<name>B<)>"
+msgstr "B<Address @IF(>I<nom>B<)>"
 
 # type: TP
 #. type: TP
-#: cups.man:72 filter.man:162
-#, no-wrap
-msgid "B<CUPS_DATADIR>"
-msgstr "B<CUPS_DATADIR>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:75 filter.man:165
-msgid "The directory where data files can be found."
-msgstr "Le répertoire où se trouvent les fichiers de données."
-
-#. type: TP
-#: cups.man:75
-#, no-wrap
-msgid "B<CUPS_ENCRYPTION>"
-msgstr "B<CUPS_ENCRYPTION>"
-
-#. type: Plain text
-#: cups.man:78
-msgid "The default level of encryption (Always, IfRequested, Never, Required)."
-msgstr ""
-"Le niveau de chiffrement par défaut (Always, IfRequested, Never, Required)."
-
-# type: TP
-#. type: TP
-#: cups.man:78
-#, no-wrap
-msgid "B<CUPS_EXPIREDCERTS>"
-msgstr "B<CUPS_EXPIREDCERTS>"
-
-#. type: Plain text
-#: cups.man:81
-msgid "Whether to allow expired X.509 certificates (Y or N)."
-msgstr "Autoriser les certificats X.509 périmés (Oui ou Non)."
-
-# type: TP
-#. type: TP
-#: cups.man:81
-#, no-wrap
-msgid "B<CUPS_GSSSERVICENAME>"
-msgstr "B<CUPS_GSSSERVICENAME>"
-
-#. type: Plain text
-#: cups.man:84
-msgid "The Kerberos service name used for authentication."
-msgstr "Le nom de service Kerberos utilisé pour authentification."
-
-# type: TP
-#. type: TP
-#: cups.man:84
-#, no-wrap
-msgid "B<CUPS_SERVER>"
-msgstr "B<CUPS_SERVER>"
-
-#. type: Plain text
-#: cups.man:87
-msgid ""
-"The hostname/IP address and port number of the CUPS scheduler (hostname:port "
-"or ipaddress:port)."
-msgstr ""
-"Le nom d’hôte ou adresse IP et le numéro de port de l’ordonnanceur CUPS "
-"(nom_hôte:port ou adresse_ip:port)."
-
-# type: TP
-#. type: TP
-#: cups.man:87
-#, no-wrap
-msgid "B<CUPS_SERVERBIN>"
-msgstr "B<CUPS_SERVERBIN>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:90
-msgid ""
-"The directory where server helper programs, filters, backend, etc. can be "
-"found."
-msgstr ""
-"Le répertoire où trouver les programmes d’assistance du serveur, les "
-"filtres, les programmes de transmission, etc."
-
-# type: TP
-#. type: TP
-#: cups.man:90 filter.man:172
-#, no-wrap
-msgid "B<CUPS_SERVERROOT>"
-msgstr "B<CUPS_SERVERROOT>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:93 filter.man:175
-msgid "The root directory of the server."
-msgstr "Le répertoire racine du serveur."
-
-# type: TP
-#. type: TP
-#: cups.man:93
-#, no-wrap
-msgid "B<CUPS_STATEDIR>"
-msgstr "B<CUPS_STATEDIR>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:96
-msgid "The directory where state files can be found."
-msgstr "Le répertoire où trouver les fichiers d’état."
-
-# type: TP
-#. type: TP
-#: cups.man:96
-#, no-wrap
-msgid "B<CUPS_USER>"
-msgstr "B<CUPS_USER>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:99
-msgid "Specifies the name of the user for print requests."
-msgstr "Indiquer le nom d'utilisateur pour les requêtes d’impression."
-
-#. type: TP
-#: cups.man:99
-#, no-wrap
-msgid "B<HOME>"
-msgstr "B<HOME>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:102
-msgid "Specifies the home directory of the current user."
-msgstr "Définir le répertoire personnel (home) de l’utilisateur actuel."
-
-#. type: TP
-#: cups.man:102
-#, no-wrap
-msgid "B<IPP_PORT>"
-msgstr "B<IPP_PORT>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:105
-msgid "Specifies the default port number for IPP requests."
-msgstr "Indiquer le numéro de port par défaut pour les requêtes IPP."
-
-# type: TP
-#. type: TP
-#: cups.man:105
-#, no-wrap
-msgid "B<LOCALEDIR>"
-msgstr "B<LOCALEDIR>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:108
-msgid "Specifies the location of localization files."
-msgstr "Définir l’emplacement des fichiers d’internationalisation."
-
-#. type: TP
-#: cups.man:108
-#, no-wrap
-msgid "B<LPDEST>"
-msgstr "B<LPDEST>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:111
-msgid "Specifies the default print queue (System V standard)."
-msgstr "Indiquer la file d’attente par défaut (standard System V)."
-
-# type: TP
-#. type: TP
-#: cups.man:111 filter.man:187
-#, no-wrap
-msgid "B<PRINTER>"
-msgstr "B<PRINTER>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:114
-msgid "Specifies the default print queue (Berkeley standard)."
-msgstr "Indiquer la file d’attente par défaut (standard Berkeley)."
-
-#. type: TP
-#: cups.man:114
-#, no-wrap
-msgid "B<TMPDIR>"
-msgstr "B<TMPDIR>"
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:117
-msgid "Specifies the location of temporary files."
-msgstr "Définir l’emplacement des fichiers temporaires."
-
-#. type: Plain text
-#: cups.man:121
-#, no-wrap
-msgid ""
-"I<~/.cups/client.conf>\n"
-"I<~/.cups/lpoptions>\n"
-msgstr ""
-"I<~/.cups/client.conf>\n"
-"I<~/.cups/lpoptions>\n"
-
-#. type: Plain text
-#: cups.man:125
-msgid ""
-"B<CUPS> conforms to the Internet Printing Protocol version 2.1 and "
-"implements the Berkeley and System V UNIX print commands."
-msgstr ""
-"B<CUPS> se conforme au protocole « Internet Printing Protocol » version 2.1 "
-"et met en œuvre les commandes d’impression des systèmes UNIX Berkeley et "
-"System V. "
-
-# type: Plain text
-#. type: Plain text
-#: cups.man:141
-msgid ""
-"B<cancel>(1), B<client.conf>(7), B<cupsctl>(8), B<cupsd>(8), B<lp>(1), "
-"B<lpadmin>(8), B<lpinfo>(8), B<lpoptions>(1), B<lpr>(1), B<lprm>(1), "
-"B<lpq>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help), CUPS "
-"Web Site (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup "
-"(http://www.pwg.org/ipp)"
-msgstr ""
-"B<cancel>(1), B<client.conf>(7), B<cupsctl>(8), B<cupsd>(8), B<lp>(1), "
-"B<lpadmin>(8), B<lpinfo>(8), B<lpoptions>(1), B<lpr>(1), B<lprm>(1), "
-"B<lpq>(1), B<lpstat>(1), aide en ligne de CUPS E<lt>URL:I<http://"
-"localhost:631/help>E<gt>, site web de CUPS E<lt>URL:I<http://www.CUPS."
-"org>E<gt>, PWG Internet Printing Protocol Workgroup E<lt>URL:I<h://www.pwg."
-"org/ipp>E<gt>"
-
-# type: TH
-#. type: TH
-#: cups-snmp.conf.man:13
-#, no-wrap
-msgid "snmp.conf"
-msgstr "snmp.conf"
-
-# type: Plain text
-#. type: Plain text
-#: cups-snmp.conf.man:16
-#, fuzzy
-msgid "snmp.conf - snmp configuration file for cups"
-msgstr "snmp.conf - Fichier de configuration SNMP pour CUPS"
-
-# type: Plain text
-#. type: Plain text
-#: cups-snmp.conf.man:21
-msgid ""
-"The B<snmp.conf> file configures how the standard CUPS network backends "
-"(http, https, ipp, ipps, lpd, snmp, and socket) access printer information "
-"using SNMPv1 and is normally located in the I</etc/cups> directory.  Each "
-"line in the file can be a configuration directive, a blank line, or a "
-"comment. Comment lines start with the # character."
-msgstr ""
-"Le fichier I<snmp.conf> configure la façon dont les programmes de "
-"transmission réseau de CUPS (http, https, ipp, ipps, lpd, snmp et socket) "
-"accèdent aux informations de l'imprimante en utilisant SNMP version 1 et se "
-"trouve normalement dans le répertoire I</etc/cups>. Chaque ligne du fichier "
-"est une directive de configuration, une ligne vide ou un commentaire. Les "
-"commentaires commencent par le caractère « # »."
-
-#. type: Plain text
-#: cups-snmp.conf.man:24
-msgid ""
-"The Community and DebugLevel directives are used by all backends. The "
-"remainder apply only to the SNMP backend - B<cups-snmp>(8)."
-msgstr ""
-"Les directives Community et DebugLevel sont utilisées par tous les "
-"programmes de transmission. Le reste ne s'applique qu'au programme de "
-"transmission SNMP (B<cups-snmp>(8))."
-
-# type: Plain text
-#. type: Plain text
-#: cups-snmp.conf.man:26
-msgid "The following directives are understood by the CUPS network backends:"
-msgstr ""
-"Les directives suivantes sont comprises par les programmes de transmission "
-"réseau : "
-
-# type: TP
-#. type: TP
-#: cups-snmp.conf.man:26
-#, no-wrap
-msgid "B<Address @IF(>I<name>B<)>"
-msgstr "B<Address @IF(>I<nom>B<)>"
-
-# type: TP
-#. type: TP
-#: cups-snmp.conf.man:28
+#: cups-snmp.conf.5:25
 #, no-wrap
 msgid "B<Address @LOCAL>"
 msgstr "B<Address @LOCAL>"
 
 # type: TP
 #. type: TP
-#: cups-snmp.conf.man:30
+#: cups-snmp.conf.5:27
 #, no-wrap
 msgid "B<Address >I<address>"
 msgstr "B<Address> I<adresse>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-snmp.conf.man:34
+#: cups-snmp.conf.5:31
 msgid ""
 "Sends SNMP broadcast queries (for discovery) to the specified address(es).  "
 "There is no default for the broadcast address."
@@ -8734,31 +8653,32 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-snmp.conf.man:34
+#: cups-snmp.conf.5:31
 #, no-wrap
 msgid "B<Community >I<name>"
 msgstr "B<Community> I<nom>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-snmp.conf.man:39
+#: cups-snmp.conf.5:37
 #, fuzzy
 msgid ""
 "Specifies the community name to use.  Only a single community name may be "
-"specified.  The default community name is \"public\"."
+"specified.  The default community name is \"public\".  If no name is "
+"specified, all SNMP functions are disabled."
 msgstr ""
 "Indiquer le nom de communauté à utiliser. Il ne peut être indiqué qu'un seul "
 "nom de communauté. La communauté par défaut est « public »."
 
 # type: TP
 #. type: TP
-#: cups-snmp.conf.man:39
+#: cups-snmp.conf.5:37
 #, no-wrap
 msgid "B<DebugLevel >I<number>"
 msgstr "B<DebugLevel> I<nombre>"
 
 #. type: Plain text
-#: cups-snmp.conf.man:44
+#: cups-snmp.conf.5:42
 msgid ""
 "Specifies the logging level from 0 (none) to 3 (everything).  Typically only "
 "used for debugging (thus the name).  The default debug level is 0."
@@ -8768,13 +8688,13 @@ msgstr ""
 "niveau par défaut de débogage est B<0>."
 
 #. type: TP
-#: cups-snmp.conf.man:44
+#: cups-snmp.conf.5:42
 #, no-wrap
 msgid "B<DeviceURI \">I<regular expression>B<\" >I<device-uri >[... I<device-uri>]"
 msgstr "B<DeviceURI \">I<exp_rationnelle>B<\" >I<uri_périphérique >[... I<uri_périphérique>]"
 
 #. type: Plain text
-#: cups-snmp.conf.man:49
+#: cups-snmp.conf.5:47
 msgid ""
 "Specifies one or more device URIs that should be used for a given make and "
 "model string.  The regular expression is used to match the detected make and "
@@ -8791,21 +8711,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-snmp.conf.man:49
+#: cups-snmp.conf.5:47
 #, no-wrap
 msgid "B<HostNameLookups on>"
 msgstr "B<HostNameLookups> I<on>"
 
 # type: TP
 #. type: TP
-#: cups-snmp.conf.man:51
+#: cups-snmp.conf.5:49
 #, no-wrap
 msgid "B<HostNameLookups off>"
 msgstr "B<HostNameLookups> I<off>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-snmp.conf.man:55
+#: cups-snmp.conf.5:53
 msgid ""
 "Specifies whether the addresses of printers should be converted to hostnames "
 "or left as numeric IP addresses.  The default is \"off\"."
@@ -8816,14 +8736,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-snmp.conf.man:55
+#: cups-snmp.conf.5:53
 #, no-wrap
 msgid "B<MaxRunTime >I<seconds>"
 msgstr "B<MaxRunTime> I<secondes>"
 
 # type: Plain text
 #. type: Plain text
-#: cups-snmp.conf.man:60
+#: cups-snmp.conf.5:58
 msgid ""
 "Specifies the maximum number of seconds that the SNMP backend will scan the "
 "network for printers.  The default is 120 seconds (2 minutes)."
@@ -8832,234 +8752,38 @@ msgstr ""
 "transmission SNMP pour la découverte des imprimantes réseau. La valeur par "
 "défaut est de 120 secondes (2 minutes)."
 
+#. type: Plain text
+#: cups-snmp.conf.5:62
+msgid ""
+"CUPS backends are deprecated and will no longer be supported in a future "
+"feature release of CUPS.  Printers that do not support IPP can be supported "
+"using applications such as B<ippeveprinter>(1)."
+msgstr ""
+
 # type: Plain text
 #. type: Plain text
-#: cups-snmp.conf.man:63
+#: cups-snmp.conf.5:65
 msgid "B<cups-snmp>(8), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 "B<cups-snmp>(8), aide en ligne de CUPS E<lt>URL:I<http://localhost:631/"
 "help>E<gt>"
 
+# type: TH
 #. type: TH
-#: cups-snmp.man.in:12
-#, no-wrap
-msgid "cups-snmp"
-msgstr "cups-snmp"
-
-#. type: Plain text
-#: cups-snmp.man.in:15
-#, fuzzy
-msgid "snmp - cups snmp backend"
-msgstr "snmp - Programme de transmission SNMP de CUPS"
-
-#. type: Plain text
-#: cups-snmp.man.in:18
-msgid "B</usr/lib/cups/backend/snmp> I<ip-address-or-hostname>"
-msgstr "B</usr/lib/cups/backend/snmp> I<adresse_ip-ou-nom_hôte>"
-
-#. type: Plain text
-#: cups-snmp.man.in:21
-msgid "B</usr/libexec/cups/backend/snmp> I<ip-address-or-hostname>"
-msgstr "B</usr/libexec/cups/backend/snmp> I<adresse_ip-ou-nom_hôte>"
-
-#. type: Plain text
-#: cups-snmp.man.in:26
-msgid "B<lpinfo> B<-v> B<--include-schemes> snmp"
-msgstr "B<lpinfo> B<-v> B<--include-schemes> I<snmp>"
-
-#. type: Plain text
-#: cups-snmp.man.in:30
-#, fuzzy
-msgid ""
-"The CUPS SNMP backend provides legacy discovery and identification of "
-"network printers using SNMPv1.  When used for discovery through the "
-"scheduler, the backend will list all printers that respond to a broadcast "
-"SNMPv1 query with the \"public\" community name.  Additional queries are "
-"then sent to printers that respond in order to determine the correct device "
-"URI, make and model, and other information needed for printing."
-msgstr ""
-"Le programme de transmission SNMP de CUPS permet la découverte et "
-"l’identification d’imprimantes réseau existantes en utilisant SNMP v1. "
-"Lorsqu’utilisé pour la recherche par l’ordonnanceur, le programme de "
-"transmission dressera la liste de toutes les imprimantes qui répondront à "
-"une requête SNMP v1 avec le nom de communauté « public ». Des requêtes "
-"supplémentaires sont alors envoyées aux imprimantes ayant répondues pour "
-"déterminer les URI, fabricant et modèle du périphérique corrects, et "
-"quelques autres informations nécessaires pour l’impression."
-
-#. type: Plain text
-#: cups-snmp.man.in:33
-msgid ""
-"In the first form, the SNMP backend is run directly by the user to look up "
-"the device URI and other information when you have an IP address or "
-"hostname.  This can be used for programs that need to configure print queues "
-"where the user has supplied an address but nothing else."
-msgstr ""
-"D’une première manière, le programme de transmission SNMP est exécuté "
-"directement par l’utilisateur pour chercher l’URI du périphérique et autres "
-"informations lorsque d’adresse IP ou le nom d’hôte est connu. Cela peut être "
-"utilisé par des programmes pour configurer des files d’attente quand "
-"l’utilisateur a fourni seulement une adresse."
-
-#. type: Plain text
-#: cups-snmp.man.in:40
-msgid ""
-"In the second form, the SNMP backend is run indirectly using the "
-"B<lpinfo>(8)  command.  The output provides all printers detected via SNMP "
-"on the configured broadcast addresses.  I<Note: no broadcast addresses are "
-"configured by default.>"
-msgstr ""
-"D’une seconde manière, le programme de transmission SNMP est exécuté "
-"indirectement par la commande B<lpinfo>(8). La sortie fournit toutes les "
-"adresses détectées à l’aide de SNMP sur les adresses d’émission configurées. "
-"B<Remarque : aucune adresse d’émission n’est configurée par défaut.>"
-
-#. type: Plain text
-#: cups-snmp.man.in:43
-msgid ""
-"The DebugLevel value can be overridden using the CUPS_DEBUG_LEVEL "
-"environment variable.  The MaxRunTime value can be overridden using the "
-"CUPS_MAX_RUN_TIME environment variable."
-msgstr ""
-"La valeur DebugLevel peut être outrepassée en utilisant la variable "
-"d’environnement CUPS_DEBUG_LEVEL. La valeur MaxRunTime peut être outrepassée "
-"en utilisant la variable d’environnement CUPS_MAX_RUN_TIME."
-
-#. type: Plain text
-#: cups-snmp.man.in:47
-msgid ""
-"The SNMP backend reads the I</etc/cups/snmp.conf> configuration file, if "
-"present, to set the default broadcast address, community name, and logging "
-"level."
-msgstr ""
-"Le programme de transmission SNMP lit le fichier de configuration I</etc/"
-"cups/snmp.conf>, s’il existe, pour définir l’adresse d’émission par défaut, "
-"le nom de communauté et le niveau de journalisation."
-
-# type: Plain text
-#. type: Plain text
-#: cups-snmp.man.in:49
-msgid ""
-"The CUPS SNMP backend uses the information from the Host, Printer, and Port "
-"Monitor MIBs along with some vendor private MIBs and intelligent port probes "
-"to determine the correct device URI and make and model for each printer."
-msgstr ""
-"Le programme de transmission SNMP pour CUPS utilise les informations Host, "
-"Printer, et Port Monitor de la base MIP, en parallèle avec celle de quelques "
-"fournisseurs et des investigations intelligentes de ports, pour déterminer "
-"les URI du périphérique, fabricant et modèle corrects  pour chaque "
-"imprimante."
-
-# type: Plain text
-#. type: Plain text
-#: cups-snmp.man.in:55
-msgid ""
-"B<backend>(7), B<cups-snmp.conf>(5), B<cupsd>(8), B<lpinfo>(8), CUPS Online "
-"Help (http://localhost:631/help)"
-msgstr ""
-"B<backend>(7), B<cups-snmp.conf>(5), B<cupsd>(8), B<lpinfo>(8), aide en "
-"ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
-
-# type: TH
-#. type: TH
-#: cupstestdsc.man:13
-#, no-wrap
-msgid "cupstestdsc"
-msgstr "cupstestdsc"
-
-# type: Plain text
-#. type: Plain text
-#: cupstestdsc.man:16
-msgid "cupstestdsc - test conformance of postscript files (deprecated)"
-msgstr "cupstestdsc - Tester la conformité des fichiers postscript (obsolète)"
-
-# type: Plain text
-#. type: Plain text
-#: cupstestdsc.man:25
-msgid "B<cupstestdsc> [ B<-h> ] I<filename.ps> [ ...  I<filenameN.ps> ]"
-msgstr "B<cupstestdsc> [ B<-h> ] I<nom_fichier.ps> [ ... I<nom_fichierN.ps> ]"
-
-# type: Plain text
-#. type: Plain text
-#: cupstestdsc.man:31
-msgid "B<cupstestdsc> [ B<-h> ] B<->"
-msgstr "B<cupstestdsc> [ B<-h> ] B<->"
-
-# type: Plain text
-#. type: Plain text
-#: cupstestdsc.man:35
-msgid ""
-"B<cupstestdsc> tests the conformance of PostScript files to the Adobe "
-"PostScript Language Document Structuring Conventions Specification version "
-"3.0.  The results of testing and any other output are sent to the standard "
-"output.  The second form of the command reads PostScript from the standard "
-"input."
-msgstr ""
-"B<cupstestdsc> teste la conformité de fichiers PostScript avec la "
-"spécification de format de fichier édictée par Adobe, « Adobe PostScript "
-"Language Document Structuring Conventions Specification » dans sa "
-"version 3.0. Les résultats des tests et autres sorties sont envoyés sur la "
-"sortie standard. La seconde forme de la commande lit l'entrée PostScript "
-"depuis l'entrée standard."
-
-#. type: Plain text
-#: cupstestdsc.man:37
-#, fuzzy
-msgid ""
-"I<This program is deprecated and will be removed in a future release of CUPS."
-">"
-msgstr ""
-"B<Ce programme est obsolète et sera supprimé dans une future version de CUPS."
-">"
-
-# type: Plain text
-#. type: Plain text
-#: cupstestdsc.man:41
-msgid ""
-"B<cupstestdsc> only validates the DSC comments in a PostScript file and does "
-"not attempt to validate the PostScript code itself.  Developers must ensure "
-"that the PostScript they generate follows the rules defined by Adobe.  "
-"Specifically, all pages must be independent of each other, code outside page "
-"descriptions may not affect the graphics state (current font, color, "
-"transform matrix, etc.), and device-specific commands such as setpagedevice "
-"should not be used."
-msgstr ""
-"B<cupstestdsc> ne valide que les commentaires DSC du fichier PostScript et "
-"ne cherche pas à valider le code PostScript lui-même. Les développeurs "
-"doivent s'assurer que le PostScript qu'ils génèrent est conforme aux règles "
-"définies par Adobe. En particulier, toutes les pages doivent être "
-"indépendantes les unes des autres, le code, en dehors des descriptions de "
-"pages, ne doit pas affecter l'état graphique (police, couleur, matrices de "
-"transformations, etc.) et les commandes spécifiques à certains périphériques "
-"(comme B<setpagedevice> par exemple) ne doivent pas être utilisées."
-
-# type: Plain text
-#. type: Plain text
-#: cupstestdsc.man:45
-msgid ""
-"CUPS Online Help (http://localhost:631/help), Adobe PostScript Language "
-"Document Structuring Conventions Specification, Version 3.0."
-msgstr ""
-"Aide en ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>, Adobe "
-"PostScript Language Document Structuring Conventions Specification, "
-"Version 3.0."
-
-# type: TH
-#. type: TH
-#: cupstestppd.man:13
+#: cupstestppd.1:10
 #, no-wrap
 msgid "cupstestppd"
 msgstr "cupstestppd"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:16
+#: cupstestppd.1:13
 msgid "cupstestppd - test conformance of ppd files"
 msgstr "cupstestppd - Tester la conformité des fichiers PPD."
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:38
+#: cupstestppd.1:35
 msgid ""
 "B<cupstestppd> [ B<-I> I<category> ] [ B<-R> I<rootdir> ] [ B<-W> "
 "I<category> ] [ B<-q> ] [ B<-r> ] [ B<-v>[B<v>] ] I<filename.ppd[.gz]> "
@@ -9071,7 +8795,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:54
+#: cupstestppd.1:51
 msgid ""
 "B<cupstestppd> [ B<-R> I<rootdir> ] [ B<-W> I<category> ] [ B<-q> ] [ B<-"
 "r> ] [ B<-v>[B<v>] ] B<->"
@@ -9081,7 +8805,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:58
+#: cupstestppd.1:55
 msgid ""
 "B<cupstestppd> tests the conformance of PPD files to the Adobe PostScript "
 "Printer Description file format specification version 4.3.  It can also be "
@@ -9096,7 +8820,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:61
+#: cupstestppd.1:58
 msgid ""
 "The first form of B<cupstestppd> tests one or more PPD files on the command-"
 "line.  The second form tests the PPD file provided on the standard input."
@@ -9107,51 +8831,51 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:63
+#: cupstestppd.1:60
 msgid "B<cupstestppd> supports the following options:"
 msgstr "B<cupstestppd> accepte les options suivantes :"
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:63
+#: cupstestppd.1:60
 #, no-wrap
 msgid "B<-I filename>"
 msgstr "B<-I> I<nom_fichier>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:66
+#: cupstestppd.1:63
 msgid "Ignores all PCFileName warnings."
 msgstr "Ignorer tous les avertissements PCFileName."
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:66
+#: cupstestppd.1:63
 #, no-wrap
 msgid "B<-I filters>"
 msgstr "B<-I> I<filtres>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:69
+#: cupstestppd.1:66
 msgid "Ignores all filter errors."
 msgstr "Ignorer toutes les erreurs sur les filtres."
 
 # type: Plain text
 #. type: TP
-#: cupstestppd.man:69
+#: cupstestppd.1:66
 #, no-wrap
 msgid "B<-I profiles>"
 msgstr "B<-I> I<profils>"
 
 #. type: Plain text
-#: cupstestppd.man:72
+#: cupstestppd.1:69
 msgid "Ignores all profile errors."
 msgstr "Ignorer toutes les erreurs de profil."
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:72
+#: cupstestppd.1:69
 #, no-wrap
 msgid "B<-R >I<rootdir>"
 msgstr "B<-R> I<rép_racine>"
@@ -9159,7 +8883,7 @@ msgstr "B<-R> I<rép_racine>"
 # NOTE: support file checks?
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:75
+#: cupstestppd.1:72
 msgid ""
 "Specifies an alternate root directory for the filter, pre-filter, and other "
 "support file checks."
@@ -9169,27 +8893,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:75
+#: cupstestppd.1:72
 #, no-wrap
 msgid "B<-W constraints>"
 msgstr "B<-W> I<constraints>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:78
+#: cupstestppd.1:75
 msgid "Report all UIConstraint errors as warnings."
 msgstr "Signaler toutes les erreurs UIConstraint comme des avertissements."
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:78
+#: cupstestppd.1:75
 #, no-wrap
 msgid "B<-W defaults>"
 msgstr "B<-W> I<defaults>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:81
+#: cupstestppd.1:78
 msgid ""
 "Except for size-related options, report all default option errors as "
 "warnings."
@@ -9199,39 +8923,39 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:81
+#: cupstestppd.1:78
 #, no-wrap
 msgid "B<-W filters>"
 msgstr "B<-W> I<filters>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:84
+#: cupstestppd.1:81
 msgid "Report all filter errors as warnings."
 msgstr "Rapporter toutes les erreurs sur les filtres comme des avertissements."
 
 # type: Plain text
 #. type: TP
-#: cupstestppd.man:84
+#: cupstestppd.1:81
 #, no-wrap
 msgid "B<-W profiles>"
 msgstr "B<-W> I<profiles>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:87
+#: cupstestppd.1:84
 msgid "Report all profile errors as warnings."
 msgstr "Rapporter toutes les erreurs sur les profils comme des avertissements."
 
 #. type: TP
-#: cupstestppd.man:87
+#: cupstestppd.1:84
 #, no-wrap
 msgid "B<-W sizes>"
 msgstr "B<-W> I<sizes>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:90
+#: cupstestppd.1:87
 msgid "Report all media size errors as warnings."
 msgstr ""
 "Rapporter toutes les erreurs sur la taille des médias comme des "
@@ -9239,64 +8963,64 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:90
+#: cupstestppd.1:87
 #, no-wrap
 msgid "B<-W translations>"
 msgstr "B<-W> I<translations>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:93
+#: cupstestppd.1:90
 msgid "Report all translation errors as warnings."
 msgstr "Rapporter toutes les erreurs de conversion comme des avertissements."
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:93
+#: cupstestppd.1:90
 #, no-wrap
 msgid "B<-W all>"
 msgstr "B<-W> I<all>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:96
+#: cupstestppd.1:93
 msgid "Report all of the previous errors as warnings."
 msgstr "Rapporter toutes les erreurs précédentes comme des avertissements."
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:96
+#: cupstestppd.1:93
 #, no-wrap
 msgid "B<-W none>"
 msgstr "B<-W> I<none>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:99
+#: cupstestppd.1:96
 msgid "Report all of the previous errors as errors."
 msgstr "Rapporter toutes les erreurs précédentes comme des erreurs."
 
 #. type: TP
-#: cupstestppd.man:99 ippfind.man:110 ipptool.man:176 lpr.man:109
+#: cupstestppd.1:96 ippfind.1:107 ipptool.1:181 lpr.1:106
 #, no-wrap
 msgid "B<-q>"
 msgstr "B<-q>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:102
+#: cupstestppd.1:99
 msgid "Specifies that no information should be displayed."
 msgstr "Ne pas afficher d’information."
 
 #. type: TP
-#: cupstestppd.man:102 ippfind.man:115 lpr.man:112 lpstat.man:118
+#: cupstestppd.1:99 ippfind.1:112 lpr.1:109 lpstat.1:114
 #, no-wrap
 msgid "B<-r>"
 msgstr "B<-r>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:105
+#: cupstestppd.1:102
 msgid ""
 "Relaxes the PPD conformance requirements so that common whitespace, control "
 "character, and formatting problems are not treated as hard errors."
@@ -9305,9 +9029,15 @@ msgstr ""
 "simples, les caractères de contrôle et les problèmes de format ne soient pas "
 "traités comme des erreurs fatales."
 
+#. type: TP
+#: cupstestppd.1:102 ipptool.1:187 ppdc.1:76
+#, no-wrap
+msgid "B<-v>"
+msgstr "B<-v>"
+
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:108
+#: cupstestppd.1:105
 msgid ""
 "Specifies that detailed conformance testing results should be displayed "
 "rather than the concise PASS/FAIL/ERROR status."
@@ -9316,14 +9046,14 @@ msgstr ""
 "des états concis PASS/FAIL/ERROR."
 
 #. type: TP
-#: cupstestppd.man:108
+#: cupstestppd.1:105
 #, no-wrap
 msgid "B<-vv>"
 msgstr "B<-vv>"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:111
+#: cupstestppd.1:108
 msgid ""
 "Specifies that all information in the PPD file should be displayed in "
 "addition to the detailed conformance testing results."
@@ -9333,13 +9063,13 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:113
+#: cupstestppd.1:110
 msgid "The I<-q>, I<-v>, and I<-vv> options are mutually exclusive."
 msgstr "Les options B<-q>, B<-v> et B<-vv> sont mutuellement exclusives."
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:116
+#: cupstestppd.1:113
 msgid ""
 "B<cupstestppd> returns zero on success and non-zero on error.  The error "
 "codes are as follows:"
@@ -9349,14 +9079,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:116
+#: cupstestppd.1:113
 #, no-wrap
 msgid "1"
 msgstr "1"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:119
+#: cupstestppd.1:116
 msgid "Bad command-line arguments or missing PPD filename."
 msgstr ""
 "Paramètres de la ligne de commandes incorrects ou nom de fichier PPD "
@@ -9364,47 +9094,47 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:119
+#: cupstestppd.1:116
 #, no-wrap
 msgid "2"
 msgstr "2"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:122
+#: cupstestppd.1:119
 msgid "Unable to open or read PPD file."
 msgstr "Impossible d'ouvrir ou de lire le fichier PPD."
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:122
+#: cupstestppd.1:119
 #, no-wrap
 msgid "3"
 msgstr "3"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:125
+#: cupstestppd.1:122
 msgid "The PPD file contains format errors that cannot be skipped."
 msgstr ""
 "Le fichier PPD contient des erreurs de format ne pouvant être ignorées."
 
 # type: TP
 #. type: TP
-#: cupstestppd.man:125
+#: cupstestppd.1:122
 #, no-wrap
 msgid "4"
 msgstr "4"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:128
+#: cupstestppd.1:125
 msgid "The PPD file does not conform to the Adobe PPD specification."
 msgstr "Le fichier PPD n'est pas conforme à la spécification Adobe."
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:130
+#: cupstestppd.1:127
 msgid ""
 "The following command will test all PPD files under the current directory "
 "and print the names of each file that does not conform:"
@@ -9414,14 +9144,14 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:133
+#: cupstestppd.1:130
 #, no-wrap
 msgid "    find . -name \\e*.ppd \\e! -exec cupstestppd -q '{}' \\e; -print\n"
 msgstr "    find . -name \\e*.ppd \\e! -exec cupstestppd -q '{}' \\e; -print\n"
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:136
+#: cupstestppd.1:133
 msgid ""
 "The next command tests all PPD files under the current directory and print "
 "detailed conformance testing results for the files that do not conform:"
@@ -9432,7 +9162,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:140
+#: cupstestppd.1:137
 #, no-wrap
 msgid ""
 "    find . -name \\e*.ppd \\e! -exec cupstestppd -q '{}' \\e; \\e\n"
@@ -9441,9 +9171,18 @@ msgstr ""
 "    find . -name \\e*.ppd \\e! -exec cupstestppd -q '{}' \\e; \\e\n"
 "        -exec cupstestppd -v '{}' \\e;\n"
 
+#. type: Plain text
+#: cupstestppd.1:142 ppdc.1:94 ppdcfile.5:153 ppdhtml.1:39 ppdi.1:46
+#: ppdmerge.1:39 ppdpo.1:46
+msgid ""
+"PPD files are deprecated and will no longer be supported in a future feature "
+"release of CUPS.  Printers that do not support IPP can be supported using "
+"applications such as B<ippeveprinter>(1)."
+msgstr ""
+
 # type: Plain text
 #. type: Plain text
-#: cupstestppd.man:145
+#: cupstestppd.1:146
 msgid ""
 "B<lpadmin>(8), CUPS Online Help (http://localhost:631/help), Adobe "
 "PostScript Printer Description File Format Specification, Version 4.3."
@@ -9454,28 +9193,21 @@ msgstr ""
 
 # type: TP
 #. type: TH
-#: filter.man:13
+#: filter.7:10
 #, no-wrap
 msgid "filter"
 msgstr "filter"
 
-# type: TH
-#. type: TH
-#: filter.man:13
-#, no-wrap
-msgid "19 October 2015"
-msgstr "19 octobre 2015"
-
 # type: Plain text
 #. type: Plain text
-#: filter.man:16
+#: filter.7:13
 msgid "filter - cups file conversion filter interface"
 msgstr ""
 "filter - Interface pour des filtres de conversion de fichiers pour CUPS."
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:26
+#: filter.7:23
 msgid ""
 "B<filter> I<job> I<user> I<title> I<num-copies> I<options> [ I<filename> ]"
 msgstr ""
@@ -9483,7 +9215,7 @@ msgstr ""
 "I<options>[ I<nom_fichier> ]"
 
 #. type: Plain text
-#: filter.man:32
+#: filter.7:29
 #, no-wrap
 msgid ""
 "B<ssize_t cupsBackChannelRead>(B<char *>I<buffer>, B<size_t >I<bytes>,\n"
@@ -9493,7 +9225,7 @@ msgstr ""
 "                            B<double >I<délai>);\n"
 
 #. type: Plain text
-#: filter.man:36
+#: filter.7:33
 #, no-wrap
 msgid ""
 "B<cups_sc_status_t cupsSideChannelDoRequest>(B<cups_sc_command_t >I<command>,\n"
@@ -9505,13 +9237,13 @@ msgstr ""
 "                                          B<double >I<délai>);\n"
 
 #. type: Plain text
-#: filter.man:38
+#: filter.7:35
 #, no-wrap
 msgid "B<#include E<lt>cups/ppd.hE<gt>>\n"
 msgstr "B<#include E<lt>cups/ppd.hE<gt>>\n"
 
 #. type: Plain text
-#: filter.man:41
+#: filter.7:38
 #, no-wrap
 msgid ""
 "B<const char *cupsGetOption>(B<const char *>I<name>, B<int >I<num_options>,\n"
@@ -9521,7 +9253,7 @@ msgstr ""
 "                 B<cups_option_t *>I<options>);\n"
 
 #. type: Plain text
-#: filter.man:44
+#: filter.7:41
 #, no-wrap
 msgid ""
 "B<int cupsMarkOptions>(B<ppd_file_t *>I<ppd>, B<int >I<num_options>,\n"
@@ -9531,7 +9263,7 @@ msgstr ""
 "                    B<cups_option_t *>I<options>);\n"
 
 #. type: Plain text
-#: filter.man:47
+#: filter.7:44
 #, no-wrap
 msgid ""
 "B<int cupsParseOptions>(B<const char *>I<arg>, B<int >I<num_options>,\n"
@@ -9541,26 +9273,26 @@ msgstr ""
 "                     B<cups_option_t **>I<options>);\n"
 
 #. type: Plain text
-#: filter.man:49
+#: filter.7:46
 #, no-wrap
 msgid "B<ppd_choice_t *ppdFindMarkedChoice>(B<ppd_file_t *>I<ppd>, B<const char *>I<keyword>);\n"
 msgstr "B<ppd_choice_t *ppdFindMarkedChoice>(B<ppd_file_t *>I<ppd>, B<const char *>I<mot_clef>);\n"
 
 #. type: Plain text
-#: filter.man:51
+#: filter.7:48
 #, no-wrap
 msgid "B<void ppdMarkDefaults>(B<ppd_file_t *>I<ppd>);\n"
 msgstr "B<void ppdMarkDefaults>(B<ppd_file_t *>I<ppd>);\n"
 
 #. type: Plain text
-#: filter.man:53
+#: filter.7:50
 #, no-wrap
 msgid "B<ppd_file_t *ppdOpenFile>(B<const char *>I<filename>);\n"
 msgstr "B<ppd_file_t *ppdOpenFile>(B<const char *>I<fichier>);\n"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:57
+#: filter.7:54
 msgid ""
 "The CUPS filter interface provides a standard method for adding support for "
 "new document types or printers to CUPS.  Each filter is capable of "
@@ -9576,7 +9308,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:61
+#: filter.7:58
 msgid ""
 "Filters B<MUST> be capable of reading from a filename on the command-line or "
 "from the standard input, copying the standard input to a temporary file as "
@@ -9593,7 +9325,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:63
+#: filter.7:60
 msgid ""
 "The command name (I<argv[0]>) is set to the name of the destination printer "
 "but is also available in the B<PRINTER>I< environment variable.>"
@@ -9603,7 +9335,7 @@ msgstr ""
 "B<PRINTER>."
 
 #. type: Plain text
-#: filter.man:70
+#: filter.7:67
 msgid ""
 "Options are passed in I<argv[5]> and are encoded from the corresponding IPP "
 "attributes used when the job was submitted. Use the B<cupsParseOptions>()  "
@@ -9621,7 +9353,7 @@ msgstr ""
 "requested »."
 
 #. type: Plain text
-#: filter.man:79
+#: filter.7:76
 msgid ""
 "Options passed on the command-line typically do not include the default "
 "choices the printer's PPD file. Use the B<ppdMarkDefaults>()  and "
@@ -9641,7 +9373,7 @@ msgstr ""
 "actuelle de l’option PPD B<Duplex> :"
 
 #. type: Plain text
-#: filter.man:84
+#: filter.7:81
 #, no-wrap
 msgid ""
 "    ppd_file_t *ppd = ppdOpenFile(getenv(\"PPD\"));\n"
@@ -9653,7 +9385,7 @@ msgstr ""
 "    int num_options = cupsParseOptions(argv[5], 0, &options);\n"
 
 #. type: Plain text
-#: filter.man:87
+#: filter.7:84
 #, no-wrap
 msgid ""
 "    ppdMarkDefaults(ppd);\n"
@@ -9663,13 +9395,13 @@ msgstr ""
 "    cupsMarkOptions(ppd, num_options, options);\n"
 
 #. type: Plain text
-#: filter.man:89
+#: filter.7:86
 #, no-wrap
 msgid "    ppd_choice_t *choice = ppdFindMarkedChoice(ppd, \"Duplex\");\n"
 msgstr "    ppd_choice_t *choice = ppdFindMarkedChoice(ppd, \"Duplex\");\n"
 
 #. type: Plain text
-#: filter.man:93
+#: filter.7:90
 msgid ""
 "Raster filters should use option choices set through the raster page header, "
 "as those reflect the options in effect for a given page.  Options specified "
@@ -9684,14 +9416,14 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: filter.man:93
+#: filter.7:90
 #, no-wrap
 msgid "LOG MESSAGES"
 msgstr "MESSAGES JOURNALISÉS"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:96
+#: filter.7:93
 msgid ""
 "Messages sent to the standard error are generally stored in the printer's "
 "\"printer-state-message\" attribute and the current B<ErrorLog> file.  Each "
@@ -9703,14 +9435,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:96
+#: filter.7:93
 #, no-wrap
 msgid "B<ALERT: >I<message>"
 msgstr "B<ALERT: >I<message>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:99
+#: filter.7:96
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"alert\" log level."
@@ -9721,13 +9453,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:99
+#: filter.7:96
 #, no-wrap
 msgid "B<ATTR: >I<attribute=value >[ I<... attribute=value>]"
 msgstr "B<ATTR: >I<attribut=valeur >[ I<... attribut=valeur>]"
 
 #. type: Plain text
-#: filter.man:105
+#: filter.7:102
 msgid ""
 "Sets the named job or printer attribute(s). The following job attributes can "
 "be set: \"job-media-progress\". The following printer attributes can be set: "
@@ -9744,14 +9476,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:105
+#: filter.7:102
 #, no-wrap
 msgid "B<CRIT: >I<message>"
 msgstr "B<CRIT: >I<message>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:108
+#: filter.7:105
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"critical\" log level."
@@ -9762,13 +9494,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:108
+#: filter.7:105
 #, no-wrap
 msgid "B<DEBUG: >I<message>"
 msgstr "B<DEBUG: >I<message>"
 
 #. type: Plain text
-#: filter.man:112
+#: filter.7:109
 msgid ""
 "Adds the specified message to the current B<ErrorLog> using the \"debug\" "
 "log level.  B<DEBUG> messages are never stored in the \"printer-state-message"
@@ -9780,13 +9512,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:112
+#: filter.7:109
 #, no-wrap
 msgid "B<DEBUG2: >I<message>"
 msgstr "B<DEBUG2: >I<message>"
 
 #. type: Plain text
-#: filter.man:117
+#: filter.7:114
 msgid ""
 "Adds the specified message to the current B<ErrorLog> using the \"debug2\" "
 "log level.  B<DEBUG2> messages are never stored in the \"printer-state-"
@@ -9798,14 +9530,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:117
+#: filter.7:114
 #, no-wrap
 msgid "B<EMERG: >I<message>"
 msgstr "B<EMERG: >I<message>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:120
+#: filter.7:117
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"emergency\" log level."
@@ -9816,14 +9548,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:120
+#: filter.7:117
 #, no-wrap
 msgid "B<ERROR:>I< message>"
 msgstr "B<ERROR:>I< message>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:123
+#: filter.7:120
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"error\" log level."
@@ -9834,14 +9566,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:123
+#: filter.7:120
 #, no-wrap
 msgid "B<INFO:>I< message>"
 msgstr "B<INFO:>I< message>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:126
+#: filter.7:123
 msgid ""
 "Sets the \"printer-state-message\" attribute. If the current B<LogLevel> is "
 "set to \"debug2\", also adds the specified message to the current "
@@ -9853,14 +9585,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:126
+#: filter.7:123
 #, no-wrap
 msgid "B<NOTICE:>I< message>"
 msgstr "B<NOTICE:>I< message>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:129
+#: filter.7:126
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"notice\" log level."
@@ -9871,21 +9603,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:129
+#: filter.7:126
 #, no-wrap
 msgid "B<PAGE:>I< page-number #-copies>"
 msgstr "B<PAGE:>I< numéro_page #-copies>"
 
 # type: TP
 #. type: TP
-#: filter.man:131
+#: filter.7:128
 #, no-wrap
 msgid "B<PAGE:>I< total #-pages>"
 msgstr "B<PAGE:>I< total #-pages>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:134
+#: filter.7:131
 msgid ""
 "Adds an entry to the current B<PageLog>. The first form adds I<#-copies> to "
 "the \"job-media-sheets-completed\" attribute. The second form sets the \"job-"
@@ -9896,13 +9628,13 @@ msgstr ""
 "forme définit l'attribut « job-media-sheets-completed » au nombre de pages."
 
 #. type: TP
-#: filter.man:134
+#: filter.7:131
 #, no-wrap
 msgid "B<PPD:>I< Keyword=Value> [ I<... KeywordN=Value> ]"
 msgstr "B<PPD:>I< Mot_clef=Valeur> [ I<... Mot_clefN=Valeur> ]"
 
 #. type: Plain text
-#: filter.man:137
+#: filter.7:134
 msgid ""
 "Sets the named keywords in the printer's PPD file. This is typically used to "
 "update default option keywords such as B<DefaultPageSize> and the various "
@@ -9915,28 +9647,28 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:137
+#: filter.7:134
 #, no-wrap
 msgid "B<STATE:>I< printer-state-reason >[ I<... printer-state-reason> ]"
 msgstr "B<STATE:>I< raison-état-imprimante> [ I<... raison-état-imprimante>]"
 
 # type: TP
 #. type: TP
-#: filter.man:139
+#: filter.7:136
 #, no-wrap
 msgid "B<STATE: +>I< printer-state-reason >[ I<... printer-state-reason> ]"
 msgstr "B<STATE: +>I< raison-état-imprimante>[ I<... raison-état-imprimante> ]"
 
 # type: TP
 #. type: TP
-#: filter.man:141
+#: filter.7:138
 #, no-wrap
 msgid "B<STATE: ->I< printer-state-reason >[ I<... printer-state-reason> ]"
 msgstr "B<STATE: ->I< raison-état-imprimante>[ I<...raison-état-imprimante>]"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:144
+#: filter.7:141
 msgid ""
 "Sets, adds, or removes \"printer-state-reason\" keywords for the current "
 "queue. Typically this is used to indicate media, ink, and toner conditions "
@@ -9948,14 +9680,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:144
+#: filter.7:141
 #, no-wrap
 msgid "B<WARNING:>I< message>"
 msgstr "B<WARNING:>I< message>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:147
+#: filter.7:144
 msgid ""
 "Sets the \"printer-state-message\" attribute and adds the specified message "
 "to the current B<ErrorLog> using the \"warning\" log level."
@@ -9966,14 +9698,14 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: filter.man:147
+#: filter.7:144
 #, no-wrap
 msgid "ENVIRONMENT VARIABLES"
 msgstr "VARIABLES D'ENVIRONNEMENT"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:150
+#: filter.7:147
 msgid ""
 "The following environment variables are defined by the CUPS server when "
 "executing the filter:"
@@ -9983,14 +9715,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:150
+#: filter.7:147
 #, no-wrap
 msgid "B<CHARSET>"
 msgstr "B<CHARSET>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:153
+#: filter.7:150
 msgid "The default text character set, typically \"utf-8\"."
 msgstr ""
 "Définir le jeu de caractères par défaut à utiliser pour les textes, "
@@ -9998,14 +9730,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:153
+#: filter.7:150
 #, no-wrap
 msgid "B<CLASS>"
 msgstr "B<CLASS>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:156
+#: filter.7:153
 msgid ""
 "When a job is submitted to a printer class, contains the name of the "
 "destination printer class. Otherwise this environment variable will not be "
@@ -10017,14 +9749,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:156
+#: filter.7:153
 #, no-wrap
 msgid "B<CONTENT_TYPE>"
 msgstr "B<CONTENT_TYPE>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:159
+#: filter.7:156
 msgid ""
 "The MIME media type associated with the submitted job file, for example "
 "\"application/postscript\"."
@@ -10034,7 +9766,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:162
+#: filter.7:159
 msgid ""
 "The directory where semi-persistent cache files can be found and stored."
 msgstr ""
@@ -10042,13 +9774,13 @@ msgstr ""
 "persistants."
 
 #. type: TP
-#: filter.man:165
+#: filter.7:162
 #, no-wrap
 msgid "B<CUPS_FILETYPE>"
 msgstr "B<CUPS_FILETYPE>"
 
 #. type: Plain text
-#: filter.man:169
+#: filter.7:166
 msgid ""
 "The type of file being printed: \"job-sheet\" for a banner page and "
 "\"document\" for a regular print file."
@@ -10057,13 +9789,13 @@ msgstr ""
 "bannière et « document » pour un fichier d’impression normal."
 
 #. type: TP
-#: filter.man:169
+#: filter.7:166
 #, no-wrap
 msgid "B<CUPS_MAX_MESSAGE>"
 msgstr "B<CUPS_MAX_MESSAGE>"
 
 #. type: Plain text
-#: filter.man:172
+#: filter.7:169
 msgid ""
 "The maximum size of a message sent to I<stderr>, including any leading "
 "prefix and the trailing newline."
@@ -10073,14 +9805,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:175
+#: filter.7:172
 #, no-wrap
 msgid "B<FINAL_CONTENT_TYPE>"
 msgstr "B<FINAL_CONTENT_TYPE>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:178
+#: filter.7:175
 msgid ""
 "The MIME media type associated with the output destined for the printer, for "
 "example \"application/vnd.cups-postscript\"."
@@ -10090,27 +9822,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:178
+#: filter.7:175
 #, no-wrap
 msgid "B<LANG>"
 msgstr "B<LANG>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:181
+#: filter.7:178
 msgid "The default language locale (typically C or en)."
 msgstr "La locale de langue par défaut (généralement B<C> ou B<en>)."
 
 # type: TP
 #. type: TP
-#: filter.man:181
+#: filter.7:178
 #, no-wrap
 msgid "B<PATH>"
 msgstr "B<PATH>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:184
+#: filter.7:181
 msgid ""
 "The standard execution path for external programs that may be run by the "
 "filter."
@@ -10119,14 +9851,14 @@ msgstr ""
 "exécutés par le filtre."
 
 #. type: TP
-#: filter.man:184
+#: filter.7:181
 #, no-wrap
 msgid "B<PPD>"
 msgstr "B<PPD>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:187
+#: filter.7:184
 msgid ""
 "The full pathname of the PostScript Printer Description (PPD) file for this "
 "printer."
@@ -10136,20 +9868,20 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:190
+#: filter.7:187
 msgid "The name of the printer."
 msgstr "Le nom de l'imprimante."
 
 # type: TP
 #. type: TP
-#: filter.man:190
+#: filter.7:187
 #, no-wrap
 msgid "B<RIP_CACHE>"
 msgstr "B<RIP_CACHE>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:193
+#: filter.7:190
 msgid ""
 "The recommended amount of memory to use for Raster Image Processors (RIPs)."
 msgstr ""
@@ -10158,14 +9890,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: filter.man:193
+#: filter.7:190
 #, no-wrap
 msgid "B<SOFTWARE>"
 msgstr "B<SOFTWARE>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:196
+#: filter.7:193
 msgid ""
 "The name and version number of the server (typically CUPS/I<major.minor>)."
 msgstr ""
@@ -10173,27 +9905,27 @@ msgstr ""
 "mineur>)."
 
 #. type: TP
-#: filter.man:196
+#: filter.7:193
 #, no-wrap
 msgid "B<TZ>"
 msgstr "B<TZ>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:199
+#: filter.7:196
 msgid "The timezone of the server."
 msgstr "Le fuseau horaire du serveur"
 
 # type: TP
 #. type: TP
-#: filter.man:199
+#: filter.7:196
 #, no-wrap
 msgid "B<USER>"
 msgstr "B<USER>"
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:202
+#: filter.7:199
 msgid ""
 "The user executing the filter, typically \"lp\" or \"root\"; consult the "
 "I<cups-files.conf> file for the current setting."
@@ -10202,7 +9934,7 @@ msgstr ""
 "consultez le fichier I<cups-files.conf> pour le paramétrage actuel."
 
 #. type: Plain text
-#: filter.man:204
+#: filter.7:201
 msgid ""
 "While the filter interface is compatible with System V interface scripts, "
 "CUPS does not support System V interface scripts."
@@ -10211,7 +9943,7 @@ msgstr ""
 "de System V, CUPS lui-même ne les gère pas."
 
 #. type: Plain text
-#: filter.man:211
+#: filter.7:212
 msgid ""
 "CUPS filters are not meant to be run directly by the user.  Aside from the "
 "legacy System V interface issues (I<argv[0]> is the printer name), CUPS "
@@ -10236,7 +9968,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: filter.man:217
+#: filter.7:218
 msgid ""
 "B<backend>(7), B<cups>(1), B<cups-files.conf>(5), B<cupsd>(8), "
 "B<cupsfilter>(8),"
@@ -10245,5452 +9977,5696 @@ msgstr ""
 "B<cupsfilter>(8),"
 
 #. type: TH
-#: ippfind.man:12
+#: ippevepcl.7:9
 #, no-wrap
-msgid "ippfind"
-msgstr "ippfind"
+msgid "ippevepcl/ps"
+msgstr ""
 
 # type: TH
 #. type: TH
-#: ippfind.man:12
+#: ippevepcl.7:9
 #, no-wrap
-msgid "14 February 2018"
-msgstr "14 février 2018"
+msgid "24 April 2019"
+msgstr "24 avril 2019"
 
 #. type: Plain text
-#: ippfind.man:15
-msgid "ippfind - find internet printing protocol printers"
+#: ippevepcl.7:12
+msgid "ippevepcl/ps - pcl and postscript print commands for ippeveprinter"
 msgstr ""
-"ippfind - Trouver des imprimantes utilisant le protocole internet "
-"d’impression"
+
+# type: TP
+#. type: Plain text
+#: ippevepcl.7:17
+#, fuzzy
+msgid "B<ippevepcl> [ I<filename> ]"
+msgstr "B<PageLog> [ I<nom_fichier> ]"
+
+# type: TP
+#. type: Plain text
+#: ippevepcl.7:22
+#, fuzzy
+msgid "B<ippeveps> [ I<filename> ]"
+msgstr "B<PageLog> [ I<nom_fichier> ]"
 
 #. type: Plain text
-#: ippfind.man:22
+#: ippevepcl.7:31
 msgid ""
-"B<ippfind> [ I<options> ] I<regtype>[B<,>I<subtype>][B<.>I<domain>B<.>] ... "
-"[ I<expression> ... ]"
+"B<ippevepcl> and B<ippeveps> are print commands for B<ippeveprinter>(1).  As "
+"with all print commands, these commands read either the filename specified "
+"on the command-line or from the standard input.  Output is sent to the "
+"standard output.  Status and progress messages are sent to the standard "
+"error."
 msgstr ""
-"B<ippfind> [ I<options> ] I<type_exp_rat>[B<,>I<sous-type>][B<.>I<domaine>B<."
-">] ... [ I<expression> ... ]"
 
 #. type: Plain text
-#: ippfind.man:29
+#: ippevepcl.7:34
 msgid ""
-"B<ippfind> [ I<options> ] I<name>[B<.>I<regtype>[B<.>I<domain>B<.>]] ... "
-"[ I<expression> ... ]"
+"B<ippevepcl> prints to B&W HP PCL laser printers and supports printing of HP "
+"PCL (application/vnd.hp-pcl), PWG Raster (image/pwg-raster), and Apple "
+"Raster (image/urf) print files."
 msgstr ""
-"B<ippfind> [ I<options> ] I<nom>[B<.>I<type_exp_rat>[B<.>I<domaine>B<."
-">]] ... [ I<expression> ... ]"
 
-# type: Plain text
 #. type: Plain text
-#: ippfind.man:32
-msgid "B<ippfind> B<--help>"
-msgstr "B<ippfind> B<--help>"
+#: ippevepcl.7:39
+msgid ""
+"B<ippeveps> print to Adobe PostScript printers and supports printing of PDF "
+"(application/pdf), PostScript (application/postscript), JPEG (image/jpeg), "
+"PWG Raster (image/pwg-raster), and Apple Raster (image/urf) print files.  "
+"Printer-specific commands are read from a supplied PPD file.  If no PPD file "
+"is specified, generic commands suitable for any Level 2 or Level 3 "
+"PostScript printer are used instead to specify duplex printing and media "
+"size."
+msgstr ""
 
-# type: Plain text
 #. type: Plain text
-#: ippfind.man:35
-msgid "B<ippfind> B<--version>"
-msgstr "B<ippfind> B<--version>"
+#: ippevepcl.7:41
+msgid "These programs return 1 on error and 0 on success."
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:38
+#: ippevepcl.7:45
 msgid ""
-"B<ippfind> finds services registered with a DNS server or available through "
-"local devices.  Its primary purpose is to find IPP printers and show their "
-"URIs, show their current status, or run commands."
+"These program inherit the environment provided by the B<ippeveprinter> "
+"program."
 msgstr ""
-"B<ippfind> trouve les services enregistrés avec un serveur DNS ou disponible "
-"à travers des périphériques locaux. Son but principal est de trouver les "
-"imprimantes et afficher leurs URI, leur état actuel, ou exécuter des "
-"commandes."
 
-# type: SH
-#. type: SS
-#: ippfind.man:38
-#, no-wrap
-msgid "REGISTRATION TYPES"
-msgstr "TYPES DE DÉCLARATION"
+# type: TP
+#. type: Plain text
+#: ippevepcl.7:47
+#, fuzzy
+msgid "B<ippeveprinter>(8)"
+msgstr "B<-p> [I<imprimante(s)>]"
 
 # type: Plain text
 #. type: Plain text
-#: ippfind.man:40
-msgid "B<ippfind> supports the following registration types:"
-msgstr "B<ippfind> accepte les types d’enregistrement suivants :"
+#: ippevepcl.7:48
+msgid "Copyright \\[co] 2019 by Apple Inc."
+msgstr "Copyright 2019 par Apple Inc."
 
-#. type: TP
-#: ippfind.man:40
+# type: TP
+#. type: TH
+#: ippeveprinter.1:9
+#, fuzzy, no-wrap
+msgid "ippeveprinter"
+msgstr "/printers"
+
+# type: TH
+#. type: TH
+#: ippeveprinter.1:9
 #, no-wrap
-msgid "_http._tcp"
-msgstr "_http._tcp"
+msgid "17 May 2019"
+msgstr "17 mai 2019"
 
 #. type: Plain text
-#: ippfind.man:43
-msgid "HyperText Transport Protocol (HTTP, RFC 2616)"
-msgstr "HyperText Transport Protocol (HTTP, RFC 2616)"
+#: ippeveprinter.1:12
+msgid "ippeveprinter - an ipp everywhere printer application for cups"
+msgstr ""
 
-#. type: TP
-#: ippfind.man:43
-#, no-wrap
-msgid "_https._tcp"
-msgstr "_https._tcp"
+# type: Plain text
+#. type: Plain text
+#: ippeveprinter.1:79
+#, fuzzy
+msgid ""
+"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] "
+"[ B<-2> ] [ B<-D> I<device-uri> ] [ B<-F> I<output-type/subtype> ] [ B<-K> "
+"I<keypath> ] [ B<-M> I<manufacturer> ] [ B<-P> I<filename.ppd> ] [ B<-V> "
+"I<ipp-version> ] [ B<-a> I<filename.conf> ] [ B<-c> I<command> ] [ B<-d> "
+"I<spool-directory> ] [ B<-f> I<type/subtype[,...]> ] [ B<-i> I<iconfile."
+"png> ] [ B<-k> ] [ B<-l> I<location> ] [ B<-m> I<model> ] [ B<-n> "
+"I<hostname> ] [ B<-p> I<port> ] [ B<-r> I<subtype[,subtype]> ] [ B<-s> "
+"I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
+msgstr ""
+"B<ippserver> [ B<-2> ] [ B<-M> I<fabricant> ] [ B<-P> ] [ B<-c> "
+"I<commande> ] [ B<-d> I<rép_spool> ] [ B<-f> I<type/sous-type[,...]> ] [ B<-"
+"h> ] [ B<-i> I<icône.png> ] [ B<-k> ] [ B<-l> I<emplacement> ] [ B<-m> "
+"I<modèle> ] [ B<-n> I<hôte> ] [ B<-p> I<port> ] [ B<-r> I<sous-type> ] [ B<-"
+"s> I<vitesse[,vitesse_couleur-]> ] [ B<-v[vvv]> ] I<service>"
 
 #. type: Plain text
-#: ippfind.man:46
-msgid "Secure HyperText Transport Protocol (HTTPS, RFC 2818)"
-msgstr "Secure HyperText Transport Protocol (HTTPS, RFC 2818)"
+#: ippeveprinter.1:82
+#, fuzzy
+msgid ""
+"B<ippeveprinter> is a simple Internet Printing Protocol (IPP) server "
+"conforming to the IPP Everywhere (PWG 5100.14) specification. It can be used "
+"to test client software or act as a very basic print server that runs a "
+"command for every job that is printed."
+msgstr ""
+"B<ippserver> est un simple serveur IPP (Internet Printing Protocol) conforme "
+"à la spécification IPP Everywhere (PWG 5100.14). Il peut être utilisé pour "
+"tester le logiciel client ou agir comme un serveur d’impression très basique "
+"qui exécute une commande pour chaque travail à accomplir."
 
-#. type: TP
-#: ippfind.man:46
-#, no-wrap
-msgid "_ipp._tcp"
-msgstr "_ipp._tcp"
+# type: Plain text
+#. type: Plain text
+#: ippeveprinter.1:85
+#, fuzzy
+msgid "The following options are recognized by B<ippeveprinter:>"
+msgstr "Les options suivantes sont reconnues par B<ippserver> :"
 
+# type: Plain text
 #. type: Plain text
-#: ippfind.man:49
-msgid "Internet Printing Protocol (IPP, RFC 2911)"
-msgstr "Internet Printing Protocol (IPP, RFC 2911)"
+#: ippeveprinter.1:88
+#, fuzzy
+msgid "Show program usage."
+msgstr "Afficher un message d'aide."
 
 #. type: TP
-#: ippfind.man:49
+#: ippeveprinter.1:88
 #, no-wrap
-msgid "_ipps._tcp"
-msgstr "_ipps._tcp"
+msgid "B<--no-web-forms>"
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:52
-msgid "Secure Internet Printing Protocol (IPPS, draft)"
-msgstr "Secure Internet Printing Protocol (IPPS, ébauche)"
-
-# type: TH
-#. type: TP
-#: ippfind.man:52
-#, no-wrap
-msgid "_printer._tcp"
-msgstr "_printer._tcp"
+#: ippeveprinter.1:91
+msgid ""
+"Disable the web interface forms used to update the media and supply levels."
+msgstr ""
 
+# type: Plain text
 #. type: Plain text
-#: ippfind.man:55
-msgid "Line Printer Daemon (LPD, RFC 1179)"
-msgstr "Line Printer Daemon (LPD, RFC 1179)"
+#: ippeveprinter.1:94
+#, fuzzy
+msgid "Show the CUPS version."
+msgstr "Afficher si le serveur CUPS est actif."
 
-# type: SH
-#. type: SS
-#: ippfind.man:55
+#. type: TP
+#: ippeveprinter.1:94
 #, no-wrap
-msgid "EXPRESSIONS"
-msgstr "EXPRESSIONS"
+msgid "B<-2>"
+msgstr "B<-2>"
 
 #. type: Plain text
-#: ippfind.man:64
-msgid ""
-"B<ippfind> supports expressions much like the B<find>(1)  utility.  However, "
-"unlike B<find>(1), B<ippfind> uses POSIX regular expressions instead of "
-"shell filename matching patterns.  If I<--exec>, I<-l>, I<--ls>, I<-p>, I<--"
-"print>, I<--print-name>, I<-q>, I<--quiet>, I<-s>, or I<-x> is not "
-"specified, B<ippfind> adds I<--print> to print the service URI of anything "
-"it finds.  The following expressions are supported:"
-msgstr ""
-"B<ippfind> prend en charge les expressions de façon similaire à l’utilitaire "
-"B<find>(1). Cependant, à la différence de B<find>(1), B<ippfind> utilise des "
-"expressions rationnelles au lieu de modèles de correspondance de nom de "
-"fichier par un interpréteur de commandes.  Si B<--exec>, B<-l>, B<--ls>, B<-"
-"p>, B<--print>, B<--print-name>, B<-q>, B<--quiet>, B<-s>, ou B<-x> n’est "
-"pas précisé, B<ippfind> ajoute B<--print> pour écrire l’URI du service de "
-"toute chose trouvée. Les expressions suivantes sont prises en charge :"
-
-# type: TP
-#. type: TP
-#: ippfind.man:64
-#, no-wrap
-msgid "B<-d >I<regex>"
-msgstr "B<-d >I<exp_rationnelle>"
+#: ippeveprinter.1:97
+msgid "Report support for two-sided (duplex) printing."
+msgstr "Déclaration de prise en charge de l’impression recto-verso (duplex)."
 
 # type: TP
 #. type: TP
-#: ippfind.man:66
-#, no-wrap
-msgid "B<--domain >I<regex>"
-msgstr "B<--domain >I<exp_rationnelle>"
+#: ippeveprinter.1:97
+#, fuzzy, no-wrap
+msgid "B<-D >I<device-uri>"
+msgstr "B<-v \">I<uri_périphérique>B<\">"
 
 #. type: Plain text
-#: ippfind.man:69
-msgid "True if the domain matches the given regular expression."
-msgstr "Vrai si le domaine correspond à l’expression rationnelle fournie."
+#: ippeveprinter.1:104
+msgid ""
+"Set the device URI for print output.  The URI can be a filename, directory, "
+"or a network socket URI of the form \"socket://ADDRESS[:PORT]\" (where the "
+"default port number is 9100).  When specifying a directory, B<ippeveprinter> "
+"will create an output file using the job ID and name."
+msgstr ""
 
-# type: TP
+# type: TH
 #. type: TP
-#: ippfind.man:69
-#, no-wrap
-msgid "B<--false>"
-msgstr "B<--false>"
+#: ippeveprinter.1:104
+#, fuzzy, no-wrap
+msgid "B<-F >I<output-type/subtype[,...]>"
+msgstr "B<-f >I<type/sous-type[,...]>"
 
 #. type: Plain text
-#: ippfind.man:72
-msgid "Always false."
-msgstr "Toujours faux"
-
-# type: TP
-#. type: TP
-#: ippfind.man:72
-#, no-wrap
-msgid "B<-h >I<regex>"
-msgstr "B<-h >I<exp_rationnelle>"
+#: ippeveprinter.1:108
+msgid ""
+"Specifies the output MIME media type.  The default is \"application/"
+"postscript\" when the B<-P> option is specified."
+msgstr ""
 
 # type: TP
 #. type: TP
-#: ippfind.man:74
+#: ippeveprinter.1:108
 #, no-wrap
-msgid "B<--host >I<regex>"
-msgstr "B<--host >I<exp_rationnelle>"
+msgid "B<-M >I<manufacturer>"
+msgstr "B<-M >I<fabricant>"
 
+# type: Plain text
 #. type: Plain text
-#: ippfind.man:77
-msgid "True is the hostname matches the given regular expression."
-msgstr "Vrai si le nom d’hôte correspond à l’expression rationnelle fournie."
+#: ippeveprinter.1:112
+#, fuzzy
+msgid "Set the manufacturer of the printer.  The default is \"Example\"."
+msgstr "Définir le fabricant de l’imprimante. Par défaut, « Test »."
 
 # type: TP
 #. type: TP
-#: ippfind.man:79
-#, no-wrap
-msgid "B<--ls>"
-msgstr "B<--ls>"
+#: ippeveprinter.1:112
+#, fuzzy, no-wrap
+msgid "B<-P >I<filename.ppd>"
+msgstr "B<-p> I<nom_fichier.ppd>"
 
 #. type: Plain text
-#: ippfind.man:83
+#: ippeveprinter.1:118
 msgid ""
-"Lists attributes returned by Get-Printer-Attributes for IPP printers and "
-"traditional I<find> \"-ls\" output for HTTP URLs.  The result is true if the "
-"URI is accessible, false otherwise."
+"Load printer attributes from the specified PPD file.  This option is "
+"typically used in conjunction with the B<ippeveps>(7)  printer command (\"-c "
+"ippeveps\")."
 msgstr ""
-"Lister les attributs renvoyés par Get-Printer-Attributes pour les "
-"imprimantes et la sortie traditionnelle de I<find -ls> pour les URL HTTP. Le "
-"résultat est vrai si l’URI peut être obtenu, faux autrement."
-
-# type: TP
-#. type: TP
-#: ippfind.man:83
-#, no-wrap
-msgid "B<--local>"
-msgstr "B<--local>"
-
-#. type: Plain text
-#: ippfind.man:86
-msgid "True if the service is local to this computer."
-msgstr "Vrai si le service est local pour cette imprimante."
 
-# type: TP
 #. type: TP
-#: ippfind.man:86
+#: ippeveprinter.1:118
 #, fuzzy, no-wrap
-msgid "B<-N >I<name>"
-msgstr "B<-U> I<identifiant>"
+msgid "B<-V 1.1>"
+msgstr "B<VERSION 1.1>"
 
 #. type: TP
-#: ippfind.man:88
+#: ippeveprinter.1:120
 #, fuzzy, no-wrap
-msgid "B<--literal-name >I<name>"
-msgstr "B<--make-and-model> I<nom>"
+msgid "B<-V 2.0>"
+msgstr "B<VERSION 2.0>"
 
+# type: Plain text
 #. type: Plain text
-#: ippfind.man:91
+#: ippeveprinter.1:124
 #, fuzzy
-msgid "True if the service instance name matches the given name."
-msgstr ""
-"Vrai si le nom d’instance du service correspond à l’expression rationnelle "
-"fournie."
-
-# type: TP
-#. type: TP
-#: ippfind.man:91
-#, no-wrap
-msgid "B<-n >I<regex>"
-msgstr "B<-n >I<exp_rationnelle>"
+msgid "Specifies the maximum IPP version to report.  2.0 is the default."
+msgstr "Indiquer le numéro de version d’IPP à utiliser pour ce test."
 
 # type: TP
 #. type: TP
-#: ippfind.man:93
+#: ippeveprinter.1:124
 #, no-wrap
-msgid "B<--name >I<regex>"
-msgstr "B<--name >I<exp_rationnelle>"
+msgid "B<-c >I<command>"
+msgstr "B<-c >I<commande>"
 
 #. type: Plain text
-#: ippfind.man:96
-msgid "True if the service instance name matches the given regular expression."
+#: ippeveprinter.1:136
+msgid ""
+"Run the specified command for each document that is printed.  If \"command\" "
+"is not an absolute path (\"/path/to/command\"), B<ippeveprinter> looks for "
+"the command in the \"command\" subdirectory of the CUPS binary directory, "
+"typically /usr/lib/cups/command or /usr/libexec/cups/command.  The B<cups-"
+"config>(1)  command can be used to discover the correct binary directory "
+"(\"cups-config --serverbin\").  In addition, the CUPS_SERVERBIN environment "
+"variable can be used to override the default location of this directory - "
+"see the B<cups>(1)  man page for more details."
 msgstr ""
-"Vrai si le nom d’instance du service correspond à l’expression rationnelle "
-"fournie."
 
 # type: TP
 #. type: TP
-#: ippfind.man:96
+#: ippeveprinter.1:136
 #, no-wrap
-msgid "B<--path >I<regex>"
-msgstr "B<--path >I<exp_rationnelle>"
+msgid "B<-d >I<spool-directory>"
+msgstr "B<-d >I<rép_spool>"
 
+# type: Plain text
 #. type: Plain text
-#: ippfind.man:99
-msgid "True if the URI resource path matches the given regular expression."
+#: ippeveprinter.1:140
+msgid ""
+"Specifies the directory that will hold the print files.  The default is a "
+"directory under the user's current temporary directory."
 msgstr ""
-"Vrai si le chemin de la ressource de l’URI correspond à l’expression "
-"rationnelle fournie."
-
-#. type: TP
-#: ippfind.man:99
-#, no-wrap
-msgid "B<-P >I<number>[B<->I<number>]"
-msgstr "B<-P >I<numéro>[B<->I<numéro>]"
+"Indiquer le répertoire qui contiendra les fichiers à imprimer. Par défaut, "
+"c'est un répertoire dans le répertoire temporaire actuel de l’utilisateur."
 
+# type: TH
 #. type: TP
-#: ippfind.man:101
+#: ippeveprinter.1:140
 #, no-wrap
-msgid "B<--port >I<number>[B<->I<number>]"
-msgstr "B<--port >I<numéro>[B<->I<numéro>]"
+msgid "B<-f >I<type/subtype[,...]>"
+msgstr "B<-f >I<type/sous-type[,...]>"
 
 #. type: Plain text
-#: ippfind.man:104
-msgid "True if the port matches the given number or range."
-msgstr "Vrai si le port correspond au numéro ou à l’intervalle."
-
-#. type: TP
-#: ippfind.man:104 lpr.man:105
-#, no-wrap
-msgid "B<-p>"
-msgstr "B<-p>"
+#: ippeveprinter.1:144
+#, fuzzy
+msgid ""
+"Specifies a list of MIME media types that the server will accept.  The "
+"default depends on the type of printer created."
+msgstr ""
+"Indiquer les types MIME de média que le serveur acceptera. Par défaut, "
+"« application/pdf,image/jpeg,image/pwg-raster »."
 
 # type: TP
 #. type: TP
-#: ippfind.man:106
+#: ippeveprinter.1:144
 #, no-wrap
-msgid "B<--print>"
-msgstr "B<--print>"
+msgid "B<-i >I<iconfile.png>"
+msgstr "B<-i >I<icône.png>"
 
+# type: Plain text
 #. type: Plain text
-#: ippfind.man:110
+#: ippeveprinter.1:149
+#, fuzzy
 msgid ""
-"Prints the URI if the result of previous expressions is true.  The result is "
-"always true."
+"Specifies the printer icon file for the server.  The file must be a PNG "
+"format image.  The default is an internally-provided PNG image."
 msgstr ""
-"Afficher l’URI si le résultat des expressions précédentes est vrai. Le "
-"résultat est toujours vrai."
+"Indiquer le fichier d’icône de l’imprimante. Par défaut, « printer.png ».\"."
 
 #. type: TP
-#: ippfind.man:112
+#: ippeveprinter.1:149
 #, no-wrap
-msgid "B<--quiet>"
-msgstr "B<--quiet>"
+msgid "B<-k>"
+msgstr "B<-k>"
 
 #. type: Plain text
-#: ippfind.man:115
-msgid "Quiet mode - just returns the exit codes below."
-msgstr "Mode laconique — seuls les codes de retour sont renvoyés à la suite."
+#: ippeveprinter.1:152
+msgid ""
+"Keeps the print documents in the spool directory rather than deleting them."
+msgstr ""
+"Conserver les documents dans le répertoire de spool plutôt que de les "
+"détruire."
 
+# type: TP
 #. type: TP
-#: ippfind.man:117
+#: ippeveprinter.1:152
 #, no-wrap
-msgid "B<--remote>"
-msgstr "B<--remote>"
+msgid "B<-l >I<location>"
+msgstr "B<-l> I<emplacement>"
 
+# type: Plain text
 #. type: Plain text
-#: ippfind.man:120
-msgid "True if the service is not local to this computer."
-msgstr "Vrai si le service n’est pas local à cette imprimante."
+#: ippeveprinter.1:156
+msgid ""
+"Specifies the human-readable location string that is reported by the "
+"server.  The default is the empty string."
+msgstr ""
+"Définir la chaîne compréhensible aux utilisateurs de l’emplacement, indiquée "
+"par le serveur. Par défaut, une chaîne vide."
 
+# type: TP
 #. type: TP
-#: ippfind.man:120 lp.man:135 lpstat.man:121
+#: ippeveprinter.1:156 lpadmin.8:79
 #, no-wrap
-msgid "B<-s>"
-msgstr "B<-s>"
+msgid "B<-m >I<model>"
+msgstr "B<-m >I<modèle>"
+
+# type: Plain text
+#. type: Plain text
+#: ippeveprinter.1:160
+msgid "Specifies the model name of the printer.  The default is \"Printer\"."
+msgstr "Définir le nom de modèle de l’imprimante. Par défaut, « Printer »."
 
 # type: TP
 #. type: TP
-#: ippfind.man:122
+#: ippeveprinter.1:160
 #, no-wrap
-msgid "B<--print-name>"
-msgstr "B<--print-name>"
+msgid "B<-n >I<hostname>"
+msgstr "B<-n >I<nom_hôte>"
 
+# type: Plain text
 #. type: Plain text
-#: ippfind.man:126
+#: ippeveprinter.1:166
 msgid ""
-"Prints the service instance name if the result of previous expressions is "
-"true.  The result is always true."
+"Specifies the hostname that is reported by the server.  The default is the "
+"name returned by the B<hostname>(1)  command."
 msgstr ""
-"Afficher le nom l’instance du service si le résultat des expressions "
-"précédentes est vrai. Le résultat est toujours vrai."
+"Définir le nom d’hôte complet renvoyé par le serveur. Par défaut, le nom "
+"renvoyé par la commande B<hostname>(1)."
 
 # type: TP
 #. type: TP
-#: ippfind.man:126
+#: ippeveprinter.1:166
 #, no-wrap
-msgid "B<--true>"
-msgstr "B<--true>"
+msgid "B<-p >I<port>"
+msgstr "B<-p >I<port>"
 
 #. type: Plain text
-#: ippfind.man:129
-msgid "Always true."
-msgstr "Toujours vrai"
-
-# type: TP
-#. type: TP
-#: ippfind.man:129
-#, no-wrap
-msgid "B<-t >I<key>"
-msgstr "B<-t >I<clef>"
+#: ippeveprinter.1:170
+msgid ""
+"Specifies the port number to listen on.  The default is a user-specific "
+"number from 8000 to 8999."
+msgstr ""
+"Indiquer le numéro de port à écouter. Par défaut, un numéro défini par "
+"l’utilisateur de B<8000> à B<8999>."
 
-# type: TP
+# type: TH
 #. type: TP
-#: ippfind.man:131
-#, no-wrap
-msgid "B<--txt >I<key>"
-msgstr "B<--txt >I<clef>"
+#: ippeveprinter.1:170
+#, fuzzy, no-wrap
+msgid "B<-r >I<subtype[,subtype]>"
+msgstr "B<-r >I<sous-type>"
 
-# type: Plain text
 #. type: Plain text
-#: ippfind.man:134
-msgid "True if the TXT record contains the named key."
-msgstr "Vrai si l’enregistrement TXT contient la clef citée."
+#: ippeveprinter.1:175
+#, fuzzy
+msgid ""
+"Specifies the DNS-SD subtype(s) to advertise.  Separate multiple subtypes "
+"with a comma.  The default is \"_print\"."
+msgstr ""
+"Indiquer le(s) sous-type(s) à notifier.  Les sous-types sont à séparer par "
+"des virgules. Par défaut, « _print_»."
 
 #. type: TP
-#: ippfind.man:134
+#: ippeveprinter.1:175
 #, no-wrap
-msgid "B<--txt->I<key regex>"
-msgstr "B<--txt->I<clef exp_rationnelle>"
+msgid "B<-s >I<speed[,color-speed]>"
+msgstr "B<-s >I<vitesse[,vitesse_couleur]>"
 
 #. type: Plain text
-#: ippfind.man:137
+#: ippeveprinter.1:180
 msgid ""
-"True if the TXT record contains the named key and matches the given regular "
-"expression."
+"Specifies the printer speed in pages per minute.  If two numbers are "
+"specified and the second number is greater than zero, the server will report "
+"support for color printing.  The default is \"10,0\"."
 msgstr ""
-"Vrai si l’enregistrement TXT contient la clef citée et correspond à "
-"l’expression rationnelle fournie."
-
-# type: TP
-#. type: TP
-#: ippfind.man:137
-#, no-wrap
-msgid "B<-u >I<regex>"
-msgstr "B<-u >I<exp_rationnelle>"
+"Indiquer la vitesse de l’imprimante en page par minute. Si deux nombres sont "
+"indiqués et que le deuxième nombre est supérieur à zéro, le serveur "
+"déclarera une prise en charge de la couleur. Par défaut, « 10,0 »."
 
-# type: TP
 #. type: TP
-#: ippfind.man:139
+#: ippeveprinter.1:180
 #, no-wrap
-msgid "B<--uri >I<regex>"
-msgstr "B<--uri >I<exp_rationnelle>"
+msgid "B<-v[vvv]>"
+msgstr "B<-v[vvv]>"
 
 #. type: Plain text
-#: ippfind.man:142
-msgid "True if the URI matches the given regular expression."
-msgstr "Vrai si l’URI correspond à l’expression rationnelle fournie."
-
-#. type: TP
-#: ippfind.man:142
-#, no-wrap
-msgid "B<-x >I<utility >[ I<argument >... ] B<;>"
-msgstr "B<-x >I<utilitaire >[ I<argument >... ] B<;>"
-
-#. type: TP
-#: ippfind.man:144
-#, no-wrap
-msgid "B<--exec >I<utility >[ I<argument >... ] B<;>"
-msgstr "B<--exec >I<utilitaire >[ I<argument >... ] B<;>"
+#: ippeveprinter.1:183
+#, fuzzy
+msgid "Be (very) verbose when logging activity to standard error."
+msgstr ""
+"Journaliser de manière (très) détaillée l’activité sur la sortie standard."
 
 #. type: Plain text
-#: ippfind.man:148
+#: ippeveprinter.1:190
+#, fuzzy
 msgid ""
-"Executes the specified program if the current result is true.  \"{foo}\" "
-"arguments are replaced with the corresponding value - see SUBSTITUTIONS "
-"below."
+"The B<ippeveprinter> program returns 1 if it is unable to process the "
+"command-line arguments or register the IPP service.  Otherwise "
+"B<ippeveprinter> will run continuously until terminated."
 msgstr ""
-"Exécuter le programme indiqué si le résultat actuel est vrai. Les arguments "
-"« {toto} » sont remplacés par leur valeur correspondante — consultez "
-"SUBSTITUTIONS ci-dessous."
+"Le programme B<ippserver> renvoie B<1> s’il est incapable de traiter les "
+"arguments de la ligne de commande ou d’enregistrer le service IPP. Sinon "
+"B<ippserver> continuera jusqu’à la fin de la commande."
 
 #. type: Plain text
-#: ippfind.man:150
-msgid "Expressions may also contain modifiers:"
-msgstr "Les expressions peuvent aussi contenir des modificateurs :"
-
-#. type: TP
-#: ippfind.man:150
-#, no-wrap
-msgid "B<( >I<expression >B<)>"
-msgstr "B<( >I<expression >B<)>"
+#: ippeveprinter.1:194
+#, fuzzy
+msgid ""
+"The B<ippeveprinter> program is unique to CUPS and conforms to the IPP "
+"Everywhere (PWG 5100.14) specification."
+msgstr ""
+"Le programme B<ippserver> est spécifique à CUPS et est conforme à la "
+"spécification IPP Everywhere (PWG 5100.14)."
 
 #. type: Plain text
-#: ippfind.man:153
-msgid "Group the result of expressions."
-msgstr "Classer le résultat des expressions."
-
-# type: TP
-#. type: TP
-#: ippfind.man:153
-#, no-wrap
-msgid "B<! >I<expression>"
-msgstr "B<! >I<expression>"
-
-# type: TP
-#. type: TP
-#: ippfind.man:155
-#, no-wrap
-msgid "B<--not >I<expression>"
-msgstr "B<--not >I<expression>"
+#: ippeveprinter.1:198
+#, fuzzy
+msgid ""
+"B<ippeveprinter> adds environment variables starting with \"IPP_\" for all "
+"IPP Job attributes in the print request.  For example, when executing a "
+"command for an IPP Job containing the \"media\" Job Template attribute, the "
+"\"IPP_MEDIA\" environment variable will be set to the value of that "
+"attribute."
+msgstr ""
+"B<ippserver> ajoute des variables d’environnement commençant par « IPP_ » "
+"pour tous les attributs de travaux IPP dans la requête d’impression. Par "
+"exemple lors de l’exécution d’une commande pour un travail IPP contenant "
+"l’attribut de modèle de travail « media », la variable d’environnement "
+"« IPP_MEDIA » sera définie à la valeur de cet attribut."
 
 #. type: Plain text
-#: ippfind.man:158
-msgid "Unary NOT of the expression."
-msgstr "Opération logique NON sur l’expression."
-
-#. type: TP
-#: ippfind.man:158
-#, no-wrap
-msgid "I<expression expression>"
-msgstr "I<expression expression>"
+#: ippeveprinter.1:201
+msgid ""
+"In addition, all IPP \"xxx-default\" and \"pwg-xxx\" Printer Description "
+"attributes are added to the environment.  For example, the "
+"\"IPP_MEDIA_DEFAULT\" environment variable will be set to the default value "
+"for the \"media\" Job Template attribute."
+msgstr ""
 
-#. type: TP
-#: ippfind.man:160
-#, no-wrap
-msgid "I<expression >B<--and >I<expression>"
-msgstr "I<expression >B<--and >I<expression>"
+#. type: Plain text
+#: ippeveprinter.1:205
+#, fuzzy
+msgid ""
+"Enumerated values are converted to their keyword equivalents.  For example, "
+"a \"print-quality\" Job Template attribute with a enum value of 3 will "
+"become the \"IPP_PRINT_QUALITY\" environment variable with a value of \"draft"
+"\".  This string conversion only happens for standard Job Template "
+"attributes, currently \"finishings\", \"orientation-requested\", and \"print-"
+"quality\"."
+msgstr ""
+"Les valeurs numériques sont converties à leurs mots-clefs équivalents. Par "
+"exemple, un attribut de modèle de travail « print-quality » avec une valeur "
+"de B<3> deviendra une variable d’environnement « IPP_PRINT_QUALITY » avec "
+"comme valeur « draft » (brouillon)."
 
 #. type: Plain text
-#: ippfind.man:163
-msgid "Logical AND of expressions."
-msgstr "Opération logique ET sur les expressions."
+#: ippeveprinter.1:207
+msgid ""
+"Finally, the \"CONTENT_TYPE\" environment variable contains the MIME media "
+"type of the document being printed, the \"DEVICE_URI\" environment variable "
+"contains the device URI as specified with the \"-D\" option, the "
+"\"OUTPUT_FORMAT\" environment variable contains the output MIME media type, "
+"and the \"PPD\" environment variable contains the PPD filename as specified "
+"with the \"-P\" option."
+msgstr ""
 
-#. type: TP
-#: ippfind.man:163
-#, no-wrap
-msgid "I<expression >B<--or >I<expression>"
-msgstr "I<expression >B<--or >I<expression>"
+# type: SH
+#. type: SH
+#: ippeveprinter.1:207
+#, fuzzy, no-wrap
+msgid "COMMAND OUTPUT"
+msgstr "COMMANDES"
 
 #. type: Plain text
-#: ippfind.man:166
-msgid "Logical OR of expressions."
-msgstr "Opération logique OU sur les expressions."
-
-#. type: SS
-#: ippfind.man:166
-#, no-wrap
-msgid "SUBSTITUTIONS"
-msgstr "SUBSTITUTIONS"
+#: ippeveprinter.1:209
+msgid ""
+"Unless they communicate directly with a printer, print commands send printer-"
+"ready data to the standard output."
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:168
-msgid "The substitutions for \"{foo}\" in I<-e> and I<--exec> are:"
+#: ippeveprinter.1:213
+msgid ""
+"Print commands can send messages back to B<ippeveprinter> on the standard "
+"error with one of the following prefixes:"
 msgstr ""
-"Les substitutions pour « {toto} » dans B<-e> et B<--exec> sont les "
-"suivantes :"
 
 # type: TP
 #. type: TP
-#: ippfind.man:168
-#, no-wrap
-msgid "B<{service_domain}>"
-msgstr "B<{service_domain}>"
+#: ippeveprinter.1:213
+#, fuzzy, no-wrap
+msgid "B<ATTR: >I<attribute=value[ attribute=value]>"
+msgstr "B<ATTR: >I<attribut=valeur >[ I<... attribut=valeur>]"
 
 #. type: Plain text
-#: ippfind.man:171 ippfind.man:224
-msgid "Domain name, e.g., \"example.com.\", \"local.\", etc."
-msgstr "Nom de domaine, par exemple « example.com. », « local. », etc."
+#: ippeveprinter.1:217
+msgid ""
+"Sets the named attribute(s) to the given values.  Currently only the \"job-"
+"impressions\" and \"job-impressions-completed\" Job Status attributes and "
+"the \"marker-xxx\", \"printer-alert\", \"printer-alert-description\", "
+"\"printer-supply\", and \"printer-supply-description\" Printer Status "
+"attributes can be set."
+msgstr ""
 
+# type: TP
 #. type: TP
-#: ippfind.man:171
-#, no-wrap
-msgid "B<{service_hostname}>"
-msgstr "B<{service_hostname}>"
+#: ippeveprinter.1:217
+#, fuzzy, no-wrap
+msgid "B<DEBUG: >I<Debugging message>"
+msgstr "B<DEBUG: >I<message>"
 
 #. type: Plain text
-#: ippfind.man:174 ippfind.man:227
-msgid ""
-"Fully-qualified domain name, e.g., \"printer.example.com.\", \"printer.local."
-"\", etc."
+#: ippeveprinter.1:220
+msgid "Logs a debugging message if at least two -v's have been specified."
 msgstr ""
-"Nom de domaine complet, par exemple « printer.example.com. », « printer."
-"local. », etc."
 
 # type: TP
 #. type: TP
-#: ippfind.man:174
-#, no-wrap
-msgid "B<{service_name}>"
-msgstr "B<{service_name}>"
+#: ippeveprinter.1:220
+#, fuzzy, no-wrap
+msgid "B<ERROR: >I<Error message>"
+msgstr "B<ERROR:>I< message>"
 
 #. type: Plain text
-#: ippfind.man:177 ippfind.man:230
-msgid "Service instance name, e.g., \"My Fine Printer\"."
+#: ippeveprinter.1:223
+msgid ""
+"Logs an error message and copies the message to the \"job-state-message\" "
+"attribute."
 msgstr ""
-"Nom de l’instance du service, par exemple « Mon excellente imprimante »."
 
 # type: TP
 #. type: TP
-#: ippfind.man:177
-#, no-wrap
-msgid "B<{service_port}>"
-msgstr "B<{service_port}>"
+#: ippeveprinter.1:223
+#, fuzzy, no-wrap
+msgid "B<INFO: >I<Informational message>"
+msgstr "B<INFO:>I< message>"
 
 #. type: Plain text
-#: ippfind.man:180 ippfind.man:233
-msgid "Port number for server, typically 631 for IPP and 80 for HTTP."
+#: ippeveprinter.1:226
+msgid ""
+"Logs an informational/progress message if -v has been specified and copies "
+"the message to the \"job-state-message\" attribute unless an error has been "
+"reported."
 msgstr ""
-"Numéro de port pour le serveur, habituellement B<631> pour IPP et B<80> pour "
-"HTTP."
 
 #. type: TP
-#: ippfind.man:180
+#: ippeveprinter.1:226
 #, no-wrap
-msgid "B<{service_regtype}>"
-msgstr "B<{service_regtype}>"
+msgid "B<STATE: >I<keyword[,keyword,...]>"
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:183 ippfind.man:236
-msgid "DNS-SD registration type, e.g., \"_ipp._tcp\", \"_http._tcp\", etc."
+#: ippeveprinter.1:229
+msgid ""
+"Sets the printer's \"printer-state-reasons\" attribute to the listed "
+"keywords."
 msgstr ""
-"Type d’enregistrement DNS-SD, par exemple « _ipp._tcp », « _http._tcp », etc."
 
 #. type: TP
-#: ippfind.man:183
+#: ippeveprinter.1:229
 #, no-wrap
-msgid "B<{service_scheme}>"
-msgstr "B<{service_scheme}>"
+msgid "B<STATE: ->I<keyword[,keyword,...]>"
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:186 ippfind.man:239
-msgid "URI scheme for DNS-SD registration type, e.g., \"ipp\", \"http\", etc."
+#: ippeveprinter.1:232
+msgid ""
+"Removes the listed keywords from the printer's \"printer-state-reasons\" "
+"attribute."
 msgstr ""
-"Schéma d’URI pour le type d’enregistrement DNS-SD, par exemple « ipp », "
-"« http », etc."
 
 #. type: TP
-#: ippfind.man:186
+#: ippeveprinter.1:232
 #, no-wrap
-msgid "B<{}>"
-msgstr "B<{}>"
-
-# type: TP
-#. type: TP
-#: ippfind.man:188
-#, no-wrap
-msgid "B<{service_uri}>"
-msgstr "B<{service_uri}>"
+msgid "B<STATE: +>I<keyword[,keyword,...]>"
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:191 ippfind.man:242
+#: ippeveprinter.1:235
 msgid ""
-"URI for service, e.g., \"ipp://printer.local./ipp/print\", \"http://printer."
-"local./\", etc."
+"Adds the listed keywords to the printer's \"printer-state-reasons\" "
+"attribute."
 msgstr ""
-"URI pour le service, par exemple, « ipp://printer.local./ipp/print », "
-"« http://printer.local./ », etc."
 
-#. type: TP
-#: ippfind.man:191
-#, no-wrap
-msgid "B<{txt_>I<key>B<}>"
-msgstr "B<{txt_>I<clef>B<}>"
+#. type: Plain text
+#: ippeveprinter.1:239
+#, fuzzy
+msgid "Run B<ippeveprinter> with a service name of My Cool Printer:"
+msgstr "Exécuter B<ippserver> avec un nom de service de Ma Super Imprimante :"
 
 #. type: Plain text
-#: ippfind.man:194
-msgid "Value of TXT record I<key> (lowercase)."
-msgstr "Valeur de l’enregistrement TXT I<clef> (minuscules)."
+#: ippeveprinter.1:242
+#, fuzzy, no-wrap
+msgid "    ippeveprinter \"My Cool Printer\"\n"
+msgstr "    ippserver \"Ma Super Imprimante\"\n"
 
-# type: Plain text
 #. type: Plain text
-#: ippfind.man:196
-msgid "B<ippfind> supports the following options:"
-msgstr "B<ippfind> accepte les options suivantes :"
+#: ippeveprinter.1:247
+msgid "Run the B<file>(1)  command whenever a job is sent to the server:"
+msgstr ""
+"Exécuter la commande B<file>(1) à chaque fois qu’un travail est envoyé au "
+"serveur :"
 
-# type: Plain text
 #. type: Plain text
-#: ippfind.man:199
-msgid "Show program help."
-msgstr "Afficher un message d'aide."
+#: ippeveprinter.1:250
+#, fuzzy, no-wrap
+msgid "    ippeveprinter -c /usr/bin/file \"My Cool Printer\"\n"
+msgstr "    ippserver -c file \"Ma Super Imprimante\"\n"
 
-# type: Plain text
 #. type: Plain text
-#: ippfind.man:202
-msgid "Show program version."
-msgstr "Afficher la version du programme."
+#: ippeveprinter.1:255
+#, fuzzy
+msgid ""
+"B<ippevepcl>(7), B<ippeveps>(7), PWG Internet Printing Protocol Workgroup "
+"(http://www.pwg.org/ipp)"
+msgstr ""
+"PWG Internet Printing Protocol Workgroup (E<lt>URL:I<http://www.pwg.org/"
+"ipp>E<gt>)"
 
-#. type: TP
-#: ippfind.man:202 ipptool.man:106
+#. type: TH
+#: ippfind.1:9
 #, no-wrap
-msgid "B<-4>"
-msgstr "B<-4>"
-
-#. type: Plain text
-#: ippfind.man:205
-msgid "Use IPv4 when listing."
-msgstr "Utiliser IPv4 lors de l’écoute."
+msgid "ippfind"
+msgstr "ippfind"
 
-#. type: TP
-#: ippfind.man:205 ipptool.man:111
+#. type: TH
+#: ippfind.1:9
 #, no-wrap
-msgid "B<-6>"
-msgstr "B<-6>"
+msgid "ippsample"
+msgstr ""
 
 #. type: Plain text
-#: ippfind.man:208
-msgid "Use IPv6 when listing."
-msgstr "Utiliser IPv6 lors de l’écoute."
-
-# type: TP
-#. type: TP
-#: ippfind.man:208
-#, no-wrap
-msgid "B<-T >I<seconds>"
-msgstr "B<-T >I<secondes>"
+#: ippfind.1:12
+msgid "ippfind - find internet printing protocol printers"
+msgstr ""
+"ippfind - Trouver des imprimantes utilisant le protocole internet "
+"d’impression"
 
 #. type: Plain text
-#: ippfind.man:213
+#: ippfind.1:19
 msgid ""
-"Specify find timeout in seconds.  If 1 or less, B<ippfind> stops as soon as "
-"it thinks it has found everything.  The default timeout is 1 second."
+"B<ippfind> [ I<options> ] I<regtype>[B<,>I<subtype>][B<.>I<domain>B<.>] ... "
+"[ I<expression> ... ]"
 msgstr ""
-"Indiquer le délai de recherche en seconde. Si égal à B<1> ou moins, "
-"B<ippfind> s'arrêtera aussitôt qu’il pensera avoir tout trouvé. Par défaut, "
-"B<1> seconde."
-
-#. type: TP
-#: ippfind.man:213
-#, no-wrap
-msgid "B<-V >I<version>"
-msgstr "B<-V >I<version>"
+"B<ippfind> [ I<options> ] I<type_exp_rat>[B<,>I<sous-type>][B<.>I<domaine>B<."
+">] ... [ I<expression> ... ]"
 
 #. type: Plain text
-#: ippfind.man:217
+#: ippfind.1:26
 msgid ""
-"Specifies the IPP version when listing.  Supported values are \"1.1\", "
-"\"2.0\", \"2.1\", and \"2.2\"."
+"B<ippfind> [ I<options> ] I<name>[B<.>I<regtype>[B<.>I<domain>B<.>]] ... "
+"[ I<expression> ... ]"
 msgstr ""
-"Indiquer la version d’IPP pour l’écoute. Les valeurs prises en charge sont "
-"« 1.1 », « 2.0 », « 2.1 » et « 2.2 »."
+"B<ippfind> [ I<options> ] I<nom>[B<.>I<type_exp_rat>[B<.>I<domaine>B<."
+">]] ... [ I<expression> ... ]"
 
+# type: Plain text
 #. type: Plain text
-#: ippfind.man:219
-msgid ""
-"B<ippfind> returns 0 if the result for all processed expressions is true, 1 "
-"if the result of any processed expression is false, 2 if browsing or any "
-"query or resolution failed, 3 if an undefined option or invalid expression "
-"was specified, and 4 if it ran out of memory."
-msgstr ""
-"B<ippfind> renvoie B<0> si le résultat de toutes les expressions examinées "
-"est vrai, B<1> si le résultat de n’importe quelle expression est fausse, "
-"B<2> si la lecture, la requête ou la résolution échouent, B<3> si une option "
-"non reconnue ou expression non valable était indiquée, et B<4> pour un "
-"dépassement de mémoire."
+#: ippfind.1:29
+msgid "B<ippfind> B<--help>"
+msgstr "B<ippfind> B<--help>"
+
+# type: Plain text
+#. type: Plain text
+#: ippfind.1:32
+msgid "B<ippfind> B<--version>"
+msgstr "B<ippfind> B<--version>"
 
 #. type: Plain text
-#: ippfind.man:221
+#: ippfind.1:35
 msgid ""
-"When executing a program, B<ippfind> sets the following environment "
-"variables for the matching service registration:"
+"B<ippfind> finds services registered with a DNS server or available through "
+"local devices.  Its primary purpose is to find IPP printers and show their "
+"URIs, show their current status, or run commands."
 msgstr ""
-"Lors de l’exécution d’un programme, B<ippfind> définit les variables "
-"d’environnement suivantes pour l’enregistrement de service correspondant :"
-
-#. type: TP
-#: ippfind.man:221
-#, no-wrap
-msgid "B<IPPFIND_SERVICE_DOMAIN>"
-msgstr "B<IPPFIND_SERVICE_DOMAIN>"
+"B<ippfind> trouve les services enregistrés avec un serveur DNS ou disponible "
+"à travers des périphériques locaux. Son but principal est de trouver les "
+"imprimantes et afficher leurs URI, leur état actuel, ou exécuter des "
+"commandes."
 
-#. type: TP
-#: ippfind.man:224
+# type: SH
+#. type: SS
+#: ippfind.1:35
 #, no-wrap
-msgid "B<IPPFIND_SERVICE_HOSTNAME>"
-msgstr "B<IPPFIND_SERVICE_HOSTNAME>"
+msgid "REGISTRATION TYPES"
+msgstr "TYPES DE DÉCLARATION"
 
-#. type: TP
-#: ippfind.man:227
-#, no-wrap
-msgid "B<IPPFIND_SERVICE_NAME>"
-msgstr "B<IPPFIND_SERVICE_NAME>"
+# type: Plain text
+#. type: Plain text
+#: ippfind.1:37
+msgid "B<ippfind> supports the following registration types:"
+msgstr "B<ippfind> accepte les types d’enregistrement suivants :"
 
-# type: TP
 #. type: TP
-#: ippfind.man:230
+#: ippfind.1:37
 #, no-wrap
-msgid "B<IPPFIND_SERVICE_PORT>"
-msgstr "B<IPPFIND_SERVICE_PORT>"
+msgid "_http._tcp"
+msgstr "_http._tcp"
 
-#. type: TP
-#: ippfind.man:233
-#, no-wrap
-msgid "B<IPPFIND_SERVICE_REGTYPE>"
-msgstr "B<IPPFIND_SERVICE_REGTYPE>"
+#. type: Plain text
+#: ippfind.1:40
+msgid "HyperText Transport Protocol (HTTP, RFC 2616)"
+msgstr "HyperText Transport Protocol (HTTP, RFC 2616)"
 
 #. type: TP
-#: ippfind.man:236
+#: ippfind.1:40
 #, no-wrap
-msgid "B<IPPFIND_SERVICE_SCHEME>"
-msgstr "B<IPPFIND_SERVICE_SCHEME>"
+msgid "_https._tcp"
+msgstr "_https._tcp"
 
-# type: TP
-#. type: TP
-#: ippfind.man:239
-#, no-wrap
-msgid "B<IPPFIND_SERVICE_URI>"
-msgstr "B<IPPFIND_SERVICE_URI>"
+#. type: Plain text
+#: ippfind.1:43
+msgid "Secure HyperText Transport Protocol (HTTPS, RFC 2818)"
+msgstr "Secure HyperText Transport Protocol (HTTPS, RFC 2818)"
 
 #. type: TP
-#: ippfind.man:242
+#: ippfind.1:43
 #, no-wrap
-msgid "B<IPPFIND_TXT_>I<KEY>"
-msgstr "B<IPPFIND_TXT_>I<CLEF>"
-
-#. type: Plain text
-#: ippfind.man:245
-msgid "Values of TXT record I<KEY> (uppercase)."
-msgstr "Valeurs des enregistrements TXT I<CLEF> (majuscules)."
+msgid "_ipp._tcp"
+msgstr "_ipp._tcp"
 
 #. type: Plain text
-#: ippfind.man:247
-msgid "To show the status of all registered IPP printers on your network, run:"
-msgstr ""
-"Pour afficher l’état de toutes les imprimantes IPP enregistrées, exécutez :"
+#: ippfind.1:46
+msgid "Internet Printing Protocol (IPP, RFC 2911)"
+msgstr "Internet Printing Protocol (IPP, RFC 2911)"
 
-# type: TH
-#. type: Plain text
-#: ippfind.man:250
+#. type: TP
+#: ippfind.1:46
 #, no-wrap
-msgid "    ippfind --ls\n"
-msgstr "    ippfind --ls\n"
+msgid "_ipps._tcp"
+msgstr "_ipps._tcp"
 
 #. type: Plain text
-#: ippfind.man:253
-msgid ""
-"Similarly, to send a PostScript test page to every PostScript printer, run:"
-msgstr ""
-"De même, pour envoyer une page de test PostScript à toutes les imprimantes "
-"PostScript, exécutez :"
+#: ippfind.1:49
+msgid "Secure Internet Printing Protocol (IPPS, draft)"
+msgstr "Secure Internet Printing Protocol (IPPS, ébauche)"
 
-#. type: Plain text
-#: ippfind.man:257
+# type: TH
+#. type: TP
+#: ippfind.1:49
 #, no-wrap
-msgid ""
-"    ippfind --txt-pdl application/postscript --exec ipptool\n"
-"      -f onepage-letter.ps '{}' print-job.test \\e;\n"
-msgstr ""
-"    ippfind --txt-pdl application/postscript --exec ipptool\n"
-"      -f onepage-letter.ps '{}' print-job.test \\e;\n"
-
-#. type: Plain text
-#: ippfind.man:260
-msgid "B<ipptool>(1)"
-msgstr "B<ipptool>(1)"
+msgid "_printer._tcp"
+msgstr "_printer._tcp"
 
-# type: Plain text
 #. type: Plain text
-#: ippfind.man:261
-#, fuzzy
-msgid "Copyright \\[co] 2013-2018 by Apple Inc."
-msgstr "Copyright 2013-2018 par Apple Inc."
-
-#. type: TH
-#: ../test/ippserver.man:12
-#, no-wrap
-msgid "ippserver"
-msgstr "ippserver"
+#: ippfind.1:52
+msgid "Line Printer Daemon (LPD, RFC 1179)"
+msgstr "Line Printer Daemon (LPD, RFC 1179)"
 
-#. type: TH
-#: ../test/ippserver.man:12
+# type: SH
+#. type: SS
+#: ippfind.1:52
 #, no-wrap
-msgid "28 August 2014"
-msgstr "28 août 2014"
-
-#. type: Plain text
-#: ../test/ippserver.man:15
-msgid "ippserver - a simple internet printing protocol server"
-msgstr "ippserver - Simple serveur IPP (Internet Printing Protocol)"
-
-# type: Plain text
-#. type: Plain text
-#: ../test/ippserver.man:62
-#, fuzzy
-msgid ""
-"B<ippserver> [ B<-2> ] [ B<-M> I<manufacturer> ] [ B<-P> ] [ B<-c> "
-"I<command> ] [ B<-d> I<spool-directory> ] [ B<-f> I<type/subtype[,...]> ] "
-"[ B<-h> ] [ B<-i> I<iconfile.png> ] [ B<-k> ] [ B<-l> I<location> ] [ B<-m> "
-"I<model> ] [ B<-n> I<hostname> ] [ B<-p> I<port> ] [ B<-r> I<subtype> ] [ B<-"
-"s> I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
-msgstr ""
-"B<ippserver> [ B<-2> ] [ B<-M> I<fabricant> ] [ B<-P> ] [ B<-c> "
-"I<commande> ] [ B<-d> I<rép_spool> ] [ B<-f> I<type/sous-type[,...]> ] [ B<-"
-"h> ] [ B<-i> I<icône.png> ] [ B<-k> ] [ B<-l> I<emplacement> ] [ B<-m> "
-"I<modèle> ] [ B<-n> I<hôte> ] [ B<-p> I<port> ] [ B<-r> I<sous-type> ] [ B<-"
-"s> I<vitesse[,vitesse_couleur-]> ] [ B<-v[vvv]> ] I<service>"
+msgid "EXPRESSIONS"
+msgstr "EXPRESSIONS"
 
 #. type: Plain text
-#: ../test/ippserver.man:65
-#, fuzzy
+#: ippfind.1:61
 msgid ""
-"B<ippserver> is a simple Internet Printing Protocol (IPP) server conforming "
-"to the IPP Everywhere (PWG 5100.14) specification. It can be used to test "
-"client software or act as a very basic print server that runs a command for "
-"every job that is printed."
+"B<ippfind> supports expressions much like the B<find>(1)  utility.  However, "
+"unlike B<find>(1), B<ippfind> uses POSIX regular expressions instead of "
+"shell filename matching patterns.  If I<--exec>, I<-l>, I<--ls>, I<-p>, I<--"
+"print>, I<--print-name>, I<-q>, I<--quiet>, I<-s>, or I<-x> is not "
+"specified, B<ippfind> adds I<--print> to print the service URI of anything "
+"it finds.  The following expressions are supported:"
 msgstr ""
-"B<ippserver> est un simple serveur IPP (Internet Printing Protocol) conforme "
-"à la spécification IPP Everywhere (PWG 5100.14). Il peut être utilisé pour "
-"tester le logiciel client ou agir comme un serveur d’impression très basique "
-"qui exécute une commande pour chaque travail à accomplir."
-
-# type: Plain text
-#. type: Plain text
-#: ../test/ippserver.man:68
-#, fuzzy
-msgid "The following options are recognized by B<ippserver:>"
-msgstr "Les options suivantes sont reconnues par B<ippserver> :"
+"B<ippfind> prend en charge les expressions de façon similaire à l’utilitaire "
+"B<find>(1). Cependant, à la différence de B<find>(1), B<ippfind> utilise des "
+"expressions rationnelles au lieu de modèles de correspondance de nom de "
+"fichier par un interpréteur de commandes.  Si B<--exec>, B<-l>, B<--ls>, B<-"
+"p>, B<--print>, B<--print-name>, B<-q>, B<--quiet>, B<-s>, ou B<-x> n’est "
+"pas précisé, B<ippfind> ajoute B<--print> pour écrire l’URI du service de "
+"toute chose trouvée. Les expressions suivantes sont prises en charge :"
 
+# type: TP
 #. type: TP
-#: ../test/ippserver.man:68
+#: ippfind.1:61
 #, no-wrap
-msgid "B<-2>"
-msgstr "B<-2>"
-
-#. type: Plain text
-#: ../test/ippserver.man:71
-msgid "Report support for two-sided (duplex) printing."
-msgstr "Déclaration de prise en charge de l’impression recto-verso (duplex)."
+msgid "B<-d >I<regex>"
+msgstr "B<-d >I<exp_rationnelle>"
 
 # type: TP
 #. type: TP
-#: ../test/ippserver.man:71
+#: ippfind.1:63
 #, no-wrap
-msgid "B<-M >I<manufacturer>"
-msgstr "B<-M >I<fabricant>"
+msgid "B<--domain >I<regex>"
+msgstr "B<--domain >I<exp_rationnelle>"
 
-# type: Plain text
 #. type: Plain text
-#: ../test/ippserver.man:75
-#, fuzzy
-msgid "Set the manufacturer of the printer.  The default is \"Test\"."
-msgstr "Définir le fabricant de l’imprimante. Par défaut, « Test »."
+#: ippfind.1:66
+msgid "True if the domain matches the given regular expression."
+msgstr "Vrai si le domaine correspond à l’expression rationnelle fournie."
 
+# type: TP
 #. type: TP
-#: ../test/ippserver.man:75
+#: ippfind.1:66
 #, no-wrap
-msgid "B<-P>"
-msgstr "B<-P>"
+msgid "B<--false>"
+msgstr "B<--false>"
 
-# type: Plain text
 #. type: Plain text
-#: ../test/ippserver.man:78
-msgid "Report support for PIN printing."
-msgstr "Déclarer la prise en charge d’une imprimante matricielle."
+#: ippfind.1:69
+msgid "Always false."
+msgstr "Toujours faux"
 
 # type: TP
 #. type: TP
-#: ../test/ippserver.man:78
+#: ippfind.1:69
 #, no-wrap
-msgid "B<-c >I<command>"
-msgstr "B<-c >I<commande>"
-
-#. type: Plain text
-#: ../test/ippserver.man:81
-msgid "Run the specified command for each document that is printed."
-msgstr "Exécuter la commande indiquée pour chaque document imprimé."
+msgid "B<-h >I<regex>"
+msgstr "B<-h >I<exp_rationnelle>"
 
 # type: TP
 #. type: TP
-#: ../test/ippserver.man:81
+#: ippfind.1:71
 #, no-wrap
-msgid "B<-d >I<spool-directory>"
-msgstr "B<-d >I<rép_spool>"
+msgid "B<--host >I<regex>"
+msgstr "B<--host >I<exp_rationnelle>"
 
-# type: Plain text
 #. type: Plain text
-#: ../test/ippserver.man:85
-msgid ""
-"Specifies the directory that will hold the print files.  The default is a "
-"directory under the user's current temporary directory."
-msgstr ""
-"Indiquer le répertoire qui contiendra les fichiers à imprimer. Par défaut, "
-"c'est un répertoire dans le répertoire temporaire actuel de l’utilisateur."
+#: ippfind.1:74
+msgid "True is the hostname matches the given regular expression."
+msgstr "Vrai si le nom d’hôte correspond à l’expression rationnelle fournie."
 
-# type: TH
+# type: TP
 #. type: TP
-#: ../test/ippserver.man:85
+#: ippfind.1:76
 #, no-wrap
-msgid "B<-f >I<type/subtype[,...]>"
-msgstr "B<-f >I<type/sous-type[,...]>"
+msgid "B<--ls>"
+msgstr "B<--ls>"
 
 #. type: Plain text
-#: ../test/ippserver.man:89
-#, fuzzy
+#: ippfind.1:80
 msgid ""
-"Specifies a list of MIME media types that the server will accept.  The "
-"default is \"application/pdf,image/jpeg,image/pwg-raster\"."
+"Lists attributes returned by Get-Printer-Attributes for IPP printers and "
+"traditional I<find> \"-ls\" output for HTTP URLs.  The result is true if the "
+"URI is accessible, false otherwise."
 msgstr ""
-"Indiquer les types MIME de média que le serveur acceptera. Par défaut, "
-"« application/pdf,image/jpeg,image/pwg-raster »."
-
-# type: Plain text
-#. type: Plain text
-#: ../test/ippserver.man:92 ipptool.man:94
-msgid "Shows program help."
-msgstr "Afficher l’aide du programme."
+"Lister les attributs renvoyés par Get-Printer-Attributes pour les "
+"imprimantes et la sortie traditionnelle de I<find -ls> pour les URL HTTP. Le "
+"résultat est vrai si l’URI peut être obtenu, faux autrement."
 
 # type: TP
 #. type: TP
-#: ../test/ippserver.man:92
+#: ippfind.1:80
 #, no-wrap
-msgid "B<-i >I<iconfile.png>"
-msgstr "B<-i >I<icône.png>"
+msgid "B<--local>"
+msgstr "B<--local>"
 
-# type: Plain text
 #. type: Plain text
-#: ../test/ippserver.man:96
-#, fuzzy
-#| msgid ""
-#| "Specifies the model name of the printer.  The default is \"Printer\"."
-msgid ""
-"Specifies the printer icon file for the server.  The default is \"printer.png"
-"\"."
-msgstr "Définir le nom de modèle de l’imprimante. Par défaut, « Printer »."
+#: ippfind.1:83
+msgid "True if the service is local to this computer."
+msgstr "Vrai si le service est local pour cette imprimante."
+
+# type: TP
+#. type: TP
+#: ippfind.1:83
+#, fuzzy, no-wrap
+msgid "B<-N >I<name>"
+msgstr "B<-U> I<identifiant>"
 
 #. type: TP
-#: ../test/ippserver.man:96
-#, no-wrap
-msgid "B<-k>"
-msgstr "B<-k>"
+#: ippfind.1:85
+#, fuzzy, no-wrap
+msgid "B<--literal-name >I<name>"
+msgstr "B<--make-and-model> I<nom>"
 
 #. type: Plain text
-#: ../test/ippserver.man:99
-msgid ""
-"Keeps the print documents in the spool directory rather than deleting them."
+#: ippfind.1:88
+#, fuzzy
+msgid "True if the service instance name matches the given name."
 msgstr ""
-"Conserver les documents dans le répertoire de spool plutôt que de les "
-"détruire."
+"Vrai si le nom d’instance du service correspond à l’expression rationnelle "
+"fournie."
 
 # type: TP
 #. type: TP
-#: ../test/ippserver.man:99
+#: ippfind.1:88
 #, no-wrap
-msgid "B<-l >I<location>"
-msgstr "B<-l> I<emplacement>"
+msgid "B<-n >I<regex>"
+msgstr "B<-n >I<exp_rationnelle>"
+
+# type: TP
+#. type: TP
+#: ippfind.1:90
+#, no-wrap
+msgid "B<--name >I<regex>"
+msgstr "B<--name >I<exp_rationnelle>"
 
-# type: Plain text
 #. type: Plain text
-#: ../test/ippserver.man:103
-msgid ""
-"Specifies the human-readable location string that is reported by the "
-"server.  The default is the empty string."
+#: ippfind.1:93
+msgid "True if the service instance name matches the given regular expression."
 msgstr ""
-"Définir la chaîne compréhensible aux utilisateurs de l’emplacement, indiquée "
-"par le serveur. Par défaut, une chaîne vide."
+"Vrai si le nom d’instance du service correspond à l’expression rationnelle "
+"fournie."
 
 # type: TP
 #. type: TP
-#: ../test/ippserver.man:103 lpadmin.man:87
+#: ippfind.1:93
 #, no-wrap
-msgid "B<-m >I<model>"
-msgstr "B<-m >I<modèle>"
+msgid "B<--path >I<regex>"
+msgstr "B<--path >I<exp_rationnelle>"
 
-# type: Plain text
 #. type: Plain text
-#: ../test/ippserver.man:107
-msgid "Specifies the model name of the printer.  The default is \"Printer\"."
-msgstr "Définir le nom de modèle de l’imprimante. Par défaut, « Printer »."
+#: ippfind.1:96
+msgid "True if the URI resource path matches the given regular expression."
+msgstr ""
+"Vrai si le chemin de la ressource de l’URI correspond à l’expression "
+"rationnelle fournie."
 
-# type: TP
 #. type: TP
-#: ../test/ippserver.man:107
+#: ippfind.1:96
 #, no-wrap
-msgid "B<-n >I<hostname>"
-msgstr "B<-n >I<nom_hôte>"
+msgid "B<-P >I<number>[B<->I<number>]"
+msgstr "B<-P >I<numéro>[B<->I<numéro>]"
+
+#. type: TP
+#: ippfind.1:98
+#, no-wrap
+msgid "B<--port >I<number>[B<->I<number>]"
+msgstr "B<--port >I<numéro>[B<->I<numéro>]"
 
-# type: Plain text
 #. type: Plain text
-#: ../test/ippserver.man:113
-msgid ""
-"Specifies the hostname that is reported by the server.  The default is the "
-"name returned by the B<hostname>(1)  command."
-msgstr ""
-"Définir le nom d’hôte complet renvoyé par le serveur. Par défaut, le nom "
-"renvoyé par la commande B<hostname>(1)."
+#: ippfind.1:101
+msgid "True if the port matches the given number or range."
+msgstr "Vrai si le port correspond au numéro ou à l’intervalle."
+
+#. type: TP
+#: ippfind.1:101 lpr.1:102
+#, no-wrap
+msgid "B<-p>"
+msgstr "B<-p>"
 
 # type: TP
 #. type: TP
-#: ../test/ippserver.man:113
+#: ippfind.1:103
 #, no-wrap
-msgid "B<-p >I<port>"
-msgstr "B<-p >I<port>"
+msgid "B<--print>"
+msgstr "B<--print>"
 
 #. type: Plain text
-#: ../test/ippserver.man:117
+#: ippfind.1:107
 msgid ""
-"Specifies the port number to listen on.  The default is a user-specific "
-"number from 8000 to 8999."
+"Prints the URI if the result of previous expressions is true.  The result is "
+"always true."
 msgstr ""
-"Indiquer le numéro de port à écouter. Par défaut, un numéro défini par "
-"l’utilisateur de B<8000> à B<8999>."
+"Afficher l’URI si le résultat des expressions précédentes est vrai. Le "
+"résultat est toujours vrai."
 
-# type: TH
 #. type: TP
-#: ../test/ippserver.man:117
-#, fuzzy, no-wrap
-msgid "B<-r >I<subtype>"
-msgstr "B<-r >I<sous-type>"
+#: ippfind.1:109
+#, no-wrap
+msgid "B<--quiet>"
+msgstr "B<--quiet>"
 
 #. type: Plain text
-#: ../test/ippserver.man:122
-#, fuzzy
-msgid ""
-"Specifies the Bonjour subtype(s) to advertise.  Separate multiple subtypes "
-"with a comma.  The default is \"_print\"."
-msgstr ""
-"Indiquer le(s) sous-type(s) à notifier.  Les sous-types sont à séparer par "
-"des virgules. Par défaut, « _print_»."
+#: ippfind.1:112
+msgid "Quiet mode - just returns the exit codes below."
+msgstr "Mode laconique — seuls les codes de retour sont renvoyés à la suite."
 
 #. type: TP
-#: ../test/ippserver.man:122
+#: ippfind.1:114
 #, no-wrap
-msgid "B<-s >I<speed[,color-speed]>"
-msgstr "B<-s >I<vitesse[,vitesse_couleur]>"
+msgid "B<--remote>"
+msgstr "B<--remote>"
 
 #. type: Plain text
-#: ../test/ippserver.man:127
-msgid ""
-"Specifies the printer speed in pages per minute.  If two numbers are "
-"specified and the second number is greater than zero, the server will report "
-"support for color printing.  The default is \"10,0\"."
-msgstr ""
-"Indiquer la vitesse de l’imprimante en page par minute. Si deux nombres sont "
-"indiqués et que le deuxième nombre est supérieur à zéro, le serveur "
-"déclarera une prise en charge de la couleur. Par défaut, « 10,0 »."
+#: ippfind.1:117
+msgid "True if the service is not local to this computer."
+msgstr "Vrai si le service n’est pas local à cette imprimante."
 
 #. type: TP
-#: ../test/ippserver.man:127
+#: ippfind.1:117 lp.1:132 lpstat.1:117
 #, no-wrap
-msgid "B<-v[vvv]>"
-msgstr "B<-v[vvv]>"
+msgid "B<-s>"
+msgstr "B<-s>"
 
-#. type: Plain text
-#: ../test/ippserver.man:130
-#, fuzzy
-msgid "Be (very) verbose when logging activity to the standard output."
-msgstr ""
-"Journaliser de manière (très) détaillée l’activité sur la sortie standard."
+# type: TP
+#. type: TP
+#: ippfind.1:119
+#, no-wrap
+msgid "B<--print-name>"
+msgstr "B<--print-name>"
 
 #. type: Plain text
-#: ../test/ippserver.man:137
-#, fuzzy
+#: ippfind.1:123
 msgid ""
-"The B<ippserver> program returns 1 if it is unable to process the command-"
-"line arguments or register the IPP service.  Otherwise B<ippserver> will run "
-"continuously until terminated."
+"Prints the service instance name if the result of previous expressions is "
+"true.  The result is always true."
 msgstr ""
-"Le programme B<ippserver> renvoie B<1> s’il est incapable de traiter les "
-"arguments de la ligne de commande ou d’enregistrer le service IPP. Sinon "
-"B<ippserver> continuera jusqu’à la fin de la commande."
+"Afficher le nom l’instance du service si le résultat des expressions "
+"précédentes est vrai. Le résultat est toujours vrai."
 
-#. type: Plain text
-#: ../test/ippserver.man:141
-#, fuzzy
-msgid ""
-"The B<ippserver> program is unique to CUPS and conforms to the IPP "
-"Everywhere (PWG 5100.14) specification."
-msgstr ""
-"Le programme B<ippserver> est spécifique à CUPS et est conforme à la "
-"spécification IPP Everywhere (PWG 5100.14)."
+# type: TP
+#. type: TP
+#: ippfind.1:123
+#, no-wrap
+msgid "B<--true>"
+msgstr "B<--true>"
 
 #. type: Plain text
-#: ../test/ippserver.man:145
-#, fuzzy
-msgid ""
-"B<ippserver> adds environment variables starting with \"IPP_\" for all IPP "
-"Job attributes in the print request.  For example, when executing a command "
-"for an IPP Job containing the \"media\" Job Template attribute, the "
-"\"IPP_MEDIA\" environment variable will be set to the value of that "
-"attribute."
-msgstr ""
-"B<ippserver> ajoute des variables d’environnement commençant par « IPP_ » "
-"pour tous les attributs de travaux IPP dans la requête d’impression. Par "
-"exemple lors de l’exécution d’une commande pour un travail IPP contenant "
-"l’attribut de modèle de travail « media », la variable d’environnement "
-"« IPP_MEDIA » sera définie à la valeur de cet attribut."
+#: ippfind.1:126
+msgid "Always true."
+msgstr "Toujours vrai"
 
-#. type: Plain text
-#: ../test/ippserver.man:148
-#, fuzzy
-msgid ""
-"Enumerated values are converted to their keyword equivalents.  For example, "
-"a \"print-quality\" Job Template attribute with a enum value of 3 will "
-"become the \"IPP_PRINT_QUALITY\" environment variable with a value of \"draft"
-"\"."
-msgstr ""
-"Les valeurs numériques sont converties à leurs mots-clefs équivalents. Par "
-"exemple, un attribut de modèle de travail « print-quality » avec une valeur "
-"de B<3> deviendra une variable d’environnement « IPP_PRINT_QUALITY » avec "
-"comme valeur « draft » (brouillon)."
+# type: TP
+#. type: TP
+#: ippfind.1:126
+#, no-wrap
+msgid "B<-t >I<key>"
+msgstr "B<-t >I<clef>"
 
-#. type: Plain text
-#: ../test/ippserver.man:152
-#, fuzzy
-msgid "Run B<ippserver> with a service name of My Cool Printer:"
-msgstr "Exécuter B<ippserver> avec un nom de service de Ma Super Imprimante :"
+# type: TP
+#. type: TP
+#: ippfind.1:128
+#, no-wrap
+msgid "B<--txt >I<key>"
+msgstr "B<--txt >I<clef>"
 
+# type: Plain text
 #. type: Plain text
-#: ../test/ippserver.man:155
-#, fuzzy, no-wrap
-msgid "    ippserver \"My Cool Printer\"\n"
-msgstr "    ippserver \"Ma Super Imprimante\"\n"
+#: ippfind.1:131
+msgid "True if the TXT record contains the named key."
+msgstr "Vrai si l’enregistrement TXT contient la clef citée."
+
+#. type: TP
+#: ippfind.1:131
+#, no-wrap
+msgid "B<--txt->I<key regex>"
+msgstr "B<--txt->I<clef exp_rationnelle>"
 
 #. type: Plain text
-#: ../test/ippserver.man:160
-msgid "Run the B<file>(1)  command whenever a job is sent to the server:"
+#: ippfind.1:134
+msgid ""
+"True if the TXT record contains the named key and matches the given regular "
+"expression."
 msgstr ""
-"Exécuter la commande B<file>(1) à chaque fois qu’un travail est envoyé au "
-"serveur :"
+"Vrai si l’enregistrement TXT contient la clef citée et correspond à "
+"l’expression rationnelle fournie."
 
-#. type: Plain text
-#: ../test/ippserver.man:163
-#, fuzzy, no-wrap
-msgid "    ippserver -c file \"My Cool Printer\"\n"
-msgstr "    ippserver \"Ma Super Imprimante\"\n"
+# type: TP
+#. type: TP
+#: ippfind.1:134
+#, no-wrap
+msgid "B<-u >I<regex>"
+msgstr "B<-u >I<exp_rationnelle>"
 
-#. type: Plain text
-#: ../test/ippserver.man:166
-#, fuzzy
-msgid "PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)"
-msgstr ""
-"PWG Internet Printing Protocol Workgroup (E<lt>URL:I<http://www.pwg.org/"
-"ipp>E<gt>)"
+# type: TP
+#. type: TP
+#: ippfind.1:136
+#, no-wrap
+msgid "B<--uri >I<regex>"
+msgstr "B<--uri >I<exp_rationnelle>"
 
-# type: Plain text
 #. type: Plain text
-#: ../test/ippserver.man:167
-msgid "Copyright \\[co] 2007-2014 by Apple Inc."
-msgstr "Copyright 2007-2014 par Apple Inc."
+#: ippfind.1:139
+msgid "True if the URI matches the given regular expression."
+msgstr "Vrai si l’URI correspond à l’expression rationnelle fournie."
 
-#. type: TH
-#: ipptoolfile.man:12
+#. type: TP
+#: ippfind.1:139
 #, no-wrap
-msgid "ipptoolfile"
-msgstr "ipptoolfile"
+msgid "B<-x >I<utility >[ I<argument >... ] B<;>"
+msgstr "B<-x >I<utilitaire >[ I<argument >... ] B<;>"
 
-#. type: TH
-#: ipptoolfile.man:12
+#. type: TP
+#: ippfind.1:141
 #, no-wrap
-msgid "5 August 2019"
-msgstr "5 août 2019"
-
-#. type: Plain text
-#: ipptoolfile.man:15
-msgid "ipptoolfile - ipptool file format"
-msgstr "ipptoolfile - Format de fichier ipptool"
+msgid "B<--exec >I<utility >[ I<argument >... ] B<;>"
+msgstr "B<--exec >I<utilitaire >[ I<argument >... ] B<;>"
 
 #. type: Plain text
-#: ipptoolfile.man:21
+#: ippfind.1:145
 msgid ""
-"The B<ipptool>(1)  program accepts free-form plain text files that describe "
-"one or more IPP requests.  Comments start with the \"#\" character and "
-"continue to the end of the line.  Each request is enclosed by curly braces, "
-"for example:"
+"Executes the specified program if the current result is true.  \"{foo}\" "
+"arguments are replaced with the corresponding value - see SUBSTITUTIONS "
+"below."
 msgstr ""
-"Le programme B<ipptool>(1) accepte les fichiers, sans format particulier en "
-"texte pur, qui décrivent une ou plusieurs requêtes IPP. Les commentaires "
-"commencent par le caractère « # » et se terminent à la fin de la ligne. "
-"Chaque requête est entourée par des accolades, par exemple : "
-
-#. type: Plain text
-#: ipptoolfile.man:27
-#, no-wrap
-msgid ""
-"    # This is a comment\n"
-"    {\n"
-"      # The name of the test\n"
-"      NAME \"Print PDF File\"\n"
-msgstr ""
-"    # Ceci est un commentaire\n"
-"    {\n"
-"      # Le nom du test\n"
-"      NAME « Fichier d’impression PDF »\n"
+"Exécuter le programme indiqué si le résultat actuel est vrai. Les arguments "
+"« {toto} » sont remplacés par leur valeur correspondante — consultez "
+"SUBSTITUTIONS ci-dessous."
 
 #. type: Plain text
-#: ipptoolfile.man:30
-#, no-wrap
-msgid ""
-"      # The request to send\n"
-"      OPERATION Print-Job\n"
-msgstr ""
-"      # La requête à envoyer\n"
-"      OPERATION Print-Job\n"
+#: ippfind.1:147
+msgid "Expressions may also contain modifiers:"
+msgstr "Les expressions peuvent aussi contenir des modificateurs :"
 
-#. type: Plain text
-#: ipptoolfile.man:37
+#. type: TP
+#: ippfind.1:147
 #, no-wrap
-msgid ""
-"      GROUP operation-attributes-tag\n"
-"      ATTR charset attributes-charset utf-8\n"
-"      ATTR language attributes-natural-language en\n"
-"      ATTR uri printer-uri $uri\n"
-"      ATTR name requesting-user-name $user\n"
-"      ATTR mimeMediaType document-format application/pdf\n"
-msgstr ""
-"      GROUP operation-attributes-tag\n"
-"      ATTR charset attributes-charset utf-8\n"
-"      ATTR language attributes-natural-language en\n"
-"      ATTR uri printer-uri $uri\n"
-"      ATTR name requesting-user-name $user\n"
-"      ATTR mimeMediaType document-format application/pdf\n"
+msgid "B<( >I<expression >B<)>"
+msgstr "B<( >I<expression >B<)>"
 
 #. type: Plain text
-#: ipptoolfile.man:52
-#, no-wrap
-msgid ""
-"      GROUP job-attributes-tag\n"
-"      ATTR collection media-col {\n"
-"        # US Letter plain paper from the \"main\" tray\n"
-"        MEMBER collection media-size {\n"
-"          MEMBER integer x-dimension 21590\n"
-"          MEMBER integer y-dimension 27940\n"
-"        }\n"
-"        MEMBER integer media-top-margin 423\n"
-"        MEMBER integer media-bottom-margin 423\n"
-"        MEMBER integer media-left-margin 423\n"
-"        MEMBER integer media-right-margin 423\n"
-"        MEMBER keyword media-source \"main\"\n"
-"        MEMBER keyword media-type \"stationery\"\n"
-"      }\n"
-msgstr ""
-"      GROUP job-attributes-tag\n"
-"      ATTR collection media-col {\n"
-"        # papier ordinaire US Letter à partir du bac « principal »\n"
-"        MEMBER collection media-size {\n"
-"          MEMBER integer x-dimension 21590\n"
-"          MEMBER integer y-dimension 27940\n"
-"        }\n"
-"        MEMBER integer media-top-margin 423\n"
-"        MEMBER integer media-bottom-margin 423\n"
-"        MEMBER integer media-left-margin 423\n"
-"        MEMBER integer media-right-margin 423\n"
-"        MEMBER keyword media-source \"main\"\n"
-"        MEMBER keyword media-type \"stationery\"\n"
-"      }\n"
+#: ippfind.1:150
+msgid "Group the result of expressions."
+msgstr "Classer le résultat des expressions."
 
-#. type: Plain text
-#: ipptoolfile.man:54
+# type: TP
+#. type: TP
+#: ippfind.1:150
 #, no-wrap
-msgid "      FILE testfile.pdf\n"
-msgstr "      FILE testfile.pdf\n"
+msgid "B<! >I<expression>"
+msgstr "B<! >I<expression>"
 
-#. type: Plain text
-#: ipptoolfile.man:63
+# type: TP
+#. type: TP
+#: ippfind.1:152
 #, no-wrap
-msgid ""
-"      # The response to expect\n"
-"      STATUS successful-ok\n"
-"      EXPECT job-id OF-TYPE integer WITH-VALUE E<gt>0\n"
-"      EXPECT job-uri OF-TYPE uri\n"
-"    }\n"
-"    {\n"
-"      # The name of the test\n"
-"      NAME \"Wait for Job to Complete\"\n"
-msgstr ""
-"      # La réponse à attendre\n"
-"      STATUS successful-ok\n"
-"      EXPECT job-id OF-TYPE integer WITH-VALUE E<gt>0\n"
-"      EXPECT job-uri OF-TYPE uri\n"
-"    }\n"
-"    {\n"
-"      # Le nom du test\n"
-"      NAME \"Attente de l’achèvement du travail\"\n"
+msgid "B<--not >I<expression>"
+msgstr "B<--not >I<expression>"
 
 #. type: Plain text
-#: ipptoolfile.man:66
+#: ippfind.1:155
+msgid "Unary NOT of the expression."
+msgstr "Opération logique NON sur l’expression."
+
+#. type: TP
+#: ippfind.1:155
 #, no-wrap
-msgid ""
-"      # The request to send\n"
-"      OPERATION Get-Job-Attributes\n"
-msgstr ""
-"      # La requête à envoyer\n"
-"      OPERATION Get-Job-Attributes\n"
+msgid "I<expression expression>"
+msgstr "I<expression expression>"
 
-#. type: Plain text
-#: ipptoolfile.man:73
+#. type: TP
+#: ippfind.1:157
 #, no-wrap
-msgid ""
-"      GROUP operation-attributes-tag\n"
-"      ATTR charset attributes-charset utf-8\n"
-"      ATTR language attributes-natural-language en\n"
-"      ATTR uri printer-uri $uri\n"
-"      ATTR integer job-id $job-id\n"
-"      ATTR name requesting-user-name $user\n"
-msgstr ""
-"      GROUP operation-attributes-tag\n"
-"      ATTR charset attributes-charset utf-8\n"
-"      ATTR language attributes-natural-language en\n"
-"      ATTR uri printer-uri $uri\n"
-"      ATTR integer job-id $job-id\n"
-"      ATTR name requesting-user-name $user\n"
+msgid "I<expression >B<--and >I<expression>"
+msgstr "I<expression >B<--and >I<expression>"
 
 #. type: Plain text
-#: ipptoolfile.man:80
+#: ippfind.1:160
+msgid "Logical AND of expressions."
+msgstr "Opération logique ET sur les expressions."
+
+#. type: TP
+#: ippfind.1:160
 #, no-wrap
-msgid ""
-"      # The response to expect\n"
-"      STATUS successful-ok\n"
-"      EXPECT job-id OF-TYPE integer WITH-VALUE $job-id\n"
-"      EXPECT job-uri OF-TYPE uri\n"
-"      EXPECT job-state OF-TYPE enum WITH-VALUE E<gt>5 REPEAT-NO-MATCH\n"
-"      EXPECT job-originating-user-name OF-TYPE name WITH-VALUE \"$user\"\n"
-msgstr ""
-"      # La réponse à attendre\n"
-"      STATUS successful-ok\n"
-"      EXPECT job-id OF-TYPE integer WITH-VALUE $job-id\n"
-"      EXPECT job-uri OF-TYPE uri\n"
-"      EXPECT job-state OF-TYPE enum WITH-VALUE 3,4,5,6,7,8,9\n"
-"      EXPECT job-originating-user-name OF-TYPE name WITH-VALUE \"$user\"\n"
+msgid "I<expression >B<--or >I<expression>"
+msgstr "I<expression >B<--or >I<expression>"
 
 #. type: Plain text
-#: ipptoolfile.man:85
+#: ippfind.1:163
+msgid "Logical OR of expressions."
+msgstr "Opération logique OU sur les expressions."
+
+#. type: SS
+#: ippfind.1:163
 #, no-wrap
-msgid ""
-"      # Show the job state until completed...\n"
-"      DISPLAY job-state\n"
-"      DISPLAY job-state-reasons\n"
-"    }\n"
-msgstr ""
-"      # Afficher l’état du travail en attendant son achèvement...\n"
-"      DISPLAY job-state\n"
-"      DISPLAY job-state-reasons\n"
-"    }\n"
+msgid "SUBSTITUTIONS"
+msgstr "SUBSTITUTIONS"
 
 #. type: Plain text
-#: ipptoolfile.man:88
-msgid "The following directives can be used outside of a I<test>:"
+#: ippfind.1:165
+msgid "The substitutions for \"{foo}\" in I<-e> and I<--exec> are:"
 msgstr ""
-"Les directives suivantes peuvent être utilisées en dehors d’un I<test> :"
+"Les substitutions pour « {toto} » dans B<-e> et B<--exec> sont les "
+"suivantes :"
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:88
+#: ippfind.1:165
 #, no-wrap
-msgid "B<{ >I<test >B<}>"
-msgstr "B<{ >I<test >B<}>"
+msgid "B<{service_domain}>"
+msgstr "B<{service_domain}>"
 
-# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:91
-msgid "Defines a test."
-msgstr "Définir un test."
+#: ippfind.1:168 ippfind.1:221
+msgid "Domain name, e.g., \"example.com.\", \"local.\", etc."
+msgstr "Nom de domaine, par exemple « example.com. », « local. », etc."
 
-# type: TP
 #. type: TP
-#: ipptoolfile.man:91
+#: ippfind.1:168
 #, no-wrap
-msgid "B<DEFINE >I<variable-name value>"
-msgstr "B<DEFINE >I<nom_variable valeur>"
+msgid "B<{service_hostname}>"
+msgstr "B<{service_hostname}>"
 
 #. type: Plain text
-#: ipptoolfile.man:96
+#: ippfind.1:171 ippfind.1:224
 msgid ""
-"Defines the named variable to the given value. This is equivalent to "
-"specifying I<-d variable-name=value> on the B<ipptool>(8)  command-line."
+"Fully-qualified domain name, e.g., \"printer.example.com.\", \"printer.local."
+"\", etc."
 msgstr ""
-"Définir la variable dénommée à la valeur donnée. Cela est équivalent à "
-"indiquer « B<-d> I<nom_variable>=I<valeur> » sur la ligne de commande de "
-"B<ipptool(8)>."
+"Nom de domaine complet, par exemple « printer.example.com. », « printer."
+"local. », etc."
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:96
+#: ippfind.1:171
 #, no-wrap
-msgid "B<DEFINE-DEFAULT >I<variable-name value>"
-msgstr "B<DEFINE-DEFAULT >I<nom_variable valeur>"
+msgid "B<{service_name}>"
+msgstr "B<{service_name}>"
 
 #. type: Plain text
-#: ipptoolfile.man:99
-msgid ""
-"Defines the named variable to the given value if it does not already have a "
-"value."
+#: ippfind.1:174 ippfind.1:227
+msgid "Service instance name, e.g., \"My Fine Printer\"."
 msgstr ""
-"Définir la variable nommée à la valeur donnée si elle n’a pas déjà une "
-"valeur."
+"Nom de l’instance du service, par exemple « Mon excellente imprimante »."
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:99
+#: ippfind.1:174
 #, no-wrap
-msgid "B<FILE-ID \">I<identifier>B<\">"
-msgstr "B<FILE-ID \">I<identificateur>B<\">"
+msgid "B<{service_port}>"
+msgstr "B<{service_port}>"
 
-# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:102
-msgid "Specifies an identifier string for the current file."
-msgstr "Définir la chaîne d’identificateur pour le fichier actuel."
+#: ippfind.1:177 ippfind.1:230
+msgid "Port number for server, typically 631 for IPP and 80 for HTTP."
+msgstr ""
+"Numéro de port pour le serveur, habituellement B<631> pour IPP et B<80> pour "
+"HTTP."
 
 #. type: TP
-#: ipptoolfile.man:102 ipptoolfile.man:212
+#: ippfind.1:177
 #, no-wrap
-msgid "B<IGNORE-ERRORS yes>"
-msgstr "B<IGNORE-ERRORS >I<yes>"
+msgid "B<{service_regtype}>"
+msgstr "B<{service_regtype}>"
+
+#. type: Plain text
+#: ippfind.1:180 ippfind.1:233
+msgid "DNS-SD registration type, e.g., \"_ipp._tcp\", \"_http._tcp\", etc."
+msgstr ""
+"Type d’enregistrement DNS-SD, par exemple « _ipp._tcp », « _http._tcp », etc."
 
 #. type: TP
-#: ipptoolfile.man:104 ipptoolfile.man:214
+#: ippfind.1:180
 #, no-wrap
-msgid "B<IGNORE-ERRORS no>"
-msgstr "B<IGNORE-ERRORS >I<no>"
+msgid "B<{service_scheme}>"
+msgstr "B<{service_scheme}>"
 
 #. type: Plain text
-#: ipptoolfile.man:109
-msgid ""
-"Specifies whether, by default, B<ipptool>(8)  will ignore errors and "
-"continue with subsequent tests."
+#: ippfind.1:183 ippfind.1:236
+msgid "URI scheme for DNS-SD registration type, e.g., \"ipp\", \"http\", etc."
 msgstr ""
-"Indiquer si, par défaut, B<ipptool>(8) ignorera les erreurs et poursuivra "
-"avec les tests suivants."
+"Schéma d’URI pour le type d’enregistrement DNS-SD, par exemple « ipp », "
+"« http », etc."
 
-# type: TP
 #. type: TP
-#: ipptoolfile.man:109
+#: ippfind.1:183
 #, no-wrap
-msgid "B<INCLUDE \">I<filename>B<\">"
-msgstr "B<INCLUDE \">I<nom_fichier>B<\">"
+msgid "B<{}>"
+msgstr "B<{}>"
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:111
+#: ippfind.1:185
 #, no-wrap
-msgid "B<INCLUDE E<lt>>I<filename>B<E<gt>>"
-msgstr "B<INCLUDE E<lt>>I<nom_fichier>B<E<gt>>"
+msgid "B<{service_uri}>"
+msgstr "B<{service_uri}>"
 
 #. type: Plain text
-#: ipptoolfile.man:116
+#: ippfind.1:188 ippfind.1:239
 msgid ""
-"Includes another test file. The first form includes a file relative to the "
-"current test file, while the second form includes a file from the "
-"B<ipptool>(8)  include directory."
+"URI for service, e.g., \"ipp://printer.local./ipp/print\", \"http://printer."
+"local./\", etc."
 msgstr ""
-"Inclure un autre fichier de test. La première façon inclut un fichier "
-"relatif au fichier de test actuel, tandis que la seconde inclut un fichier "
-"du répertoire inclus de B<ipptool>(8)."
-
-#. type: TP
-#: ipptoolfile.man:116
-#, no-wrap
-msgid "B<INCLUDE-IF-DEFINED >I<name >B<\">I<filename>B<\">"
-msgstr "B<INCLUDE-IF-DEFINED >I<nom >B<\">I<nom_fichier>B<\">"
+"URI pour le service, par exemple, « ipp://printer.local./ipp/print », "
+"« http://printer.local./ », etc."
 
 #. type: TP
-#: ipptoolfile.man:118
+#: ippfind.1:188
 #, no-wrap
-msgid "B<INCLUDE-IF-DEFINED >I<name >B<E<lt>>I<filename>B<E<gt>>"
-msgstr "B<INCLUDE-IF-DEFINED >I<nom >B<E<lt>>I<nom_fichier>B<E<gt>>"
+msgid "B<{txt_>I<key>B<}>"
+msgstr "B<{txt_>I<clef>B<}>"
 
 #. type: Plain text
-#: ipptoolfile.man:123
-msgid ""
-"Includes another test file if the named variable is defined. The first form "
-"includes a file relative to the current test file, while the second form "
-"includes a file from the B<ipptool>(8)  include directory."
-msgstr ""
-"Inclure un autre fichier de test si la variable nommée est définie. La "
-"première façon inclut un fichier relatif à l’actuel fichier de test, tandis "
-"que la seconde inclut un fichier du répertoire inclus de B<ipptool>(8)."
-
-#. type: TP
-#: ipptoolfile.man:123
-#, no-wrap
-msgid "B<INCLUDE-IF-NOT-DEFINED >I<name >B<\">I<filename>B<\">"
-msgstr "B<INCLUDE-IF-NOT-DEFINED >I<nom >B<\">I<nom_fichier>B<\">"
+#: ippfind.1:191
+msgid "Value of TXT record I<key> (lowercase)."
+msgstr "Valeur de l’enregistrement TXT I<clef> (minuscules)."
 
-#. type: TP
-#: ipptoolfile.man:125
-#, no-wrap
-msgid "B<INCLUDE-IF-NOT-DEFINED >I<name >B<E<lt>>I<filename>B<E<gt>>"
-msgstr "B<INCLUDE-IF-NOT-DEFINED >I<nom >B<E<lt>>I<nom_fichier>B<E<gt>>"
+# type: Plain text
+#. type: Plain text
+#: ippfind.1:193
+msgid "B<ippfind> supports the following options:"
+msgstr "B<ippfind> accepte les options suivantes :"
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:130
-msgid ""
-"Includes another test file if the named variable is not defined. The first "
-"form includes a file relative to the current test file, while the second "
-"form includes a file from the B<ipptool>(8)  include directory."
-msgstr ""
-"Inclure un autre fichier de test si la variable nommée n’est pas définie. La "
-"première façon inclut un fichier relatif à l’actuel fichier de test, tandis "
-"que la seconde inclut un fichier du répertoire inclus de B<ipptool>(8)."
+#: ippfind.1:196
+msgid "Show program help."
+msgstr "Afficher un message d'aide."
 
-#. type: TP
-#: ipptoolfile.man:130 ipptoolfile.man:238
-#, no-wrap
-msgid "B<SKIP-IF-DEFINED >I<variable-name>"
-msgstr "B<SKIP-IF-DEFINED >I<nom_variable>"
+# type: Plain text
+#. type: Plain text
+#: ippfind.1:199
+msgid "Show program version."
+msgstr "Afficher la version du programme."
 
 #. type: TP
-#: ipptoolfile.man:132 ipptoolfile.man:240
+#: ippfind.1:199 ipptool.1:111
 #, no-wrap
-msgid "B<SKIP-IF-NOT-DEFINED >I<variable-name>"
-msgstr "B<SKIP-IF-NOT-DEFINED >I<nom_variable>"
+msgid "B<-4>"
+msgstr "B<-4>"
 
-# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:135
-msgid ""
-"Specifies that the remainder of the test file should be skipped when the "
-"variable is or is not defined."
-msgstr ""
-"Indiquer que le reste du fichier de test devra être ignoré si la variable "
-"est ou n’est pas définie."
+#: ippfind.1:202
+msgid "Use IPv4 when listing."
+msgstr "Utiliser IPv4 lors de l’écoute."
 
 #. type: TP
-#: ipptoolfile.man:135
+#: ippfind.1:202 ipptool.1:116
 #, no-wrap
-msgid "B<STOP-AFTER-INCLUDE-ERROR no>"
-msgstr "B<STOP-AFTER-INCLUDE-ERROR >I<no>"
+msgid "B<-6>"
+msgstr "B<-6>"
+
+#. type: Plain text
+#: ippfind.1:205
+msgid "Use IPv6 when listing."
+msgstr "Utiliser IPv6 lors de l’écoute."
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:137
+#: ippfind.1:205
 #, no-wrap
-msgid "B<STOP-AFTER-INCLUDE-ERROR yes>"
-msgstr "B<STOP-AFTER-INCLUDE-ERROR >I<yes>"
+msgid "B<-T >I<seconds>"
+msgstr "B<-T >I<secondes>"
 
-# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:140
+#: ippfind.1:210
 msgid ""
-"Specifies whether tests will be stopped after an error in an included file."
+"Specify find timeout in seconds.  If 1 or less, B<ippfind> stops as soon as "
+"it thinks it has found everything.  The default timeout is 1 second."
 msgstr ""
-"Indiquer si les tests seront arrêtés après une erreur dans un fichier inclus "
+"Indiquer le délai de recherche en seconde. Si égal à B<1> ou moins, "
+"B<ippfind> s'arrêtera aussitôt qu’il pensera avoir tout trouvé. Par défaut, "
+"B<1> seconde."
 
 #. type: TP
-#: ipptoolfile.man:140 ipptoolfile.man:256
+#: ippfind.1:210
 #, no-wrap
-msgid "B<TRANSFER auto>"
-msgstr "B<TRANSFER >I<auto>"
+msgid "B<-V >I<version>"
+msgstr "B<-V >I<version>"
 
 #. type: Plain text
-#: ipptoolfile.man:143
+#: ippfind.1:214
 msgid ""
-"Specifies that tests will, by default, use \"Transfer-Encoding: chunked\" "
-"for requests with attached files and \"Content-Length:\" for requests "
-"without attached files."
+"Specifies the IPP version when listing.  Supported values are \"1.1\", "
+"\"2.0\", \"2.1\", and \"2.2\"."
 msgstr ""
-"Indiquer que ces tests utiliseront, par défaut, « Transfer-"
-"Encoding: chunked » lors de requêtes avec fichiers joints et « Content-"
-"Length: » pour celles sans fichier joint."
-
-#. type: TP
-#: ipptoolfile.man:143 ipptoolfile.man:259
-#, no-wrap
-msgid "B<TRANSFER chunked>"
-msgstr "B<TRANSFER >I<chunked>"
+"Indiquer la version d’IPP pour l’écoute. Les valeurs prises en charge sont "
+"« 1.1 », « 2.0 », « 2.1 » et « 2.2 »."
 
 #. type: Plain text
-#: ipptoolfile.man:148
+#: ippfind.1:216
 msgid ""
-"Specifies that tests will, by default, use the HTTP/1.1 \"Transfer-Encoding: "
-"chunked\" header. This is the default and is equivalent to specifying I<-c> "
-"on the B<ipptool>(8)  command-line. Support for chunked requests is required "
-"for conformance with all versions of IPP."
+"B<ippfind> returns 0 if the result for all processed expressions is true, 1 "
+"if the result of any processed expression is false, 2 if browsing or any "
+"query or resolution failed, 3 if an undefined option or invalid expression "
+"was specified, and 4 if it ran out of memory."
 msgstr ""
-"Indiquer que ces tests utiliseront, par défaut, l’en-tête de HTTP/1.1 "
-"« Transfer-Encoding: chunked ». C’est le comportement par défaut et "
-"équivalent à indiquer B<-c> sur la ligne de commande de B<ipptool>(8). La "
-"prise en charge pour les requêtes partielles est exigée pour conformité avec "
-"toutes les versions d’IPP."
-
-#. type: TP
-#: ipptoolfile.man:148 ipptoolfile.man:262
-#, no-wrap
-msgid "B<TRANSFER length>"
-msgstr "B<TRANSFER >I<taille>"
+"B<ippfind> renvoie B<0> si le résultat de toutes les expressions examinées "
+"est vrai, B<1> si le résultat de n’importe quelle expression est fausse, "
+"B<2> si la lecture, la requête ou la résolution échouent, B<3> si une option "
+"non reconnue ou expression non valable était indiquée, et B<4> pour un "
+"dépassement de mémoire."
 
 #. type: Plain text
-#: ipptoolfile.man:153
+#: ippfind.1:218
 msgid ""
-"Specifies that tests will, by default, use the HTTP/1.0 \"Content-Length:\" "
-"header. This is equivalent to specifying I<-l> on the B<ipptool>(8)  command-"
-"line. Support for content length requests is required for conformance with "
-"all versions of IPP."
+"When executing a program, B<ippfind> sets the following environment "
+"variables for the matching service registration:"
 msgstr ""
-"Indiquer que ces tests utiliseront, par défaut, l’en-tête de HTTP/1.0 "
-"« Content-Length: ». C’est équivalent à indiquer « B<-l> » sur la ligne de "
-"commande de B<ipptool>(8). La prise en charge pour les requêtes sur la "
-"taille de contenu est exigée pour conformité avec toutes les versions d’IPP."
+"Lors de l’exécution d’un programme, B<ippfind> définit les variables "
+"d’environnement suivantes pour l’enregistrement de service correspondant :"
 
 #. type: TP
-#: ipptoolfile.man:153 ipptoolfile.man:265
+#: ippfind.1:218
 #, no-wrap
-msgid "B<VERSION 1.0>"
-msgstr "B<VERSION 1.0>"
+msgid "B<IPPFIND_SERVICE_DOMAIN>"
+msgstr "B<IPPFIND_SERVICE_DOMAIN>"
 
 #. type: TP
-#: ipptoolfile.man:155 ipptoolfile.man:267
+#: ippfind.1:221
 #, no-wrap
-msgid "B<VERSION 1.1>"
-msgstr "B<VERSION 1.1>"
+msgid "B<IPPFIND_SERVICE_HOSTNAME>"
+msgstr "B<IPPFIND_SERVICE_HOSTNAME>"
 
 #. type: TP
-#: ipptoolfile.man:157 ipptoolfile.man:269
+#: ippfind.1:224
 #, no-wrap
-msgid "B<VERSION 2.0>"
-msgstr "B<VERSION 2.0>"
+msgid "B<IPPFIND_SERVICE_NAME>"
+msgstr "B<IPPFIND_SERVICE_NAME>"
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:159 ipptoolfile.man:271
+#: ippfind.1:227
 #, no-wrap
-msgid "B<VERSION 2.1>"
-msgstr "B<VERSION 2.1>"
+msgid "B<IPPFIND_SERVICE_PORT>"
+msgstr "B<IPPFIND_SERVICE_PORT>"
 
 #. type: TP
-#: ipptoolfile.man:161 ipptoolfile.man:273
+#: ippfind.1:230
 #, no-wrap
-msgid "B<VERSION 2.2>"
-msgstr "B<VERSION 2.2>"
-
-# type: Plain text
-#. type: Plain text
-#: ipptoolfile.man:164
-msgid ""
-"Specifies the default IPP version number to use for the tests that follow."
-msgstr ""
-"Indiquer le numéro de version d’IPP à utiliser par défaut pour les tests ci-"
-"dessous."
+msgid "B<IPPFIND_SERVICE_REGTYPE>"
+msgstr "B<IPPFIND_SERVICE_REGTYPE>"
 
-# type: SH
-#. type: SS
-#: ipptoolfile.man:164
+#. type: TP
+#: ippfind.1:233
 #, no-wrap
-msgid "TEST DIRECTIVES"
-msgstr "DIRECTIVES DE TEST"
-
-# type: Plain text
-#. type: Plain text
-#: ipptoolfile.man:166
-msgid "The following directives are understood within a I<test>:"
-msgstr "Les directives suivantes sont comprises dans un I<test> : "
+msgid "B<IPPFIND_SERVICE_SCHEME>"
+msgstr "B<IPPFIND_SERVICE_SCHEME>"
 
 # type: TP
 #. type: TP
-#: ipptoolfile.man:166
+#: ippfind.1:236
 #, no-wrap
-msgid "B<ATTR >I<out-of-band-tag attribute-name>"
-msgstr "B<ATTR >I<étiquette_hors-bande nom_attribut>"
+msgid "B<IPPFIND_SERVICE_URI>"
+msgstr "B<IPPFIND_SERVICE_URI>"
 
-# type: TP
 #. type: TP
-#: ipptoolfile.man:168
+#: ippfind.1:239
 #, no-wrap
-msgid "B<ATTR >I<tag attribute-name value(s)>"
-msgstr "B<ATTR >I<étiquette nom_attribut valeur(s)>"
+msgid "B<IPPFIND_TXT_>I<KEY>"
+msgstr "B<IPPFIND_TXT_>I<CLEF>"
 
-#.  character.
 #. type: Plain text
-#: ipptoolfile.man:174
-msgid ""
-"Adds an attribute to the test request.  Out-of-band tags (admin-define, "
-"delete-attribute, no-value, not-settable, unknown, unsupported) have no "
-"value.  Values for other tags are separated by the comma (\",\") character - "
-"escape commas using the \" Common attributes and values are listed in the "
-"IANA IPP registry - see references below."
-msgstr ""
-"Ajouter un attribut à la requête de test. Les étiquettes hors-bande (admin-"
-"define, delete-attribute, no-value, not-settable, unknown, unsupported) "
-"n’ont pas de valeur. Les valeurs pour d’autres étiquettes sont séparées par "
-"le caractère virgule (« , ») – protéger les virgules avec \". Les attributs "
-"et valeurs courants sont listés dans le registre IPP d’IANA — consulter les "
-"références ci-dessous."
-
-#. type: TP
-#: ipptoolfile.man:174
-#, no-wrap
-msgid "B<ATTR collection >I<attribute-name >B<{ MEMBER >I<tag member-name value(s) ... >B<}> [ I<... >B<,{ >I<... >B<} >]"
-msgstr "B<ATTR collection >I<nom_attribut >B<{ MEMBER >I<étiquette nom_membre valeur(s) ... >B<}> [ I<... >B<,{ >I<... >B<} >]"
+#: ippfind.1:242
+msgid "Values of TXT record I<KEY> (uppercase)."
+msgstr "Valeurs des enregistrements TXT I<CLEF> (majuscules)."
 
 #. type: Plain text
-#: ipptoolfile.man:179
-msgid ""
-"Adds a collection attribute to the test request.  Member attributes follow "
-"the same syntax as regular attributes and can themselves be nested "
-"collections.  Multiple collection values can be supplied as needed, "
-"separated by commas."
+#: ippfind.1:244
+msgid "To show the status of all registered IPP printers on your network, run:"
 msgstr ""
-"Ajouter un attribut d’ensemble à la requête de test. Les attributs de membre "
-"suivent la même syntaxe que les attributs normaux et peuvent être eux-mêmes "
-"des ensembles emboités. Plusieurs valeurs d’ensemble peuvent être fournies "
-"si nécessaire, séparées par des virgules."
-
-#. type: TP
-#: ipptoolfile.man:179
-#, no-wrap
-msgid "B<COMPRESSION deflate>"
-msgstr "B<COMPRESSION >I<deflate>"
-
-#. type: TP
-#: ipptoolfile.man:181
-#, no-wrap
-msgid "B<COMPRESSION gzip>"
-msgstr "B<COMPRESSION >I<gzip>"
+"Pour afficher l’état de toutes les imprimantes IPP enregistrées, exécutez :"
 
-#. type: TP
-#: ipptoolfile.man:183
+# type: TH
+#. type: Plain text
+#: ippfind.1:247
 #, no-wrap
-msgid "B<COMPRESSION none>"
-msgstr "B<COMPRESSION >I<none>"
+msgid "    ippfind --ls\n"
+msgstr "    ippfind --ls\n"
 
 #. type: Plain text
-#: ipptoolfile.man:186
+#: ippfind.1:250
 msgid ""
-"Uses the specified compression on the document data following the attributes "
-"in a Print-Job or Send-Document request."
+"Similarly, to send a PostScript test page to every PostScript printer, run:"
 msgstr ""
-"Utiliser la compression indiquée pour les données du document qui suit les "
-"attributs dans une tâche d’impression ou une requête d’envoi de document."
-
-#. type: TP
-#: ipptoolfile.man:186
-#, no-wrap
-msgid "B<DELAY >I<seconds>[I<,repeat-seconds>]"
-msgstr "B<DELAY >I<seconds>[I<,répétition-secondes>]"
+"De même, pour envoyer une page de test PostScript à toutes les imprimantes "
+"PostScript, exécutez :"
 
 #. type: Plain text
-#: ipptoolfile.man:190
+#: ippfind.1:254
+#, no-wrap
 msgid ""
-"Specifies a delay in seconds before this test will be run.  If two values "
-"are specified, the second value is used as the delay between repeated tests."
+"    ippfind --txt-pdl application/postscript --exec ipptool\n"
+"      -f onepage-letter.ps '{}' print-job.test \\e;\n"
 msgstr ""
-"Définir un délai en seconde avant l’exécution du test. Si deux valeurs sont "
-"indiquées, la seconde est utilisée pour définir l’intervalle entre des tests "
-"répétitifs."
+"    ippfind --txt-pdl application/postscript --exec ipptool\n"
+"      -f onepage-letter.ps '{}' print-job.test \\e;\n"
 
-#. type: TP
-#: ipptoolfile.man:190
-#, no-wrap
-msgid "B<DISPLAY >I<attribute-name>"
-msgstr "B<DISPLAY >I<nom_attribut>"
+#. type: Plain text
+#: ippfind.1:257
+msgid "B<ipptool>(1)"
+msgstr "B<ipptool>(1)"
 
 # type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:194
-msgid ""
-"Specifies that value of the named attribute should be output as part of the "
-"test report."
-msgstr ""
-"Indiquer que la valeur de l’attribut nommé doit être affiché comme faisant "
-"partie du compte-rendu de test."
+#: ippfind.1:258
+msgid "Copyright \\[co] 2013-2019 by Apple Inc."
+msgstr "Copyright 2013-2018 par Apple Inc."
 
-#. type: TP
-#: ipptoolfile.man:194
+#. type: TH
+#: ipptool.1:9
 #, no-wrap
-msgid "B<EXPECT >I<attribute-name >[ I<predicate(s) >]"
-msgstr "B<EXPECT >I<nom_attribut >[ I<prédicat(s) >]"
+msgid "ipptool"
+msgstr "ipptool"
 
-#. type: TP
-#: ipptoolfile.man:196
-#, no-wrap
-msgid "B<EXPECT ?>I<attribute-name predicate(s)>"
-msgstr "B<EXPECT ?>I<nom_attribut prédicat(s)>"
+#. type: Plain text
+#: ipptool.1:12
+msgid "ipptool - perform internet printing protocol requests"
+msgstr "ipptool - Réaliser des requêtes d’impression par internet"
 
-#. type: TP
-#: ipptoolfile.man:198
-#, no-wrap
-msgid "B<EXPECT !>I<attribute-name>"
-msgstr "B<EXPECT !>I<nom_attribut>"
+#. type: Plain text
+#: ipptool.1:75
+#, fuzzy
+msgid ""
+"B<ipptool> [ B<--help> ] [ B<--ippserver> I<filename> ] [ B<--stop-after-"
+"include-error> ] [ B<--version> ] [ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] "
+"[ B<-I> ] [ B<-L> ] [ B<-P> I<filename.plist> ] [ B<-S> ] [ B<-T> "
+"I<seconds> ] [ B<-V> I<version> ] [ B<-X> ] [ B<-c> ] [ B<-d> "
+"I<name=value> ] [ B<-f> I<filename> ] [ B<-h> ] [ B<-i> I<seconds> ] [ B<-n> "
+"I<repeat-count> ] [ B<-q> ] [ B<-t> ] [ B<-v ]> I<printer-uri> I<testfile> "
+"[ ...  I<testfile> ]"
+msgstr ""
+"B<ipptool> [ B<--help> ] [ B<--stop-after-include-error> ] [ B<--version> ] "
+"[ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] [ B<-I> ] [ B<-L> ] [ B<-P> "
+"I<fichier.plist> ] [ B<-S> ] [ B<-T> I<secondes> ] [ B<-V> I<version> ] [ B<-"
+"X> ] [ B<-c> ] [ B<-d> I<nom=valeur> ] [ B<-f> I<fichier> ] [ B<-h> ] [ B<-"
+"i> I<secondes> ] [ B<-n> I<nombre_répétitions>] [ B<-q> ] [ B<-t> ] [ B<-"
+"v> ] I<uri_imprimante> I<fichier_test> [ ...  I<fichier_test> ]"
 
 #. type: Plain text
-#: ipptoolfile.man:201
+#: ipptool.1:88
 msgid ""
-"Specifies that the response must/may/must not include the named attribute. "
-"Additional requirements can be added as predicates - see the \"EXPECT "
-"PREDICATES\" section for more information on predicates. Attribute names can "
-"specify member attributes by separating the attribute and member names with "
-"the forward slash, for example \"media-col/media-size/x-dimension\"."
+"B<ipptool> sends IPP requests to the specified I<printer-uri> and tests and/"
+"or displays the results.  Each named I<testfile> defines one or more "
+"requests, including the expected response status, attributes, and values.  "
+"Output is either a plain text, formatted text, CSV, or XML report on the "
+"standard output, with a non-zero exit status indicating that one or more "
+"tests have failed.  The I<testfile> format is described in B<ipptoolfile>(5)."
 msgstr ""
-"Indiquer que la réponse doit, ou peut, ou ne doit pas inclure l’attribut "
-"nommé. Des exigences supplémentaires peuvent être ajoutées comme prédicats "
-"— consultez la section « PRÉDICATS EXPECT » pour davantage d’information sur "
-"les prédicats. Les noms d’attribut peuvent indiquer les attributs des "
-"membres en séparant les noms d’attribut et de membre avec une barre oblique, "
-"par exemple, « media-col/media-size/x-dimension »."
+"B<ipptool> envoie des requêtes IPP à l’I<uri_imprimante> indiqué puis teste "
+"et/ou affiche les résultats. Chaque fichier nommé I<fichier_test> définit "
+"une ou plusieurs requêtes, incluant les états, les attributs, et les valeurs "
+"des réponses attendues. La sortie est soit du texte pur, du texte formaté, "
+"du CSV ou un compte-rendu XML affiché sur la sortie standard, avec un état "
+"d’erreur non nul signifiant qu’un ou plusieurs tests ont échoués. Le format "
+"du I<fichier_test> est décrit dans B<ipptoolfile>(5)."
 
-#. type: TP
-#: ipptoolfile.man:201
-#, no-wrap
-msgid "B<EXPECT-ALL >I<attribute-name >[ I<predicate(s) >]"
-msgstr "B<EXPECT-ALL >I<nom_attribut >[ I<prédicat(s) >]"
+# type: Plain text
+#. type: Plain text
+#: ipptool.1:91
+msgid "The following options are recognized by B<ipptool:>"
+msgstr "Les options suivantes sont reconnues par B<ipptool> :"
+
+# type: Plain text
+#. type: Plain text
+#: ipptool.1:94
+msgid "Shows program help."
+msgstr "Afficher l’aide du programme."
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:203
-#, no-wrap
-msgid "B<EXPECT-ALL ?>I<attribute-name predicate(s)>"
-msgstr "B<EXPECT-ALL ?>I<nom_attribut prédicat(s)>"
+#: ipptool.1:94
+#, fuzzy, no-wrap
+msgid "B<--ippserver >I<filename>"
+msgstr "B<-p> I<nom_fichier.ppd>"
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:206
+#: ipptool.1:99
+#, fuzzy
 msgid ""
-"Specifies that the response must/may include the named attribute and that "
-"all occurrences of that attribute must match the given predicates."
+"Specifies that the test results should be written to the named B<ippserver> "
+"attributes file."
 msgstr ""
-"Indiquer si la réponse doit ou peut inclure l’attribut nommé et que toutes "
-"les occurrences de cet attribut doivent correspondre aux prédicats indiqués."
+"Indiquer que l’actuel test sera omis quand la variable est ou n’est pas "
+"définie."
 
-# type: TP
 #. type: TP
-#: ipptoolfile.man:206
+#: ipptool.1:99
 #, no-wrap
-msgid "B<FILE filename>"
-msgstr "B<FILE> I<nom_fichier>"
+msgid "B<--stop-after-include-error>"
+msgstr "B<--stop-after-include-error>"
 
 #. type: Plain text
-#: ipptoolfile.man:209
+#: ipptool.1:106
 msgid ""
-"Specifies a file to include at the end of the request. This is typically "
-"used when sending a test print file."
+"Tells B<ipptool> to stop if an error occurs in an included file. Normally "
+"B<ipptool> will continue with subsequent tests after the INCLUDE directive."
 msgstr ""
-"Indiquer un fichier à ajouter à la fin de la requête. Cela est "
-"habituellement utilisé lors de l’envoi d’un fichier de test d’impression."
+"Indiquer à B<ipptool> d’arrêter si une erreur survient dans un fichier "
+"inclus. Normalement B<ipptool> continuera les tests suivants après la "
+"directive INCLUDE."
 
-#. type: TP
-#: ipptoolfile.man:209
-#, no-wrap
-msgid "B<GROUP tag>"
-msgstr "B<GROUP> I<étiquette>"
+# type: Plain text
+#. type: Plain text
+#: ipptool.1:111
+msgid "Shows the version of B<ipptool> being used."
+msgstr "Afficher la version de B<ipptool> utilisée."
 
 # type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:212
-msgid "Specifies the group tag for subsequent attributes in the request."
+#: ipptool.1:116
+msgid ""
+"Specifies that B<ipptool> must connect to the printer or server using IPv4."
 msgstr ""
-"Indiquer l’étiquette de groupe pour les attributs suivants dans la requête."
+"Indiquer que B<ipptool> doit se connecter à l’imprimante ou au serveur en "
+"utilisant IPv4."
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:219
+#: ipptool.1:121
 msgid ""
-"Specifies whether B<ipptool>(8)  will ignore errors and continue with "
-"subsequent tests."
+"Specifies that B<ipptool> must connect to the printer or server using IPv6."
 msgstr ""
-"Indiquer si B<ipptool>(8) ignorera les erreurs et continuera avec les tests "
-"suivants."
+"Indiquer que B<ipptool> doit se connecter à l’imprimante ou au serveur en "
+"utilisant IPv6."
 
 #. type: TP
-#: ipptoolfile.man:219
+#: ipptool.1:121
 #, no-wrap
-msgid "B<NAME \">I<literal string>B<\">"
-msgstr "B<NAME \">I<chaîne_littérale>B<\">"
+msgid "B<-C>"
+msgstr "B<-C>"
+
+#. type: Plain text
+#: ipptool.1:125
+msgid ""
+"Specifies that requests should be sent using the HTTP/1.1 \"Transfer-"
+"Encoding: chunked\" header, which is required for conformance by all "
+"versions of IPP.  The default is to use \"Transfer-Encoding: chunked\" for "
+"requests with attached files and \"Content-Length:\" for requests without "
+"attached files."
+msgstr ""
+"Indiquer que les requêtes doivent être envoyées avec l’en-tête de HTTP/1.1 "
+"« Transfer-Encoding: chunked », comme exigé pour conformité par toutes les "
+"versions d’IPP. Par défaut « Transfer-Encoding: chunked » est utilisé pour "
+"les requêtes avec des fichiers joints et « Content-Length: » pour des "
+"requêtes sans fichier joint "
 
 # type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:222
-msgid "Specifies the human-readable name of the test."
-msgstr "Décrire le nom de test de manière compréhensible aux utilisateurs. "
+#: ipptool.1:128
+msgid ""
+"Forces TLS encryption when connecting to the server using the HTTP \"Upgrade"
+"\" header."
+msgstr ""
+"Forcer le chiffrement TLS lors de la connexion au serveur en utilisant l’en-"
+"tête HTTP « Upgrade »."
 
 #. type: TP
-#: ipptoolfile.man:222
+#: ipptool.1:128
 #, no-wrap
-msgid "B<OPERATION >I<operation-code>"
-msgstr "B<OPERATION >I<code_opération>"
+msgid "B<-I>"
+msgstr "B<-I>"
 
-# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:225
-msgid "Specifies the operation to be performed."
-msgstr "Indiquer les opérations à effectuer."
+#: ipptool.1:133
+msgid "Specifies that B<ipptool> will continue past errors."
+msgstr "Indiquer que B<ipptool> continuera après les erreurs."
 
 #. type: TP
-#: ipptoolfile.man:225
+#: ipptool.1:133
 #, no-wrap
-msgid "B<PAUSE \">I<message>B<\">"
-msgstr "B<PAUSE \">I<message>B<\">"
+msgid "B<-L>"
+msgstr "B<-L>"
 
 #. type: Plain text
-#: ipptoolfile.man:228
+#: ipptool.1:137
 msgid ""
-"Displays the provided message and waits for the user to press a key to "
-"continue."
+"Specifies that requests should be sent using the HTTP/1.0 \"Content-Length:"
+"\" header, which is required for conformance by all versions of IPP.  The "
+"default is to use \"Transfer-Encoding: chunked\" for requests with attached "
+"files and \"Content-Length:\" for requests without attached files."
 msgstr ""
-"Afficher le message fourni et attendre l’appui d’une touche par "
-"l’utilisateur pour continuer."
-
-#. type: TP
-#: ipptoolfile.man:228
-#, no-wrap
-msgid "B<REQUEST-ID >I<number>"
-msgstr "B<REQUEST-ID >I<nombre>"
+"Indiquer que les requêtes seront envoyées avec l’en-tête HTTP/1.0 « Content-"
+"Length: », comme exigé pour conformité par toutes les versions d’IPP. Par "
+"défaut « Transfer-Encoding: chunked » est utilisé pour les requêtes avec "
+"fichiers joints et « Content-Length: » pour celles sans fichier joint."
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:230
+#: ipptool.1:137
 #, no-wrap
-msgid "B<REQUEST-ID random>"
-msgstr "B<REQUEST-ID >I<aléatoire>"
+msgid "B<-P>I<\\ filename.plist>"
+msgstr "B<-P>I<\\ nom_fichier.plist>"
 
 #. type: Plain text
-#: ipptoolfile.man:233
+#: ipptool.1:141
 msgid ""
-"Specifies the request-id value to use in the request, either an integer or "
-"the word \"random\" to use a randomly generated value (the default)."
+"Specifies that the test results should be written to the named XML (Apple "
+"plist) file in addition to the regular test report (B<-t>).  This option is "
+"incompatible with the B<-i> (interval) and B<-n> (repeat-count) options."
 msgstr ""
-"Indiquer la valeur d’identifiant de requête à utiliser dans la requête, soit "
-"un nombre entier soit le mot « random » pour utiliser une valeur calculée "
-"aléatoirement (comportement par défaut)."
+"Indiquer que les résultats de test devront être écrits dans le XML nommé "
+"(plist d’Apple) en plus du rapport de test normal B<-t>. Cette option est "
+"incompatible avec les options B<-i> (intervalle) et B<-n> "
+"(nombre_répétitions)."
 
 #. type: TP
-#: ipptoolfile.man:233
+#: ipptool.1:141
 #, no-wrap
-msgid "B<RESOURCE >I<path>"
-msgstr "B<RESOURCE >I<chemin>"
-
-#. type: Plain text
-#: ipptoolfile.man:238
-msgid ""
-"Specifies an alternate resource path that is used for the HTTP POST request. "
-"The default is the resource from the URI provided to the B<ipptool>(8)  "
-"program."
-msgstr ""
-"Indiquer un chemin de ressource alternatif pour la requête HTTP POST. Par "
-"défaut, c’est la ressource de l’URI fourni par le programme B<ipptool>(8)."
+msgid "B<-S>"
+msgstr "B<-S>"
 
 # type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:243
-msgid ""
-"Specifies that the current test should be skipped when the variable is or is "
-"not defined."
-msgstr ""
-"Indiquer que l’actuel test sera omis quand la variable est ou n’est pas "
-"définie."
+#: ipptool.1:144
+msgid "Forces (dedicated) TLS encryption when connecting to the server."
+msgstr "Forcer le chiffrement TLS dédié lors de la connexion au serveur."
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:243
+#: ipptool.1:144
 #, no-wrap
-msgid "B<SKIP-PREVIOUS-ERROR yes>"
-msgstr "B<SKIP-PREVIOUS-ERROR >I<yes>"
+msgid "B<-T>I<\\ seconds>"
+msgstr "B<-T>I<\\ secondes>"
+
+# type: Plain text
+#. type: Plain text
+#: ipptool.1:147
+msgid "Specifies a timeout for IPP requests in seconds."
+msgstr "Définir le délai d'attente des requêtes IPP (en seconde)."
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:245
+#: ipptool.1:147
 #, no-wrap
-msgid "B<SKIP-PREVIOUS-ERROR no>"
-msgstr "B<SKIP-PREVIOUS-ERROR >I<no>"
+msgid "B<-V>I<\\ version>"
+msgstr "B<-V>I<\\ version>"
 
 #. type: Plain text
-#: ipptoolfile.man:250
+#: ipptool.1:150
 msgid ""
-"Specifies whether B<ipptool>(8)  will skip the current test if the previous "
-"test resulted in an error/failure."
+"Specifies the default IPP version to use: 1.0, 1.1, 2.0, 2.1, or 2.2. If not "
+"specified, version 1.1 is used."
 msgstr ""
-"Indiquer si B<ipptool>(8) ignorera le test actuel si le test précédent se "
-"termine sur une erreur ou un succès."
+"Définir la version par défaut d’IPP à utiliser : 1.0, 1.1, 2.0, 2.1, ou 2.2. "
+"Sans indication, la version 1.1 sera utilisée."
 
 #. type: TP
-#: ipptoolfile.man:250
+#: ipptool.1:150
 #, no-wrap
-msgid "B<STATUS >I<status-code >[ I<predicate> ]"
-msgstr "B<STATUS >I<code_état >[ I<prédicat> ]"
-
-#. type: Plain text
-#: ipptoolfile.man:253
-msgid ""
-"Specifies an expected response status-code value. Additional requirements "
-"can be added as predicates - see the \"STATUS PREDICATES\" section for more "
-"information on predicates."
-msgstr ""
-"Indiquer la valeur attendue du code d’état de la réponse. Des exigences "
-"supplémentaires peuvent être ajoutées comme prédicats — consultez la section "
-"« PREDICATS STATUS » pour davantage d’information sur les prédicats."
-
-#. type: TP
-#: ipptoolfile.man:253
-#, no-wrap
-msgid "B<TEST-ID \">I<identifier>\""
-msgstr "B<TEST-ID \">I<identificateur>\""
-
-# type: Plain text
-#. type: Plain text
-#: ipptoolfile.man:256
-msgid "Specifies an identifier string for the current test."
-msgstr "Définir une chaîne d’identificateur pour le test actuel."
-
-#. type: Plain text
-#: ipptoolfile.man:259
-msgid ""
-"Specifies that this test will use \"Transfer-Encoding: chunked\" if it has "
-"an attached file or \"Content-Length:\" otherwise."
-msgstr ""
-"Indiquer que le test utilisera « Transfer-Encoding: chunked » si un fichier "
-"est joint ou  «Content-Length: » sinon."
+msgid "B<-X>"
+msgstr "B<-X>"
 
 #. type: Plain text
-#: ipptoolfile.man:262
+#: ipptool.1:154
 msgid ""
-"Specifies that this test will use the HTTP/1.1 \"Transfer-Encoding: chunked"
-"\" header."
+"Specifies that XML (Apple plist) output is desired instead of the plain text "
+"report.  This option is incompatible with the B<-i> (interval) and B<-n> "
+"(repeat-count) options."
 msgstr ""
-"Indiquer si le test utilisera les en-têtes HTTP 1.1 « Transfer-"
-"Encoding: chunked »."
+"Indiquer qu’une sortie XML (plist d’Apple) est demandée plutôt qu’en texte "
+"pur. Cette option est incompatible avec les options B<-i> (intervalle) et B<-"
+"n> (nombre_répétitions)."
 
 #. type: Plain text
-#: ipptoolfile.man:265
+#: ipptool.1:157
 msgid ""
-"Specifies that this test will use the HTTP/1.0 \"Content-Length:\" header."
+"Specifies that CSV (comma-separated values) output is desired instead of the "
+"plain text output."
 msgstr ""
-"Indiquer que ce test utilisera les en-têtes HTTP/1.0 « Content-Length: »."
-
-# type: Plain text
-#. type: Plain text
-#: ipptoolfile.man:276
-msgid "Specifies the IPP version number to use for this test."
-msgstr "Indiquer le numéro de version d’IPP à utiliser pour ce test."
+"Indiquer qu’une sortie CSV (valeurs séparées par des virgules) est demandée "
+"plutôt qu’en texte pur."
 
-#. type: SS
-#: ipptoolfile.man:276
+# type: TP
+#. type: TP
+#: ipptool.1:157
 #, no-wrap
-msgid "EXPECT PREDICATES"
-msgstr "PRÉDICATS EXPECT "
+msgid "B<-d>I<\\ name=value>"
+msgstr "B<-d>I<\\ nom=valeur>"
 
 # type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:278
-msgid ""
-"The following predicates are understood following the B<EXPECT> test "
-"directive:"
-msgstr ""
-"Les prédicats ci-dessous sont compris suivant la directive de test "
-"B<EXPECT> :"
+#: ipptool.1:160
+msgid "Defines the named variable."
+msgstr "Définir la variable nommée."
 
 # type: TP
 #. type: TP
-#: ipptoolfile.man:278
+#: ipptool.1:160
 #, no-wrap
-msgid "B<COUNT >I<number>"
-msgstr "B<COUNT >I<nombre>"
+msgid "B<-f>I<\\ filename>"
+msgstr "B<-f>I<\\ nom_fichier>"
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:281
-msgid ""
-"Requires the B<EXPECT> attribute to have the specified number of values."
-msgstr "Exiger que l’attribut d’B<EXPECT> ait le nombre indiqué de valeurs."
+#: ipptool.1:163
+msgid "Defines the default request filename for tests."
+msgstr "Indiquer le nom du fichier de requêtes par défaut pour les tests."
+
+#. type: Plain text
+#: ipptool.1:166
+msgid "Validate HTTP response headers."
+msgstr "Valider les en-têtes de réponse HTTP."
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:281 ipptoolfile.man:390
+#: ipptool.1:166
 #, no-wrap
-msgid "B<DEFINE-MATCH >I<variable-name>"
-msgstr "B<DEFINE-MATCH >I<nom_variable>"
+msgid "B<-i>I<\\ seconds>"
+msgstr "B<-i>I<\\ secondes>"
 
 #. type: Plain text
-#: ipptoolfile.man:284
+#: ipptool.1:172
 msgid ""
-"Defines the variable to \"1\" when the B<EXPECT> condition matches. A side-"
-"effect of this predicate is that this B<EXPECT> will never fail a test."
+"Specifies that the (last)  I<testfile> should be repeated at the specified "
+"interval.  This option is incompatible with the B<-X> (XML plist output) "
+"option."
 msgstr ""
-"Définir la variable à B<1> quand la condition d’B<EXPECT> correspond. Un "
-"effet de bord de ce prédicat est que B<EXPECT> n’échouera jamais à un test."
+"Indiquer que le (dernier) fichier I<fichier_test> sera repris après "
+"l’intervalle donné. Cette option est incompatible avec l’option B<-X> "
+"(sortie plist XML)."
+
+# type: Plain text
+#. type: Plain text
+#: ipptool.1:175
+msgid "Specifies that plain text output is desired."
+msgstr "Définir si une sortie en texte pur est désirée."
 
 #. type: TP
-#: ipptoolfile.man:284 ipptoolfile.man:393
+#: ipptool.1:175
 #, no-wrap
-msgid "B<DEFINE-NO-MATCH >I<variable-name>"
-msgstr "B<DEFINE-NO-MATCH >I<nom_variable>"
+msgid "B<-n>I<\\ repeat-count>"
+msgstr "B<-n> I<\\ nombre_répétitions>"
 
 #. type: Plain text
-#: ipptoolfile.man:287
+#: ipptool.1:181
 msgid ""
-"Defines the variable to \"1\" when the B<EXPECT> condition does not match. A "
-"side-effect of this predicate is that this B<EXPECT> will never fail a test."
+"Specifies that the (last)  I<testfile> should be repeated the specified "
+"number of times.  This option is incompatible with the I<-X> (XML plist "
+"output) option."
 msgstr ""
-"Définir la variable à B<1> quand la condition d’B<EXPECT> ne correspond pas. "
-"Un effet de bord de ce prédicat est que B<EXPECT> n’échouera jamais à un "
-"test."
+"Indiquer que le (dernier) fichier I<fichier_test> sera repris le nombre de "
+"fois donné. Cette option est incompatible avec l’option B<-X> (sortie plist "
+"XML)."
 
-#. type: TP
-#: ipptoolfile.man:287
-#, no-wrap
-msgid "B<DEFINE-VALUE >I<variable-name>"
-msgstr "B<DEFINE-VALUE >I<nom_variable>"
+#. type: Plain text
+#: ipptool.1:184
+msgid "Be quiet and produce no output."
+msgstr "Rester silencieux et ne produire aucune sortie"
 
 #. type: Plain text
-#: ipptoolfile.man:290
+#: ipptool.1:187
 msgid ""
-"Defines the variable to the value of the attribute when the B<EXPECT> "
-"condition matches. A side-effect of this predicate is that this B<EXPECT> "
-"will never fail a test."
+"Specifies that CUPS test report output is desired instead of the plain text "
+"output."
 msgstr ""
-"Définir la variable à la valeur de l’attribut quand la condition d’B<EXPECT> "
-"correspond. Un effet de bord de ce prédicat est que B<EXPECT> n’échouera "
-"jamais à un test."
-
-#. type: TP
-#: ipptoolfile.man:290 ipptoolfile.man:396
-#, no-wrap
-msgid "B<IF-DEFINED >I<variable-name>"
-msgstr "B<IF-DEFINED >I<nom_variable>"
+"Définir si le rapport de test de CUPS plutôt qu’une sortie en texte pur est "
+"désiré."
 
 #. type: Plain text
-#: ipptoolfile.man:293
+#: ipptool.1:191
 msgid ""
-"Makes the B<EXPECT> conditions apply only if the specified variable is "
-"defined."
+"Specifies that all request and response attributes should be output in CUPS "
+"test mode (B<-t>).  This is the default for XML output."
 msgstr ""
-"Appliquer les conditions d’B<EXPECT> seulement si la variable indiquée est "
-"définie."
-
-#. type: TP
-#: ipptoolfile.man:293 ipptoolfile.man:399
-#, no-wrap
-msgid "B<IF-NOT-DEFINED >I<variable-name>"
-msgstr "B<IF-NOT-DEFINED >I<nom_variable>"
+"Indiquer que tous les attributs de requête et réponse seront affichés lors "
+"du mode test (B<-t>) de CUPS. C’est la sortie XML par défaut."
 
 #. type: Plain text
-#: ipptoolfile.man:296
+#: ipptool.1:195
 msgid ""
-"Makes the B<EXPECT> conditions apply only if the specified variable is not "
-"defined."
+"The B<ipptool> program returns 0 if all tests were successful and 1 "
+"otherwise."
 msgstr ""
-"Appliquer les conditions d’B<EXPECT> seulement si la variable indiquée n’est "
-"pas définie."
+"Le programme B<ipptool> retourne B<0> si tous les tests réussissent, sinon "
+"B<1>."
 
-#. type: TP
-#: ipptoolfile.man:296
-#, no-wrap
-msgid "B<IN-GROUP >I<tag>"
-msgstr "B<IN-GROUP >I<étiquette>"
+# type: Plain text
+#. type: Plain text
+#: ipptool.1:197
+msgid "The following standard files are available:"
+msgstr "Les fichiers standard suivants sont disponibles :"
 
 #. type: Plain text
-#: ipptoolfile.man:299
-msgid "Requires the B<EXPECT> attribute to be in the specified group tag."
+#: ipptool.1:228
+#, no-wrap
+msgid ""
+"I<color.jpg>\n"
+"I<create-printer-subscription.test>\n"
+"I<document-a4.pdf>\n"
+"I<document-a4.ps>\n"
+"I<document-letter.pdf>\n"
+"I<document-letter.ps>\n"
+"I<get-completed-jobs.test>\n"
+"I<get-jobs.test>\n"
+"I<get-notifications.test>\n"
+"I<get-printer-attributes.test>\n"
+"I<get-subscriptions.test>\n"
+"I<gray.jpg>\n"
+"I<ipp-1.1.test>\n"
+"I<ipp-2.0.test>\n"
+"I<ipp-2.1.test>\n"
+"I<ipp-2.2.test>\n"
+"I<ipp-everywhere.test>\n"
+"I<onepage-a4.pdf>\n"
+"I<onepage-a4.ps>\n"
+"I<onepage-letter.pdf>\n"
+"I<onepage-letter.ps>\n"
+"I<print-job.test>\n"
+"I<print-job-deflate.test>\n"
+"I<print-job-gzip.test>\n"
+"I<testfile.jpg>\n"
+"I<testfile.pcl>\n"
+"I<testfile.pdf>\n"
+"I<testfile.ps>\n"
+"I<testfile.txt>\n"
+"I<validate-job.test>\n"
 msgstr ""
-"Exiger que l’attribut d’B<EXPECT> soit dans l’étiquette de groupe indiquée."
-
-#. type: TP
-#: ipptoolfile.man:299
-#, fuzzy, no-wrap
-msgid "B<OF-TYPE >I<tag[|tag,...]>"
-msgstr "B<OF-TYPE >I<étiquette[,étiquette,...]>"
+"I<color.jpg>\n"
+"I<create-printer-subscription.test>\n"
+"I<document-a4.pdf>\n"
+"I<document-a4.ps>\n"
+"I<document-letter.pdf>\n"
+"I<document-letter.ps>\n"
+"I<get-completed-jobs.test>\n"
+"I<get-jobs.test>\n"
+"I<get-notifications.test>\n"
+"I<get-printer-attributes.test>\n"
+"I<get-subscriptions.test>\n"
+"I<gray.jpg>\n"
+"I<ipp-1.1.test>\n"
+"I<ipp-2.0.test>\n"
+"I<ipp-2.1.test>\n"
+"I<ipp-2.2.test>\n"
+"I<ipp-everywhere.test>\n"
+"I<onepage-a4.pdf>\n"
+"I<onepage-a4.ps>\n"
+"I<onepage-letter.pdf>\n"
+"I<onepage-letter.ps>\n"
+"I<print-job.test>\n"
+"I<print-job-deflate.test>\n"
+"I<print-job-gzip.test>\n"
+"I<testfile.jpg>\n"
+"I<testfile.pcl>\n"
+"I<testfile.pdf>\n"
+"I<testfile.ps>\n"
+"I<testfile.txt>\n"
+"I<validate-job.test>\n"
 
 #. type: Plain text
-#: ipptoolfile.man:302
+#: ipptool.1:233
 msgid ""
-"Requires the B<EXPECT> attribute to use one of the specified value tag(s)."
+"The B<ipptool> program is unique to CUPS and conforms to the Internet "
+"Printing Protocol up to version 2.2."
 msgstr ""
-"Exiger que l’attribut d’B<EXPECT> utilise la valeur d’étiquette(s) indiquée."
+"Le programme B<ipptool> est particulier à CUPS et est conforme au protocole "
+"IPP jusqu’à la version 2.2."
 
-#. type: TP
-#: ipptoolfile.man:302 ipptoolfile.man:402
+#. type: Plain text
+#: ipptool.1:235
+msgid "Get a list of completed jobs for \"myprinter\":"
+msgstr "Obtenir une liste de travaux terminés pour « mon_imprimante » :"
+
+#. type: Plain text
+#: ipptool.1:238
 #, no-wrap
-msgid "B<REPEAT-LIMIT >I<number>"
-msgstr "B<REPEAT-LIMIT >I<nombre>"
+msgid "    ipptool ipp://localhost/printers/myprinter get-completed-jobs.test\n"
+msgstr "    ipptool ipp://localhost/printers/mon_imprimante get-completed-jobs.test\n"
 
-# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:306
+#: ipptool.1:241
 msgid ""
-"Specifies the maximum number of times to repeat if the B<REPEAT-MATCH> or "
-"B<REPEAT-NO-MATCH> predicate is specified. The default value is 1000."
+"Send email notifications to \"user@example.com\" when \"myprinter\" changes:"
 msgstr ""
-"Définir le nombre maximal de répétitions si le prédicat B<REPEAT-MATCH> ou "
-"B<REPEAT-NO-MATCH> est indiqué. La valeur par défaut est B<1000>."
-
-#. type: TP
-#: ipptoolfile.man:306 ipptoolfile.man:406
-#, no-wrap
-msgid "B<REPEAT-MATCH>"
-msgstr "B<REPEAT-MATCH>"
-
-#. type: TP
-#: ipptoolfile.man:308 ipptoolfile.man:408
-#, no-wrap
-msgid "B<REPEAT-NO-MATCH>"
-msgstr "B<REPEAT-NO-MATCH>"
+"Envoyer des notifications par courriel à « user@example.com » quand "
+"« mon_imprimante » change :"
 
-# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:311
+#: ipptool.1:245
+#, no-wrap
 msgid ""
-"Specifies that the current test should be repeated when the B<EXPECT> "
-"condition matches or does not match."
+"    ipptool -d recipient=mailto:user@example.com \\e\n"
+"        ipp://localhost/printers/myprinter create-printer-subscription.test\n"
 msgstr ""
-"Indiquer que l’actuel test doit être recommencé si la condition B<EXPECT> "
-"correspond ou pas."
-
-#. type: TP
-#: ipptoolfile.man:311
-#, no-wrap
-msgid "B<SAME-COUNT-AS >I<attribute-name>"
-msgstr "B<SAME-COUNT-AS >I<nom_attribut>"
+"    ipptool -d recipient=mailto:user@example.com \\e\n"
+"        ipp://localhost/printers/mon_imprimante create-printer-subscription.test\n"
 
 #. type: Plain text
-#: ipptoolfile.man:314
+#: ipptool.1:251
 msgid ""
-"Requires the B<EXPECT> attribute to have the same number of values as the "
-"specified parallel attribute."
+"B<ipptoolfile>(5), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
+"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
+"ipp)  RFC 8011 (http://tools.ietf.org/html/rfc8011),"
 msgstr ""
-"Exiger que l’attribut d’B<EXPECT> ait le même nombre de valeurs que "
-"l’attribut similaire indiqué."
+"B<ipptoolfile>(5), IANA IPP Registry (E<lt>URL:I<http://www.iana.org/"
+"assignments/ipp-registrations1>E<gt>), PWG Internet Printing Protocol "
+"Workgroup (E<lt>URL:I<http://www.pwg.org/ipp1>E<gt>), RFC 8011 (E<lt>URL:"
+"I<http://tools.ietf.org/html/rfc80111>E<gt>)"
 
-#. type: TP
-#: ipptoolfile.man:314
+#. type: TH
+#: ipptoolfile.5:9
 #, no-wrap
-msgid "B<WITH-ALL-HOSTNAMES \">I<literal string>B<\">"
-msgstr "B<WITH-ALL-HOSTNAMES \">I<chaîne_littérale>B<\">"
+msgid "ipptoolfile"
+msgstr "ipptoolfile"
 
-#. type: TP
-#: ipptoolfile.man:316
+#. type: TH
+#: ipptoolfile.5:9
 #, no-wrap
-msgid "B<WITH-ALL-HOSTNAMES \"/>I<regular expression>B</\">"
-msgstr "B<WITH-ALL-HOSTNAMES \"/>I<exp_rationnelle>B</\">"
+#| msgid "5 August 2019"
+msgid "15 August 2019"
+msgstr "15 août 2019"
 
 #. type: Plain text
-#: ipptoolfile.man:319
-msgid "Requires that all URI values contain a matching hostname."
+#: ipptoolfile.5:12
+msgid "ipptoolfile - ipptool file format"
+msgstr "ipptoolfile - Format de fichier ipptool"
+
+#. type: Plain text
+#: ipptoolfile.5:18
+msgid ""
+"The B<ipptool>(1)  program accepts free-form plain text files that describe "
+"one or more IPP requests.  Comments start with the \"#\" character and "
+"continue to the end of the line.  Each request is enclosed by curly braces, "
+"for example:"
 msgstr ""
-"Exiger que toutes les valeurs d’URI contiennent un nom d’hôte correspondant."
+"Le programme B<ipptool>(1) accepte les fichiers, sans format particulier en "
+"texte pur, qui décrivent une ou plusieurs requêtes IPP. Les commentaires "
+"commencent par le caractère « # » et se terminent à la fin de la ligne. "
+"Chaque requête est entourée par des accolades, par exemple : "
 
-#. type: TP
-#: ipptoolfile.man:319
+#. type: Plain text
+#: ipptoolfile.5:24
 #, no-wrap
-msgid "B<WITH-ALL-RESOURCES \">I<literal string>B<\">"
-msgstr "B<WITH-ALL-RESOURCES \">I<chaîne_littérale>B<\">"
+msgid ""
+"    # This is a comment\n"
+"    {\n"
+"      # The name of the test\n"
+"      NAME \"Print PDF File\"\n"
+msgstr ""
+"    # Ceci est un commentaire\n"
+"    {\n"
+"      # Le nom du test\n"
+"      NAME « Fichier d’impression PDF »\n"
 
-#. type: TP
-#: ipptoolfile.man:321
+#. type: Plain text
+#: ipptoolfile.5:27
 #, no-wrap
-msgid "B<WITH-ALL-RESOURCES \"/>I<regular expression>B</\">"
-msgstr "B<WITH-ALL-RESOURCES \"/>I<exp_rationnelle>B</\">"
+msgid ""
+"      # The request to send\n"
+"      OPERATION Print-Job\n"
+msgstr ""
+"      # La requête à envoyer\n"
+"      OPERATION Print-Job\n"
 
 #. type: Plain text
-#: ipptoolfile.man:324
+#: ipptoolfile.5:34
+#, no-wrap
 msgid ""
-"Requires that all URI values contain a matching resource (including "
-"leading /)."
+"      GROUP operation-attributes-tag\n"
+"      ATTR charset attributes-charset utf-8\n"
+"      ATTR language attributes-natural-language en\n"
+"      ATTR uri printer-uri $uri\n"
+"      ATTR name requesting-user-name $user\n"
+"      ATTR mimeMediaType document-format application/pdf\n"
 msgstr ""
-"Exiger que toutes les valeurs d’URI contiennent une ressource correspondante "
-"y compris le « / » de début)"
+"      GROUP operation-attributes-tag\n"
+"      ATTR charset attributes-charset utf-8\n"
+"      ATTR language attributes-natural-language en\n"
+"      ATTR uri printer-uri $uri\n"
+"      ATTR name requesting-user-name $user\n"
+"      ATTR mimeMediaType document-format application/pdf\n"
 
-#. type: TP
-#: ipptoolfile.man:324
+#. type: Plain text
+#: ipptoolfile.5:49
 #, no-wrap
-msgid "B<WITH-ALL-SCHEMES \">I<literal string>B<\">"
-msgstr "B<WITH-ALL-SCHEMES \">I<chaîne_littérale>B<\">"
+msgid ""
+"      GROUP job-attributes-tag\n"
+"      ATTR collection media-col {\n"
+"        # US Letter plain paper from the \"main\" tray\n"
+"        MEMBER collection media-size {\n"
+"          MEMBER integer x-dimension 21590\n"
+"          MEMBER integer y-dimension 27940\n"
+"        }\n"
+"        MEMBER integer media-top-margin 423\n"
+"        MEMBER integer media-bottom-margin 423\n"
+"        MEMBER integer media-left-margin 423\n"
+"        MEMBER integer media-right-margin 423\n"
+"        MEMBER keyword media-source \"main\"\n"
+"        MEMBER keyword media-type \"stationery\"\n"
+"      }\n"
+msgstr ""
+"      GROUP job-attributes-tag\n"
+"      ATTR collection media-col {\n"
+"        # papier ordinaire US Letter à partir du bac « principal »\n"
+"        MEMBER collection media-size {\n"
+"          MEMBER integer x-dimension 21590\n"
+"          MEMBER integer y-dimension 27940\n"
+"        }\n"
+"        MEMBER integer media-top-margin 423\n"
+"        MEMBER integer media-bottom-margin 423\n"
+"        MEMBER integer media-left-margin 423\n"
+"        MEMBER integer media-right-margin 423\n"
+"        MEMBER keyword media-source \"main\"\n"
+"        MEMBER keyword media-type \"stationery\"\n"
+"      }\n"
 
-#. type: TP
-#: ipptoolfile.man:326
+#. type: Plain text
+#: ipptoolfile.5:51
 #, no-wrap
-msgid "B<WITH-ALL-SCHEMES \"/>I<regular expression>B</\">"
-msgstr "B<WITH-ALL-SCHEMES \"/>I<exp_rationnelle>B</\">"
+msgid "      FILE testfile.pdf\n"
+msgstr "      FILE testfile.pdf\n"
 
 #. type: Plain text
-#: ipptoolfile.man:329
-msgid "Requires that all URI values contain a matching scheme."
+#: ipptoolfile.5:60
+#, no-wrap
+msgid ""
+"      # The response to expect\n"
+"      STATUS successful-ok\n"
+"      EXPECT job-id OF-TYPE integer WITH-VALUE E<gt>0\n"
+"      EXPECT job-uri OF-TYPE uri\n"
+"    }\n"
+"    {\n"
+"      # The name of the test\n"
+"      NAME \"Wait for Job to Complete\"\n"
 msgstr ""
-"Exiger que toutes les valeurs d’URI contiennent un schéma correspondant."
+"      # La réponse à attendre\n"
+"      STATUS successful-ok\n"
+"      EXPECT job-id OF-TYPE integer WITH-VALUE E<gt>0\n"
+"      EXPECT job-uri OF-TYPE uri\n"
+"    }\n"
+"    {\n"
+"      # Le nom du test\n"
+"      NAME \"Attente de l’achèvement du travail\"\n"
 
-#. type: TP
-#: ipptoolfile.man:329
+#. type: Plain text
+#: ipptoolfile.5:63
 #, no-wrap
-msgid "B<WITH-ALL-VALUES \">I<literal string>B<\">"
-msgstr "B<WITH-ALL-VALUES \">I<chaîne_littérale>B<\">"
+msgid ""
+"      # The request to send\n"
+"      OPERATION Get-Job-Attributes\n"
+msgstr ""
+"      # La requête à envoyer\n"
+"      OPERATION Get-Job-Attributes\n"
 
 #. type: Plain text
-#: ipptoolfile.man:332
+#: ipptoolfile.5:70
+#, no-wrap
 msgid ""
-"Requires that all values of the B<EXPECT> attribute match the literal "
-"string. Comparisons are case-sensitive."
+"      GROUP operation-attributes-tag\n"
+"      ATTR charset attributes-charset utf-8\n"
+"      ATTR language attributes-natural-language en\n"
+"      ATTR uri printer-uri $uri\n"
+"      ATTR integer job-id $job-id\n"
+"      ATTR name requesting-user-name $user\n"
 msgstr ""
-"Exiger que toutes les valeurs de l’attribut d’B<EXPECT> correspondent à la "
-"chaîne littérale. Les comparaisons sont sensibles à la casse."
+"      GROUP operation-attributes-tag\n"
+"      ATTR charset attributes-charset utf-8\n"
+"      ATTR language attributes-natural-language en\n"
+"      ATTR uri printer-uri $uri\n"
+"      ATTR integer job-id $job-id\n"
+"      ATTR name requesting-user-name $user\n"
 
-#. type: TP
-#: ipptoolfile.man:332
+#. type: Plain text
+#: ipptoolfile.5:77
 #, no-wrap
-msgid "B<WITH-ALL-VALUES E<lt>>I<number>"
-msgstr "B<WITH-ALL-VALUES E<lt>>I<nombre>"
+msgid ""
+"      # The response to expect\n"
+"      STATUS successful-ok\n"
+"      EXPECT job-id OF-TYPE integer WITH-VALUE $job-id\n"
+"      EXPECT job-uri OF-TYPE uri\n"
+"      EXPECT job-state OF-TYPE enum WITH-VALUE E<gt>5 REPEAT-NO-MATCH\n"
+"      EXPECT job-originating-user-name OF-TYPE name WITH-VALUE \"$user\"\n"
+msgstr ""
+"      # La réponse à attendre\n"
+"      STATUS successful-ok\n"
+"      EXPECT job-id OF-TYPE integer WITH-VALUE $job-id\n"
+"      EXPECT job-uri OF-TYPE uri\n"
+"      EXPECT job-state OF-TYPE enum WITH-VALUE 3,4,5,6,7,8,9\n"
+"      EXPECT job-originating-user-name OF-TYPE name WITH-VALUE \"$user\"\n"
 
-#. type: TP
-#: ipptoolfile.man:334
+#. type: Plain text
+#: ipptoolfile.5:82
 #, no-wrap
-msgid "B<WITH-ALL-VALUES =>I<number>"
-msgstr "B<WITH-ALL-VALUES =>I<nombre>"
+msgid ""
+"      # Show the job state until completed...\n"
+"      DISPLAY job-state\n"
+"      DISPLAY job-state-reasons\n"
+"    }\n"
+msgstr ""
+"      # Afficher l’état du travail en attendant son achèvement...\n"
+"      DISPLAY job-state\n"
+"      DISPLAY job-state-reasons\n"
+"    }\n"
+
+#. type: Plain text
+#: ipptoolfile.5:85
+msgid "The following directives can be used outside of a I<test>:"
+msgstr ""
+"Les directives suivantes peuvent être utilisées en dehors d’un I<test> :"
 
 #. type: TP
-#: ipptoolfile.man:336
+#: ipptoolfile.5:85
 #, no-wrap
-msgid "B<WITH-ALL-VALUES E<gt>>I<number>"
-msgstr "B<WITH-ALL-VALUES E<gt>>I<nombre>"
+msgid "B<{ >I<test >B<}>"
+msgstr "B<{ >I<test >B<}>"
+
+# type: Plain text
+#. type: Plain text
+#: ipptoolfile.5:88
+msgid "Defines a test."
+msgstr "Définir un test."
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:338
+#: ipptoolfile.5:88
 #, no-wrap
-msgid "B<WITH-ALL-VALUES >I<number>[I<,...,number>]"
-msgstr "B<WITH-ALL-VALUES >I<nombre>[I<,...,nombre>]"
+msgid "B<DEFINE >I<variable-name value>"
+msgstr "B<DEFINE >I<nom_variable valeur>"
 
 #. type: Plain text
-#: ipptoolfile.man:341
+#: ipptoolfile.5:93
 msgid ""
-"Requires that all values of the B<EXPECT> attribute match the number(s) or "
-"numeric comparison. When comparing rangeOfInteger values, the \"E<lt>\" and "
-"\"E<gt>\" operators only check the upper bound of the range."
+"Defines the named variable to the given value. This is equivalent to "
+"specifying I<-d variable-name=value> on the B<ipptool>(8)  command-line."
 msgstr ""
-"Exiger que toutes les valeurs de l’attribut d’B<EXPECT> correspondent au(x) "
-"nombre(s) ou à la comparaison numérique. Lors de la comparaison des valeurs "
-"d’intervalle de nombres entiers, les opérateurs « E<lt> » et « E<gt> » "
-"contrôlent seulement la limite supérieure de l’intervalle."
+"Définir la variable dénommée à la valeur donnée. Cela est équivalent à "
+"indiquer « B<-d> I<nom_variable>=I<valeur> » sur la ligne de commande de "
+"B<ipptool(8)>."
 
 #. type: TP
-#: ipptoolfile.man:341
+#: ipptoolfile.5:93
 #, no-wrap
-msgid "B<WITH-ALL-VALUES \"false\">"
-msgstr "B<WITH-ALL-VALUES \"false\">"
-
-#. type: TP
-#: ipptoolfile.man:343
-#, no-wrap
-msgid "B<WITH-ALL-VALUES \"true\">"
-msgstr "B<WITH-ALL-VALUES \"true\">"
+msgid "B<DEFINE-DEFAULT >I<variable-name value>"
+msgstr "B<DEFINE-DEFAULT >I<nom_variable valeur>"
 
 #. type: Plain text
-#: ipptoolfile.man:346
+#: ipptoolfile.5:96
 msgid ""
-"Requires that all values of the B<EXPECT> attribute match the boolean value "
-"given."
+"Defines the named variable to the given value if it does not already have a "
+"value."
 msgstr ""
-"Exiger que toutes les valeurs de l’attribut d’B<EXPECT> correspondent à la "
-"valeur booléenne donnée"
+"Définir la variable nommée à la valeur donnée si elle n’a pas déjà une "
+"valeur."
 
 #. type: TP
-#: ipptoolfile.man:346
+#: ipptoolfile.5:96
 #, no-wrap
-msgid "B<WITH-ALL-VALUES \"/>I<regular expression>B</\">"
-msgstr "B<WITH-ALL-VALUES \"/>I<expr_rationnelle>B</\">"
+msgid "B<FILE-ID \">I<identifier>B<\">"
+msgstr "B<FILE-ID \">I<identificateur>B<\">"
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:349
-msgid ""
-"Requires that all values of the B<EXPECT> attribute match the regular "
-"expression, which must conform to the POSIX regular expression syntax. "
-"Comparisons are case-sensitive."
-msgstr ""
-"Exiger que les valeurs de l’attribut d’B<EXPECT> correspondent à "
-"l’expression rationnelle, qui doit être conforme à la syntaxe POSIX des "
-"expressions rationnelles. Les comparaisons sont sensibles à la casse."
+#: ipptoolfile.5:99
+msgid "Specifies an identifier string for the current file."
+msgstr "Définir la chaîne d’identificateur pour le fichier actuel."
 
 #. type: TP
-#: ipptoolfile.man:349
+#: ipptoolfile.5:99 ipptoolfile.5:209
 #, no-wrap
-msgid "B<WITH-HOSTNAME \">I<literal string>B<\">"
-msgstr "B<WITH-HOSTNAME \">I<chaîne_littérale>B<\">"
+msgid "B<IGNORE-ERRORS yes>"
+msgstr "B<IGNORE-ERRORS >I<yes>"
 
 #. type: TP
-#: ipptoolfile.man:351
+#: ipptoolfile.5:101 ipptoolfile.5:211
 #, no-wrap
-msgid "B<WITH-HOSTNAME \"/>I<regular expression>B</\">"
-msgstr "B<WITH-HOSTNAME \"/>I<exp_rationnelle>B</\">"
+msgid "B<IGNORE-ERRORS no>"
+msgstr "B<IGNORE-ERRORS >I<no>"
 
 #. type: Plain text
-#: ipptoolfile.man:354
-msgid "Requires that at least one URI value contains a matching hostname."
+#: ipptoolfile.5:106
+msgid ""
+"Specifies whether, by default, B<ipptool>(8)  will ignore errors and "
+"continue with subsequent tests."
 msgstr ""
-"Exiger qu’au moins une valeur d’URI contienne un nom d’hôte concordant."
+"Indiquer si, par défaut, B<ipptool>(8) ignorera les erreurs et poursuivra "
+"avec les tests suivants."
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:354
+#: ipptoolfile.5:106
 #, no-wrap
-msgid "B<WITH-RESOURCE \">I<literal string>B<\">"
-msgstr "B<WITH-RESOURCE \">I<chaîne_littérale>B<\">"
+msgid "B<INCLUDE \">I<filename>B<\">"
+msgstr "B<INCLUDE \">I<nom_fichier>B<\">"
 
 #. type: TP
-#: ipptoolfile.man:356
+#: ipptoolfile.5:108
 #, no-wrap
-msgid "B<WITH-RESOURCE \"/>I<regular expression>B</\">"
-msgstr "B<WITH-RESOURCE \"/>I<exp_rationnelle>B</\">"
+msgid "B<INCLUDE E<lt>>I<filename>B<E<gt>>"
+msgstr "B<INCLUDE E<lt>>I<nom_fichier>B<E<gt>>"
 
 #. type: Plain text
-#: ipptoolfile.man:359
+#: ipptoolfile.5:113
 msgid ""
-"Requires that at least one URI value contains a matching resource (including "
-"leading /)."
+"Includes another test file. The first form includes a file relative to the "
+"current test file, while the second form includes a file from the "
+"B<ipptool>(8)  include directory."
 msgstr ""
-"Exiger qu’au moins une valeur d’URI contienne une ressource correspondante."
-"(y compris le « / » de début)."
-
-#. type: TP
-#: ipptoolfile.man:359
-#, no-wrap
-msgid "B<WITH-SCHEME \">I<literal string>B<\">"
-msgstr "B<WITH-SCHEME \">I<chaîne_littérale>B<\">"
+"Inclure un autre fichier de test. La première façon inclut un fichier "
+"relatif au fichier de test actuel, tandis que la seconde inclut un fichier "
+"du répertoire inclus de B<ipptool>(8)."
 
 #. type: TP
-#: ipptoolfile.man:361
+#: ipptoolfile.5:113
 #, no-wrap
-msgid "B<WITH-SCHEME \"/>I<regular expression>B</\">"
-msgstr "B<WITH-SCHEME \"/>I<exp_rationnelle>B</\">"
-
-#. type: Plain text
-#: ipptoolfile.man:364
-msgid "Requires that at least one URI value contains a matching scheme."
-msgstr "Exiger qu’au moins une valeur d’URI contienne un schéma concordant."
+msgid "B<INCLUDE-IF-DEFINED >I<name >B<\">I<filename>B<\">"
+msgstr "B<INCLUDE-IF-DEFINED >I<nom >B<\">I<nom_fichier>B<\">"
 
 #. type: TP
-#: ipptoolfile.man:364
+#: ipptoolfile.5:115
 #, no-wrap
-msgid "B<WITH-VALUE \">I<literal string>B<\">"
-msgstr "B<WITH-VALUE \">I<chaîne_littérale>B<\">"
+msgid "B<INCLUDE-IF-DEFINED >I<name >B<E<lt>>I<filename>B<E<gt>>"
+msgstr "B<INCLUDE-IF-DEFINED >I<nom >B<E<lt>>I<nom_fichier>B<E<gt>>"
 
 #. type: Plain text
-#: ipptoolfile.man:367
+#: ipptoolfile.5:120
 msgid ""
-"Requires that at least one value of the B<EXPECT> attribute matches the "
-"literal string. Comparisons are case-sensitive."
+"Includes another test file if the named variable is defined. The first form "
+"includes a file relative to the current test file, while the second form "
+"includes a file from the B<ipptool>(8)  include directory."
 msgstr ""
-"Exiger qu’au moins une valeur de l’attribut d’B<EXPECT> corresponde à la "
-"chaîne littérale. Les comparaisons sont sensibles à la casse."
+"Inclure un autre fichier de test si la variable nommée est définie. La "
+"première façon inclut un fichier relatif à l’actuel fichier de test, tandis "
+"que la seconde inclut un fichier du répertoire inclus de B<ipptool>(8)."
 
 #. type: TP
-#: ipptoolfile.man:367
+#: ipptoolfile.5:120
 #, no-wrap
-msgid "B<WITH-VALUE E<lt>>I<number>"
-msgstr "B<WITH-VALUE E<lt>>I<nombre>"
+msgid "B<INCLUDE-IF-NOT-DEFINED >I<name >B<\">I<filename>B<\">"
+msgstr "B<INCLUDE-IF-NOT-DEFINED >I<nom >B<\">I<nom_fichier>B<\">"
 
 #. type: TP
-#: ipptoolfile.man:369
+#: ipptoolfile.5:122
 #, no-wrap
-msgid "B<WITH-VALUE =>I<number>"
-msgstr "B<WITH-VALUE =>I<nombre>"
+msgid "B<INCLUDE-IF-NOT-DEFINED >I<name >B<E<lt>>I<filename>B<E<gt>>"
+msgstr "B<INCLUDE-IF-NOT-DEFINED >I<nom >B<E<lt>>I<nom_fichier>B<E<gt>>"
+
+#. type: Plain text
+#: ipptoolfile.5:127
+msgid ""
+"Includes another test file if the named variable is not defined. The first "
+"form includes a file relative to the current test file, while the second "
+"form includes a file from the B<ipptool>(8)  include directory."
+msgstr ""
+"Inclure un autre fichier de test si la variable nommée n’est pas définie. La "
+"première façon inclut un fichier relatif à l’actuel fichier de test, tandis "
+"que la seconde inclut un fichier du répertoire inclus de B<ipptool>(8)."
 
 #. type: TP
-#: ipptoolfile.man:371
+#: ipptoolfile.5:127 ipptoolfile.5:235
 #, no-wrap
-msgid "B<WITH-VALUE E<gt>>I<number>"
-msgstr "B<WITH-VALUE E<gt>>I<nombre>"
+msgid "B<SKIP-IF-DEFINED >I<variable-name>"
+msgstr "B<SKIP-IF-DEFINED >I<nom_variable>"
 
 #. type: TP
-#: ipptoolfile.man:373
+#: ipptoolfile.5:129 ipptoolfile.5:237
 #, no-wrap
-msgid "B<WITH-VALUE >I<number>[I<,...,number>]"
-msgstr "B<WITH-VALUE >I<nombre>[I<,...,nombre>]"
+msgid "B<SKIP-IF-NOT-DEFINED >I<variable-name>"
+msgstr "B<SKIP-IF-NOT-DEFINED >I<nom_variable>"
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:376
+#: ipptoolfile.5:132
 msgid ""
-"Requires that at least one value of the B<EXPECT> attribute matches the "
-"number(s) or numeric comparison. When comparing rangeOfInteger values, the "
-"\"E<lt>\" and \"E<gt>\" operators only check the upper bound of the range."
+"Specifies that the remainder of the test file should be skipped when the "
+"variable is or is not defined."
 msgstr ""
-"Exiger qu’au moins une valeur de l’attribut d’B<EXPECT> corresponde au(x) "
-"nombre(s) ou à la comparaison numérique. Lors de la comparaison des valeurs "
-"d’intervalle de nombres entiers, les opérateurs « E<lt> » et « E<gt> » "
-"contrôlent seulement la limite supérieure de l’intervalle."
+"Indiquer que le reste du fichier de test devra être ignoré si la variable "
+"est ou n’est pas définie."
 
 #. type: TP
-#: ipptoolfile.man:376
+#: ipptoolfile.5:132
 #, no-wrap
-msgid "B<WITH-VALUE \"false\">"
-msgstr "B<WITH-VALUE \"false\">"
+msgid "B<STOP-AFTER-INCLUDE-ERROR no>"
+msgstr "B<STOP-AFTER-INCLUDE-ERROR >I<no>"
 
 #. type: TP
-#: ipptoolfile.man:378
+#: ipptoolfile.5:134
 #, no-wrap
-msgid "B<WITH-VALUE \"true\">"
-msgstr "B<WITH-VALUE \"true\">"
+msgid "B<STOP-AFTER-INCLUDE-ERROR yes>"
+msgstr "B<STOP-AFTER-INCLUDE-ERROR >I<yes>"
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:381
+#: ipptoolfile.5:137
 msgid ""
-"Requires that at least one value of the B<EXPECT> attribute matches the "
-"boolean value given."
+"Specifies whether tests will be stopped after an error in an included file."
 msgstr ""
-"Exiger qu’au moins une valeur de l’attribut d’B<EXPECT> corresponde à la "
-"valeur booléenne donnée"
+"Indiquer si les tests seront arrêtés après une erreur dans un fichier inclus "
 
 #. type: TP
-#: ipptoolfile.man:381
+#: ipptoolfile.5:137 ipptoolfile.5:253
 #, no-wrap
-msgid "B<WITH-VALUE \"/>I<regular expression>B</\">"
-msgstr "B<WITH-VALUE \"/>I<exp_rationnelle>B</\">"
+msgid "B<TRANSFER auto>"
+msgstr "B<TRANSFER >I<auto>"
 
 #. type: Plain text
-#: ipptoolfile.man:384
+#: ipptoolfile.5:140
 msgid ""
-"Requires that at least one value of the B<EXPECT> attribute matches the "
-"regular expression, which must conform to the POSIX regular expression "
-"syntax. Comparisons are case-sensitive."
+"Specifies that tests will, by default, use \"Transfer-Encoding: chunked\" "
+"for requests with attached files and \"Content-Length:\" for requests "
+"without attached files."
 msgstr ""
-"Exiger qu’au moins une valeur de l’attribut d’B<EXPECT> corresponde à "
-"l’expression rationnelle, qui doit être conforme à la syntaxe POSIX des "
-"expressions rationnelles. Les comparaisons sont sensibles à la casse."
+"Indiquer que ces tests utiliseront, par défaut, « Transfer-"
+"Encoding: chunked » lors de requêtes avec fichiers joints et « Content-"
+"Length: » pour celles sans fichier joint."
 
 #. type: TP
-#: ipptoolfile.man:384
+#: ipptoolfile.5:140 ipptoolfile.5:256
 #, no-wrap
-msgid "B<WITH-VALUE-FROM >I<attribute-name>"
-msgstr "B<WITH-VALUE-FROM >I<nom_attribut>"
+msgid "B<TRANSFER chunked>"
+msgstr "B<TRANSFER >I<chunked>"
 
 #. type: Plain text
-#: ipptoolfile.man:388
+#: ipptoolfile.5:145
 msgid ""
-"Requires that the value(s) of the B<EXPECT> attribute matches the value(s) "
-"in the specified attribute.  For example, \"EXPECT job-sheets WITH-VALUE-"
-"FROM job-sheets-supported\" requires that the \"job-sheets\" value is listed "
-"as a value of the \"job-sheets-supported\" attribute."
+"Specifies that tests will, by default, use the HTTP/1.1 \"Transfer-Encoding: "
+"chunked\" header. This is the default and is equivalent to specifying I<-c> "
+"on the B<ipptool>(8)  command-line. Support for chunked requests is required "
+"for conformance with all versions of IPP."
 msgstr ""
-"Exiger que la(es) valeur(s) de l’attribut B<EXPECT> corresponde(nt) à(ux) "
-"valeur(s) dans l’attribut indiqué.  Par exemple, « EXPECT job-sheets WITH-"
-"VALUE-FROM job-sheets-supported » exige que la valeur « job-sheets » soit "
-"listée comme valeur de l’attribut « job-sheets-supported »."
+"Indiquer que ces tests utiliseront, par défaut, l’en-tête de HTTP/1.1 "
+"« Transfer-Encoding: chunked ». C’est le comportement par défaut et "
+"équivalent à indiquer B<-c> sur la ligne de commande de B<ipptool>(8). La "
+"prise en charge pour les requêtes partielles est exigée pour conformité avec "
+"toutes les versions d’IPP."
 
-#. type: SS
-#: ipptoolfile.man:388
+#. type: TP
+#: ipptoolfile.5:145 ipptoolfile.5:259
 #, no-wrap
-msgid "STATUS PREDICATES"
-msgstr "PRÉDICATS STATUS "
+msgid "B<TRANSFER length>"
+msgstr "B<TRANSFER >I<taille>"
 
-# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:390
+#: ipptoolfile.5:150
 msgid ""
-"The following predicates are understood following the B<STATUS> test "
-"directive:"
+"Specifies that tests will, by default, use the HTTP/1.0 \"Content-Length:\" "
+"header. This is equivalent to specifying I<-l> on the B<ipptool>(8)  command-"
+"line. Support for content length requests is required for conformance with "
+"all versions of IPP."
 msgstr ""
-"Les prédicats ci-dessous sont compris suivant la directive de test "
-"B<STATUS> :"
+"Indiquer que ces tests utiliseront, par défaut, l’en-tête de HTTP/1.0 "
+"« Content-Length: ». C’est équivalent à indiquer « B<-l> » sur la ligne de "
+"commande de B<ipptool>(8). La prise en charge pour les requêtes sur la "
+"taille de contenu est exigée pour conformité avec toutes les versions d’IPP."
 
-#. type: Plain text
-#: ipptoolfile.man:393
-msgid ""
-"Defines the variable to \"1\" when the B<STATUS> matches. A side-effect of "
-"this predicate is that this B<STATUS> will never fail a test."
-msgstr ""
-"Définir la variable à B<1> quand le B<STATUS> correspond. Un effet de bord "
-"de ce prédicat est que ce B<STATUS> n’échouera jamais à un test."
+#. type: TP
+#: ipptoolfile.5:150 ipptoolfile.5:262
+#, no-wrap
+msgid "B<VERSION 1.0>"
+msgstr "B<VERSION 1.0>"
 
-#. type: Plain text
-#: ipptoolfile.man:396
-msgid ""
-"Defines the variable to \"1\" when the B<STATUS> does not match. A side-"
-"effect of this predicate is that this B<STATUS> will never fail a test."
-msgstr ""
-"Définir la variable à B<1> quand le B<STATUS> ne correspond pas. Un effet de "
-"bord de ce prédicat est que ce B<STATUS> n’échouera jamais à un test."
+#. type: TP
+#: ipptoolfile.5:152 ipptoolfile.5:264
+#, no-wrap
+msgid "B<VERSION 1.1>"
+msgstr "B<VERSION 1.1>"
 
-#. type: Plain text
-#: ipptoolfile.man:399
-msgid "Makes the B<STATUS> apply only if the specified variable is defined."
-msgstr "Appliquer le B<STATUS> seulement si la variable indiquée est définie."
+#. type: TP
+#: ipptoolfile.5:154 ipptoolfile.5:266
+#, no-wrap
+msgid "B<VERSION 2.0>"
+msgstr "B<VERSION 2.0>"
 
-#. type: Plain text
-#: ipptoolfile.man:402
-msgid ""
-"Makes the B<STATUS> apply only if the specified variable is not defined."
-msgstr ""
-"Appliquer le B<STATUS> seulement si la variable indiquée n’est pas définie."
+#. type: TP
+#: ipptoolfile.5:156 ipptoolfile.5:268
+#, no-wrap
+msgid "B<VERSION 2.1>"
+msgstr "B<VERSION 2.1>"
+
+#. type: TP
+#: ipptoolfile.5:158 ipptoolfile.5:270
+#, no-wrap
+msgid "B<VERSION 2.2>"
+msgstr "B<VERSION 2.2>"
 
 # type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:406
+#: ipptoolfile.5:161
 msgid ""
-"Specifies the maximum number of times to repeat. The default value is 1000."
+"Specifies the default IPP version number to use for the tests that follow."
 msgstr ""
-"Définir le nombre maximal de répétitions. La valeur par défaut est B<1000>."
+"Indiquer le numéro de version d’IPP à utiliser par défaut pour les tests ci-"
+"dessous."
+
+# type: SH
+#. type: SS
+#: ipptoolfile.5:161
+#, no-wrap
+msgid "TEST DIRECTIVES"
+msgstr "DIRECTIVES DE TEST"
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:411
+#: ipptoolfile.5:163
+msgid "The following directives are understood within a I<test>:"
+msgstr "Les directives suivantes sont comprises dans un I<test> : "
+
+# type: TP
+#. type: TP
+#: ipptoolfile.5:163
+#, no-wrap
+msgid "B<ATTR >I<out-of-band-tag attribute-name>"
+msgstr "B<ATTR >I<étiquette_hors-bande nom_attribut>"
+
+# type: TP
+#. type: TP
+#: ipptoolfile.5:165
+#, no-wrap
+msgid "B<ATTR >I<tag attribute-name value(s)>"
+msgstr "B<ATTR >I<étiquette nom_attribut valeur(s)>"
+
+#. type: Plain text
+#: ipptoolfile.5:171
+#, fuzzy
+#| msgid ""
+#| "Adds an attribute to the test request.  Out-of-band tags (admin-define, "
+#| "delete-attribute, no-value, not-settable, unknown, unsupported) have no "
+#| "value.  Values for other tags are separated by the comma (\",\") "
+#| "character - escape commas using the \" Common attributes and values are "
+#| "listed in the IANA IPP registry - see references below."
 msgid ""
-"Specifies that the current test should be repeated when the response status-"
-"code matches or does not match the value specified by the STATUS directive."
+"Adds an attribute to the test request.  Out-of-band tags (admin-define, "
+"delete-attribute, no-value, not-settable, unknown, unsupported) have no "
+"value.  Values for other tags are delimited by the comma (\",\") character - "
+"escape commas using the \"\\e\" character.  Common attributes and values are "
+"listed in the IANA IPP registry - see references below."
 msgstr ""
-"Indiquer si le test actuel doit être recommencé si le code de l’état de la "
-"réponse correspond ou ne correspond pas à la valeur indiquée par la "
-"directive B<STATUS>"
+"Ajouter un attribut à la requête de test. Les étiquettes hors-bande (admin-"
+"define, delete-attribute, no-value, not-settable, unknown, unsupported) "
+"n’ont pas de valeur. Les valeurs pour d’autres étiquettes sont séparées par "
+"le caractère virgule (« , ») – protéger les virgules avec \". Les attributs "
+"et valeurs courants sont listés dans le registre IPP d’IANA — consulter les "
+"références ci-dessous."
 
-# type: SH
-#. type: SS
-#: ipptoolfile.man:411
+#. type: TP
+#: ipptoolfile.5:171
 #, no-wrap
-msgid "OPERATION CODES"
-msgstr "CODES D’OPÉRATION"
+msgid "B<ATTR collection >I<attribute-name >B<{ MEMBER >I<tag member-name value(s) ... >B<}> [ I<... >B<,{ >I<... >B<} >]"
+msgstr "B<ATTR collection >I<nom_attribut >B<{ MEMBER >I<étiquette nom_membre valeur(s) ... >B<}> [ I<... >B<,{ >I<... >B<} >]"
 
 #. type: Plain text
-#: ipptoolfile.man:414
+#: ipptoolfile.5:176
 msgid ""
-"Operation codes correspond to the hexadecimal numbers (0xHHHH) and names "
-"from RFC 8011 and other IPP extension specifications. Here is a complete "
-"list of names supported by B<ipptool>(8):"
+"Adds a collection attribute to the test request.  Member attributes follow "
+"the same syntax as regular attributes and can themselves be nested "
+"collections.  Multiple collection values can be supplied as needed, "
+"separated by commas."
 msgstr ""
-"Les codes d’opération correspondent aux nombres hexadécimaux (0xHHHH) et "
-"noms de la RFC 8011 et d’autres spécifications d’extensions IPP. Voici une "
-"liste complète de noms pris en charge par B<ipptool>(8) :"
+"Ajouter un attribut d’ensemble à la requête de test. Les attributs de membre "
+"suivent la même syntaxe que les attributs normaux et peuvent être eux-mêmes "
+"des ensembles emboités. Plusieurs valeurs d’ensemble peuvent être fournies "
+"si nécessaire, séparées par des virgules."
+
+#. type: TP
+#: ipptoolfile.5:176
+#, no-wrap
+msgid "B<COMPRESSION deflate>"
+msgstr "B<COMPRESSION >I<deflate>"
+
+#. type: TP
+#: ipptoolfile.5:178
+#, no-wrap
+msgid "B<COMPRESSION gzip>"
+msgstr "B<COMPRESSION >I<gzip>"
+
+#. type: TP
+#: ipptoolfile.5:180
+#, no-wrap
+msgid "B<COMPRESSION none>"
+msgstr "B<COMPRESSION >I<none>"
 
 #. type: Plain text
-#: ipptoolfile.man:483
+#: ipptoolfile.5:183
+msgid ""
+"Uses the specified compression on the document data following the attributes "
+"in a Print-Job or Send-Document request."
+msgstr ""
+"Utiliser la compression indiquée pour les données du document qui suit les "
+"attributs dans une tâche d’impression ou une requête d’envoi de document."
+
+#. type: TP
+#: ipptoolfile.5:183
 #, no-wrap
+msgid "B<DELAY >I<seconds>[I<,repeat-seconds>]"
+msgstr "B<DELAY >I<seconds>[I<,répétition-secondes>]"
+
+#. type: Plain text
+#: ipptoolfile.5:187
 msgid ""
-"    Activate-Printer\n"
-"    CUPS-Accept-Jobs\n"
-"    CUPS-Add-Modify-Class\n"
-"    CUPS-Add-Modify-Printer\n"
-"    CUPS-Authenticate-Job\n"
-"    CUPS-Delete-Class\n"
-"    CUPS-Delete-Printer\n"
-"    CUPS-Get-Classes\n"
-"    CUPS-Get-Default\n"
-"    CUPS-Get-Devices\n"
-"    CUPS-Get-Document\n"
-"    CUPS-Get-PPD\n"
-"    CUPS-Get-PPDs\n"
-"    CUPS-Get-Printers\n"
-"    CUPS-Move-Job\n"
-"    CUPS-Reject-Jobs\n"
-"    CUPS-Set-Default\n"
-"    Cancel-Current-Job\n"
-"    Cancel-Job\n"
-"    Cancel-Jobs\n"
-"    Cancel-My-Jobs\n"
-"    Cancel-Subscription\n"
-"    Close-Job\n"
-"    Create-Job\n"
-"    Create-Job-Subscriptions\n"
-"    Create-Printer-Subscriptions\n"
-"    Deactivate-Printer\n"
-"    Disable-Printer\n"
-"    Enable-Printer\n"
-"    Get-Job-Attributes\n"
-"    Get-Jobs\n"
-"    Get-Notifications\n"
-"    Get-Printer-Attributes\n"
-"    Get-Printer-Support-Files\n"
-"    Get-Printer-Supported-Values\n"
-"    Get-Subscription-Attributes\n"
-"    Get-Subscriptions\n"
-"    Hold-Job\n"
-"    Hold-New-Jobs\n"
-"    Identify-Printer\n"
-"    Pause-Printer\n"
-"    Pause-Printer-After-Current-Job\n"
-"    Print-Job\n"
-"    Print-URI\n"
-"    Promote-Job\n"
-"    Purge-Jobs\n"
-"    Release-Held-New-Jobs\n"
-"    Release-Job\n"
-"    Renew-Subscription\n"
-"    Reprocess-Job\n"
-"    Restart-Job\n"
-"    Restart-Printer\n"
-"    Resubmit-Job\n"
-"    Resume-Job\n"
-"    Resume-Printer\n"
-"    Schedule-Job-After\n"
-"    Send-Document\n"
-"    Send-Hardcopy-Document\n"
-"    Send-Notifications\n"
-"    Send-URI\n"
-"    Set-Job-Attributes\n"
-"    Set-Printer-Attributes\n"
-"    Shutdown-Printer\n"
-"    Startup-Printer\n"
-"    Suspend-Current-Job\n"
-"    Validate-Document\n"
-"    Validate-Job\n"
+"Specifies a delay in seconds before this test will be run.  If two values "
+"are specified, the second value is used as the delay between repeated tests."
 msgstr ""
-"    Activate-Printer\n"
-"    CUPS-Accept-Jobs\n"
-"    CUPS-Add-Modify-Class\n"
-"    CUPS-Add-Modify-Printer\n"
-"    CUPS-Authenticate-Job\n"
-"    CUPS-Delete-Class\n"
-"    CUPS-Delete-Printer\n"
-"    CUPS-Get-Classes\n"
-"    CUPS-Get-Default\n"
-"    CUPS-Get-Devices\n"
-"    CUPS-Get-Document\n"
-"    CUPS-Get-PPD\n"
-"    CUPS-Get-PPDs\n"
-"    CUPS-Get-Printers\n"
-"    CUPS-Move-Job\n"
-"    CUPS-Reject-Jobs\n"
-"    CUPS-Set-Default\n"
-"    Cancel-Current-Job\n"
-"    Cancel-Job\n"
-"    Cancel-Jobs\n"
-"    Cancel-My-Jobs\n"
-"    Cancel-Subscription\n"
-"    Close-Job\n"
-"    Create-Job\n"
-"    Create-Job-Subscriptions\n"
-"    Create-Printer-Subscriptions\n"
-"    Deactivate-Printer\n"
-"    Disable-Printer\n"
-"    Enable-Printer\n"
-"    Get-Job-Attributes\n"
-"    Get-Jobs\n"
-"    Get-Notifications\n"
-"    Get-Printer-Attributes\n"
-"    Get-Printer-Support-Files\n"
-"    Get-Printer-Supported-Values\n"
-"    Get-Subscription-Attributes\n"
-"    Get-Subscriptions\n"
-"    Hold-Job\n"
-"    Hold-New-Jobs\n"
-"    Identify-Printer\n"
-"    Pause-Printer\n"
-"    Pause-Printer-After-Current-Job\n"
-"    Print-Job\n"
-"    Print-URI\n"
-"    Promote-Job\n"
-"    Purge-Jobs\n"
-"    Release-Held-New-Jobs\n"
-"    Release-Job\n"
-"    Renew-Subscription\n"
-"    Reprocess-Job\n"
-"    Restart-Job\n"
-"    Restart-Printer\n"
-"    Resubmit-Job\n"
-"    Resume-Job\n"
-"    Resume-Printer\n"
-"    Schedule-Job-After\n"
-"    Send-Document\n"
-"    Send-Hardcopy-Document\n"
-"    Send-Notifications\n"
-"    Send-URI\n"
-"    Set-Job-Attributes\n"
-"    Set-Printer-Attributes\n"
-"    Shutdown-Printer\n"
-"    Startup-Printer\n"
-"    Suspend-Current-Job\n"
-"    Validate-Document\n"
-"    Validate-Job\n"
-"    Activate-Printer\n"
-"    CUPS-Accept-Jobs\n"
-"    CUPS-Add-Modify-Class\n"
-"    CUPS-Add-Modify-Printer\n"
-"    CUPS-Authenticate-Job\n"
-"    CUPS-Delete-Class\n"
-"    CUPS-Delete-Printer\n"
-"    CUPS-Get-Classes\n"
-"    CUPS-Get-Default\n"
-"    CUPS-Get-Devices\n"
-"    CUPS-Get-Document\n"
-"    CUPS-Get-PPD\n"
-"    CUPS-Get-PPDs\n"
-"    CUPS-Get-Printers\n"
-"    CUPS-Move-Job\n"
-"    CUPS-Reject-Jobs\n"
-"    CUPS-Set-Default\n"
-"    Cancel-Current-Job\n"
-"    Cancel-Job\n"
-"    Cancel-Jobs\n"
-"    Cancel-My-Jobs\n"
-"    Cancel-Subscription\n"
-"    Close-Job\n"
-"    Create-Job\n"
-"    Create-Job-Subscription\n"
-"    Create-Printer-Subscription\n"
-"    Deactivate-Printer\n"
-"    Disable-Printer\n"
-"    Enable-Printer\n"
-"    Get-Job-Attributes\n"
-"    Get-Jobs\n"
-"    Get-Notifications\n"
-"    Get-Printer-Attributes\n"
-"    Get-Printer-Support-Files\n"
-"    Get-Printer-Supported-Values\n"
-"    Get-Subscription-Attributes\n"
-"    Get-Subscriptions\n"
-"    Hold-Job\n"
-"    Hold-New-Jobs\n"
-"    Identify-Printer\n"
-"    Pause-Printer\n"
-"    Pause-Printer-After-Current-Job\n"
-"    Print-Job\n"
-"    Print-URI\n"
-"    Promote-Job\n"
-"    Purge-Jobs\n"
-"    Release-Held-New-Jobs\n"
-"    Release-Job\n"
-"    Renew-Subscription\n"
-"    Reprocess-Job\n"
-"    Restart-Job\n"
-"    Restart-Printer\n"
-"    Resubmit-Job\n"
-"    Resume-Job\n"
-"    Resume-Printer\n"
-"    Schedule-Job-After\n"
-"    Send-Document\n"
-"    Send-Hardcopy-Document\n"
-"    Send-Notifications\n"
-"    Send-URI\n"
-"    Set-Job-Attributes\n"
-"    Set-Printer-Attributes\n"
-"    Shutdown-Printer\n"
-"    Startup-Printer\n"
-"    Suspend-Current-Job\n"
-"    Validate-Document\n"
-"    Validate-Job\n"
+"Définir un délai en seconde avant l’exécution du test. Si deux valeurs sont "
+"indiquées, la seconde est utilisée pour définir l’intervalle entre des tests "
+"répétitifs."
 
-# type: SH
-#. type: SS
-#: ipptoolfile.man:484
+#. type: TP
+#: ipptoolfile.5:187
 #, no-wrap
-msgid "STATUS CODES"
-msgstr "CODES D’ÉTAT"
+msgid "B<DISPLAY >I<attribute-name>"
+msgstr "B<DISPLAY >I<nom_attribut>"
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:487
+#: ipptoolfile.5:191
 msgid ""
-"Status codes correspond to the hexadecimal numbers (0xHHHH) and names from "
-"RFC 8011 and other IPP extension specifications. Here is a complete list of "
-"the names supported by B<ipptool>(8):"
+"Specifies that value of the named attribute should be output as part of the "
+"test report."
 msgstr ""
-"Les codes d’état correspondent aux nombres hexadécimaux (0xHHHH) et noms de "
-"la RFC 8011 et d’autres spécifications d’extensions IPP. Voici une liste "
-"complète de noms pris en charge par B<ipptool>(8) :"
+"Indiquer que la valeur de l’attribut nommé doit être affiché comme faisant "
+"partie du compte-rendu de test."
 
-#. type: Plain text
-#: ipptoolfile.man:546
+#. type: TP
+#: ipptoolfile.5:191
+#, no-wrap
+msgid "B<EXPECT >I<attribute-name >[ I<predicate(s) >]"
+msgstr "B<EXPECT >I<nom_attribut >[ I<prédicat(s) >]"
+
+#. type: TP
+#: ipptoolfile.5:193
+#, no-wrap
+msgid "B<EXPECT ?>I<attribute-name predicate(s)>"
+msgstr "B<EXPECT ?>I<nom_attribut prédicat(s)>"
+
+#. type: TP
+#: ipptoolfile.5:195
 #, no-wrap
+msgid "B<EXPECT !>I<attribute-name>"
+msgstr "B<EXPECT !>I<nom_attribut>"
+
+#. type: Plain text
+#: ipptoolfile.5:198
 msgid ""
-"    client-error-account-authorization-failed\n"
-"    client-error-account-closed\n"
-"    client-error-account-info-needed\n"
-"    client-error-account-limit-reached\n"
-"    client-error-attributes-not-settable\n"
-"    client-error-attributes-or-values-not-supported\n"
-"    client-error-bad-request\n"
-"    client-error-charset-not-supported\n"
-"    client-error-compression-error\n"
-"    client-error-compression-not-supported\n"
-"    client-error-conflicting-attributes\n"
-"    client-error-document-access-error\n"
-"    client-error-document-format-error\n"
-"    client-error-document-format-not-supported\n"
-"    client-error-document-password-error\n"
-"    client-error-document-permission-error\n"
-"    client-error-document-security-error\n"
-"    client-error-document-unprintable-error\n"
-"    client-error-forbidden\n"
-"    client-error-gone\n"
-"    client-error-ignored-all-notifications\n"
-"    client-error-ignored-all-subscriptions\n"
-"    client-error-not-authenticated\n"
-"    client-error-not-authorized\n"
-"    client-error-not-found\n"
-"    client-error-not-possible\n"
-"    client-error-print-support-file-not-found\n"
-"    client-error-request-entity-too-large\n"
-"    client-error-request-value-too-long\n"
-"    client-error-timeout\n"
-"    client-error-too-many-subscriptions\n"
-"    client-error-uri-scheme-not-supported\n"
-"    cups-error-account-authorization-failed\n"
-"    cups-error-account-closed\n"
-"    cups-error-account-info-needed\n"
-"    cups-error-account-limit-reached\n"
-"    cups-see-other\n"
-"    redirection-other-site\n"
-"    server-error-busy\n"
-"    server-error-device-error\n"
-"    server-error-internal-error\n"
-"    server-error-job-canceled\n"
-"    server-error-multiple-document-jobs-not-supported\n"
-"    server-error-not-accepting-jobs\n"
-"    server-error-operation-not-supported\n"
-"    server-error-printer-is-deactivated\n"
-"    server-error-service-unavailable\n"
-"    server-error-temporary-error\n"
-"    server-error-version-not-supported\n"
-"    successful-ok\n"
-"    successful-ok-but-cancel-subscription\n"
-"    successful-ok-conflicting-attributes\n"
-"    successful-ok-events-complete\n"
-"    successful-ok-ignored-notifications\n"
-"    successful-ok-ignored-or-substituted-attributes\n"
-"    successful-ok-ignored-subscriptions\n"
-"    successful-ok-too-many-events\n"
+"Specifies that the response must/may/must not include the named attribute. "
+"Additional requirements can be added as predicates - see the \"EXPECT "
+"PREDICATES\" section for more information on predicates. Attribute names can "
+"specify member attributes by separating the attribute and member names with "
+"the forward slash, for example \"media-col/media-size/x-dimension\"."
 msgstr ""
-"    client-error-account-authorization-failed\n"
-"    client-error-account-closed\n"
-"    client-error-account-info-needed\n"
-"    client-error-account-limit-reached\n"
-"    client-error-attributes-not-settable\n"
-"    client-error-attributes-or-values-not-supported\n"
-"    client-error-bad-request\n"
-"    client-error-charset-not-supported\n"
-"    client-error-compression-error\n"
-"    client-error-compression-not-supported\n"
-"    client-error-conflicting-attributes\n"
-"    client-error-document-access-error\n"
-"    client-error-document-format-error\n"
-"    client-error-document-format-not-supported\n"
-"    client-error-document-password-error\n"
-"    client-error-document-permission-error\n"
-"    client-error-document-security-error\n"
-"    client-error-document-unprintable-error\n"
-"    client-error-forbidden\n"
-"    client-error-gone\n"
-"    client-error-ignored-all-notifications\n"
-"    client-error-ignored-all-subscriptions\n"
-"    client-error-not-authenticated\n"
-"    client-error-not-authorized\n"
-"    client-error-not-found\n"
-"    client-error-not-possible\n"
-"    client-error-print-support-file-not-found\n"
-"    client-error-request-entity-too-large\n"
-"    client-error-request-value-too-long\n"
-"    client-error-timeout\n"
-"    client-error-too-many-subscriptions\n"
-"    client-error-uri-scheme-not-supported\n"
-"    cups-error-account-authorization-failed\n"
-"    cups-error-account-closed\n"
-"    cups-error-account-info-needed\n"
-"    cups-error-account-limit-reached\n"
-"    cups-see-other\n"
-"    redirection-other-site\n"
-"    server-error-busy\n"
-"    server-error-device-error\n"
-"    server-error-internal-error\n"
-"    server-error-job-canceled\n"
-"    server-error-multiple-document-jobs-not-supported\n"
-"    server-error-not-accepting-jobs\n"
-"    server-error-operation-not-supported\n"
-"    server-error-printer-is-deactivated\n"
-"    server-error-service-unavailable\n"
-"    server-error-temporary-error\n"
-"    server-error-version-not-supported\n"
-"    successful-ok\n"
-"    successful-ok-but-cancel-subscription\n"
-"    successful-ok-conflicting-attributes\n"
-"    successful-ok-events-complete\n"
-"    successful-ok-ignored-notifications\n"
-"    successful-ok-ignored-or-substituted-attributes\n"
-"    successful-ok-ignored-subscriptions\n"
-"    successful-ok-too-many-events\n"
+"Indiquer que la réponse doit, ou peut, ou ne doit pas inclure l’attribut "
+"nommé. Des exigences supplémentaires peuvent être ajoutées comme prédicats "
+"— consultez la section « PRÉDICATS EXPECT » pour davantage d’information sur "
+"les prédicats. Les noms d’attribut peuvent indiquer les attributs des "
+"membres en séparant les noms d’attribut et de membre avec une barre oblique, "
+"par exemple, « media-col/media-size/x-dimension »."
 
-#. type: SS
-#: ipptoolfile.man:547
+#. type: TP
+#: ipptoolfile.5:198
 #, no-wrap
-msgid "TAGS"
-msgstr "ÉTIQUETTES"
+msgid "B<EXPECT-ALL >I<attribute-name >[ I<predicate(s) >]"
+msgstr "B<EXPECT-ALL >I<nom_attribut >[ I<prédicat(s) >]"
+
+#. type: TP
+#: ipptoolfile.5:200
+#, no-wrap
+msgid "B<EXPECT-ALL ?>I<attribute-name predicate(s)>"
+msgstr "B<EXPECT-ALL ?>I<nom_attribut prédicat(s)>"
 
 #. type: Plain text
-#: ipptoolfile.man:549
+#: ipptoolfile.5:203
 msgid ""
-"Value and group tags correspond to the names from RFC 8011 and other IPP "
-"extension specifications. Here are the group tags:"
+"Specifies that the response must/may include the named attribute and that "
+"all occurrences of that attribute must match the given predicates."
 msgstr ""
-"Les étiquettes de valeur et de groupe correspondent aux noms de la RFC 8011 "
-"et d’autres spécifications d’extensions IPP. Voici les étiquettes de groupe :"
+"Indiquer si la réponse doit ou peut inclure l’attribut nommé et que toutes "
+"les occurrences de cet attribut doivent correspondre aux prédicats indiqués."
 
-#. type: Plain text
-#: ipptoolfile.man:558
+# type: TP
+#. type: TP
+#: ipptoolfile.5:203
 #, no-wrap
+msgid "B<FILE filename>"
+msgstr "B<FILE> I<nom_fichier>"
+
+#. type: Plain text
+#: ipptoolfile.5:206
 msgid ""
-"    document-attributes-tag\n"
-"    event-notification-attributes-tag\n"
-"    job-attributes-tag\n"
-"    operation-attributes-tag\n"
-"    printer-attributes-tag\n"
-"    subscription-attributes-tag\n"
-"    unsupported-attributes-tag\n"
+"Specifies a file to include at the end of the request. This is typically "
+"used when sending a test print file."
 msgstr ""
-"    document-attributes-tag\n"
-"    event-notification-attributes-tag\n"
-"    job-attributes-tag\n"
-"    operation-attributes-tag\n"
-"    printer-attributes-tag\n"
-"    subscription-attributes-tag\n"
-"    unsupported-attributes-tag\n"
+"Indiquer un fichier à ajouter à la fin de la requête. Cela est "
+"habituellement utilisé lors de l’envoi d’un fichier de test d’impression."
 
+#. type: TP
+#: ipptoolfile.5:206
+#, no-wrap
+msgid "B<GROUP tag>"
+msgstr "B<GROUP> I<étiquette>"
+
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:561
-msgid "Here are the value tags:"
-msgstr "Voici les étiquettes de valeur :"
+#: ipptoolfile.5:209
+msgid "Specifies the group tag for subsequent attributes in the request."
+msgstr ""
+"Indiquer l’étiquette de groupe pour les attributs suivants dans la requête."
 
 #. type: Plain text
-#: ipptoolfile.man:588
-#, no-wrap
+#: ipptoolfile.5:216
 msgid ""
-"    admin-define\n"
-"    boolean\n"
-"    charset\n"
-"    collection\n"
-"    dateTime\n"
-"    default\n"
-"    delete-attribute\n"
-"    enum\n"
-"    integer\n"
-"    keyword\n"
-"    mimeMediaType\n"
-"    nameWithLanguage\n"
-"    nameWithoutLanguage\n"
-"    naturalLanguage\n"
-"    no-value\n"
-"    not-settable\n"
-"    octetString\n"
-"    rangeOfInteger\n"
-"    resolution\n"
-"    textWithLanguage\n"
-"    textWithoutLanguage\n"
-"    unknown\n"
-"    unsupported\n"
-"    uri\n"
-"    uriScheme\n"
+"Specifies whether B<ipptool>(8)  will ignore errors and continue with "
+"subsequent tests."
 msgstr ""
-"    admin-define\n"
-"    boolean\n"
-"    charset\n"
-"    collection\n"
-"    dateTime\n"
-"    default\n"
-"    delete-attribute\n"
-"    enum\n"
-"    integer\n"
-"    keyword\n"
-"    mimeMediaType\n"
-"    nameWithLanguage\n"
-"    nameWithoutLanguage\n"
-"    naturalLanguage\n"
-"    no-value\n"
-"    not-settable\n"
-"    octetString\n"
-"    rangeOfInteger\n"
-"    resolution\n"
-"    textWithLanguage\n"
-"    textWithoutLanguage\n"
-"    unknown\n"
-"    unsupported\n"
-"    uri\n"
-"    uriScheme\n"
+"Indiquer si B<ipptool>(8) ignorera les erreurs et continuera avec les tests "
+"suivants."
 
-# type: SH
-#. type: SS
-#: ipptoolfile.man:589
+#. type: TP
+#: ipptoolfile.5:216
 #, no-wrap
-msgid "VARIABLES"
-msgstr "VARIABLES"
+msgid "B<NAME \">I<literal string>B<\">"
+msgstr "B<NAME \">I<chaîne_littérale>B<\">"
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:593
-msgid ""
-"The B<ipptool>(8)  program maintains a list of variables that can be used in "
-"any literal string or attribute value by specifying \"I<$variable-name>\". "
-"Aside from variables defined using the I<-d> option or B<DEFINE> directive, "
-"the following pre-defined variables are available:"
-msgstr ""
-"Le programme B<ipptool>(8) conserve une liste de variables qui peuvent être "
-"utilisées dans n’importe quelle chaîne littérale ou valeur d’attribut en "
-"indiquant « I<$nom_variable> ». En plus des variables définies en utilisant "
-"l’option « B<-d> » ou la directive B<DEFINE>, les variables prédéfinies "
-"suivantes sont disponibles :"
+#: ipptoolfile.5:219
+msgid "Specifies the human-readable name of the test."
+msgstr "Décrire le nom de test de manière compréhensible aux utilisateurs. "
 
 #. type: TP
-#: ipptoolfile.man:593
+#: ipptoolfile.5:219
 #, no-wrap
-msgid "B<$$>"
-msgstr "B<$$>"
+msgid "B<OPERATION >I<operation-code>"
+msgstr "B<OPERATION >I<code_opération>"
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:596
-msgid "Inserts a single \"$\" character."
-msgstr "Insérer un seul caractère « $ »."
+#: ipptoolfile.5:222
+msgid "Specifies the operation to be performed."
+msgstr "Indiquer les opérations à effectuer."
 
 #. type: TP
-#: ipptoolfile.man:596
+#: ipptoolfile.5:222
 #, no-wrap
-msgid "B<$ENV[>I<name>B<]>"
-msgstr "B<$ENV[>I<nom>B<]>"
+msgid "B<PAUSE \">I<message>B<\">"
+msgstr "B<PAUSE \">I<message>B<\">"
 
 #. type: Plain text
-#: ipptoolfile.man:599
+#: ipptoolfile.5:225
 msgid ""
-"Inserts the value of the named environment variable, or an empty string if "
-"the environment variable is not defined."
+"Displays the provided message and waits for the user to press a key to "
+"continue."
 msgstr ""
-"Insérer la valeur de la variable d’environnement nommée, ou une chaîne vide "
-"si la variable d’environnement n’est pas définie."
+"Afficher le message fourni et attendre l’appui d’une touche par "
+"l’utilisateur pour continuer."
 
-# type: TP
 #. type: TP
-#: ipptoolfile.man:599
+#: ipptoolfile.5:225
 #, no-wrap
-msgid "B<$filename>"
-msgstr "B<$nom_fichier>"
-
-#. type: Plain text
-#: ipptoolfile.man:604
-msgid "Inserts the filename provided to B<ipptool>(8)  with the I<-f> option."
-msgstr "Insérer le nom de fichier fourni à B<ipptool>(8) avec l’option B<-f>."
+msgid "B<REQUEST-ID >I<number>"
+msgstr "B<REQUEST-ID >I<nombre>"
 
 #. type: TP
-#: ipptoolfile.man:604
+#: ipptoolfile.5:227
 #, no-wrap
-msgid "B<$filetype>"
-msgstr "B<$type_fichier>"
+msgid "B<REQUEST-ID random>"
+msgstr "B<REQUEST-ID >I<aléatoire>"
 
 #. type: Plain text
-#: ipptoolfile.man:609
+#: ipptoolfile.5:230
 msgid ""
-"Inserts the MIME media type for the filename provided to B<ipptool>(8)  with "
-"the I<-f> option."
+"Specifies the request-id value to use in the request, either an integer or "
+"the word \"random\" to use a randomly generated value (the default)."
 msgstr ""
-"Insérer le type MIME de média pour le nom de fichier fourni à B<ipptool>(8) "
-"avec l’option « B<-f> »."
+"Indiquer la valeur d’identifiant de requête à utiliser dans la requête, soit "
+"un nombre entier soit le mot « random » pour utiliser une valeur calculée "
+"aléatoirement (comportement par défaut)."
 
 #. type: TP
-#: ipptoolfile.man:609
+#: ipptoolfile.5:230
 #, no-wrap
-msgid "B<$hostname>"
-msgstr "B<$nom_hôte>"
+msgid "B<RESOURCE >I<path>"
+msgstr "B<RESOURCE >I<chemin>"
 
 #. type: Plain text
-#: ipptoolfile.man:613
-msgid "Inserts the hostname from the URI provided to B<ipptool>(8)."
-msgstr "Insérer le nom d’hôte à partir de l’URI fourni à B<ipptool>(8)."
+#: ipptoolfile.5:235
+msgid ""
+"Specifies an alternate resource path that is used for the HTTP POST request. "
+"The default is the resource from the URI provided to the B<ipptool>(8)  "
+"program."
+msgstr ""
+"Indiquer un chemin de ressource alternatif pour la requête HTTP POST. Par "
+"défaut, c’est la ressource de l’URI fourni par le programme B<ipptool>(8)."
+
+# type: Plain text
+#. type: Plain text
+#: ipptoolfile.5:240
+msgid ""
+"Specifies that the current test should be skipped when the variable is or is "
+"not defined."
+msgstr ""
+"Indiquer que l’actuel test sera omis quand la variable est ou n’est pas "
+"définie."
 
-# type: TP
 #. type: TP
-#: ipptoolfile.man:613
+#: ipptoolfile.5:240
 #, no-wrap
-msgid "B<$job-id>"
-msgstr "B<$id_travail>"
+msgid "B<SKIP-PREVIOUS-ERROR yes>"
+msgstr "B<SKIP-PREVIOUS-ERROR >I<yes>"
+
+#. type: TP
+#: ipptoolfile.5:242
+#, no-wrap
+msgid "B<SKIP-PREVIOUS-ERROR no>"
+msgstr "B<SKIP-PREVIOUS-ERROR >I<no>"
 
 #. type: Plain text
-#: ipptoolfile.man:616
+#: ipptoolfile.5:247
 msgid ""
-"Inserts the last \"job-id\" attribute value returned in a test response or 0 "
-"if no \"job-id\" attribute has been seen."
+"Specifies whether B<ipptool>(8)  will skip the current test if the previous "
+"test resulted in an error/failure."
 msgstr ""
-"Insérer la valeur du dernier identifiant de tâche renvoyée par la réponse "
-"d’un test ou B<0> si aucun identifiant n’a été trouvé."
+"Indiquer si B<ipptool>(8) ignorera le test actuel si le test précédent se "
+"termine sur une erreur ou un succès."
 
 #. type: TP
-#: ipptoolfile.man:616
+#: ipptoolfile.5:247
 #, no-wrap
-msgid "B<$job-uri>"
-msgstr "B<$uri_travail>"
+msgid "B<STATUS >I<status-code >[ I<predicate> ]"
+msgstr "B<STATUS >I<code_état >[ I<prédicat> ]"
 
 #. type: Plain text
-#: ipptoolfile.man:619
+#: ipptoolfile.5:250
 msgid ""
-"Inserts the last \"job-uri\" attribute value returned in a test response or "
-"an empty string if no \"job-uri\" attribute has been seen."
+"Specifies an expected response status-code value. Additional requirements "
+"can be added as predicates - see the \"STATUS PREDICATES\" section for more "
+"information on predicates."
 msgstr ""
-"Insérer la dernière valeur de l’attribut de l’URI de travail renvoyée par la "
-"réponse d’un test ou une chaîne vide si aucun attribut d’URI n’a été trouvé."
+"Indiquer la valeur attendue du code d’état de la réponse. Des exigences "
+"supplémentaires peuvent être ajoutées comme prédicats — consultez la section "
+"« PREDICATS STATUS » pour davantage d’information sur les prédicats."
 
 #. type: TP
-#: ipptoolfile.man:619
+#: ipptoolfile.5:250
 #, no-wrap
-msgid "B<$notify-subscription-id>"
-msgstr "B<$id_notification_souscription>"
+msgid "B<TEST-ID \">I<identifier>\""
+msgstr "B<TEST-ID \">I<identificateur>\""
+
+# type: Plain text
+#. type: Plain text
+#: ipptoolfile.5:253
+msgid "Specifies an identifier string for the current test."
+msgstr "Définir une chaîne d’identificateur pour le test actuel."
 
 #. type: Plain text
-#: ipptoolfile.man:622
+#: ipptoolfile.5:256
 msgid ""
-"Inserts the last \"notify-subscription-id\" attribute value returned in a "
-"test response or 0 if no \"notify-subscription-id\" attribute has been seen."
+"Specifies that this test will use \"Transfer-Encoding: chunked\" if it has "
+"an attached file or \"Content-Length:\" otherwise."
 msgstr ""
-"Insérer la dernière valeur de l’attribut d’identifiant de notification de "
-"souscription renvoyée dans une réponse de test ou B<0> si aucun attribut n’a "
-"été trouvé."
+"Indiquer que le test utilisera « Transfer-Encoding: chunked » si un fichier "
+"est joint ou  «Content-Length: » sinon."
 
-#. type: TP
-#: ipptoolfile.man:622
-#, no-wrap
-msgid "B<$port>"
-msgstr "B<$port>"
+#. type: Plain text
+#: ipptoolfile.5:259
+msgid ""
+"Specifies that this test will use the HTTP/1.1 \"Transfer-Encoding: chunked"
+"\" header."
+msgstr ""
+"Indiquer si le test utilisera les en-têtes HTTP 1.1 « Transfer-"
+"Encoding: chunked »."
 
 #. type: Plain text
-#: ipptoolfile.man:626
-msgid "Inserts the port number from the URI provided to B<ipptool>(8)."
-msgstr "Insérer le numéro du port à partir de l’URI fourni à B<ipptool>(8)."
+#: ipptoolfile.5:262
+msgid ""
+"Specifies that this test will use the HTTP/1.0 \"Content-Length:\" header."
+msgstr ""
+"Indiquer que ce test utilisera les en-têtes HTTP/1.0 « Content-Length: »."
 
-#. type: TP
-#: ipptoolfile.man:626
+# type: Plain text
+#. type: Plain text
+#: ipptoolfile.5:273
+msgid "Specifies the IPP version number to use for this test."
+msgstr "Indiquer le numéro de version d’IPP à utiliser pour ce test."
+
+#. type: SS
+#: ipptoolfile.5:273
 #, no-wrap
-msgid "B<$resource>"
-msgstr "B<$ressource>"
+msgid "EXPECT PREDICATES"
+msgstr "PRÉDICATS EXPECT "
 
+# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:630
-msgid "Inserts the resource path from the URI provided to B<ipptool>(8)."
+#: ipptoolfile.5:275
+msgid ""
+"The following predicates are understood following the B<EXPECT> test "
+"directive:"
 msgstr ""
-"Insérer le chemin de ressource à partir de l’URI fourni à B<ipptool>(8)."
+"Les prédicats ci-dessous sont compris suivant la directive de test "
+"B<EXPECT> :"
 
+# type: TP
 #. type: TP
-#: ipptoolfile.man:630
+#: ipptoolfile.5:275
 #, no-wrap
-msgid "B<$scheme>"
-msgstr "B<$schéma>"
+msgid "B<COUNT >I<number>"
+msgstr "B<COUNT >I<nombre>"
 
 #. type: Plain text
-#: ipptoolfile.man:634
-msgid "Inserts the scheme from the URI provided to B<ipptool>(8)."
-msgstr "Insérer le schéma depuis l’URI fourni à B<ipptool>(8)."
+#: ipptoolfile.5:278
+msgid ""
+"Requires the B<EXPECT> attribute to have the specified number of values."
+msgstr "Exiger que l’attribut d’B<EXPECT> ait le nombre indiqué de valeurs."
 
 #. type: TP
-#: ipptoolfile.man:634
+#: ipptoolfile.5:278 ipptoolfile.5:387
 #, no-wrap
-msgid "B<$uri>"
-msgstr "B<$uri>"
+msgid "B<DEFINE-MATCH >I<variable-name>"
+msgstr "B<DEFINE-MATCH >I<nom_variable>"
 
 #. type: Plain text
-#: ipptoolfile.man:638
-msgid "Inserts the URI provided to B<ipptool>(8)."
-msgstr "Insérer l’URI fourni à B<ipptool>(8)."
+#: ipptoolfile.5:281
+msgid ""
+"Defines the variable to \"1\" when the B<EXPECT> condition matches. A side-"
+"effect of this predicate is that this B<EXPECT> will never fail a test."
+msgstr ""
+"Définir la variable à B<1> quand la condition d’B<EXPECT> correspond. Un "
+"effet de bord de ce prédicat est que B<EXPECT> n’échouera jamais à un test."
 
-# type: TP
 #. type: TP
-#: ipptoolfile.man:638
+#: ipptoolfile.5:281 ipptoolfile.5:390
 #, no-wrap
-msgid "B<$uriuser>"
-msgstr "B<$uri_utilisateur>"
+msgid "B<DEFINE-NO-MATCH >I<variable-name>"
+msgstr "B<DEFINE-NO-MATCH >I<nom_variable>"
 
 #. type: Plain text
-#: ipptoolfile.man:643
-msgid "Inserts the username from the URI provided to B<ipptool>(8), if any."
+#: ipptoolfile.5:284
+msgid ""
+"Defines the variable to \"1\" when the B<EXPECT> condition does not match. A "
+"side-effect of this predicate is that this B<EXPECT> will never fail a test."
 msgstr ""
-"Insérer l'identifiant à partir de l’URI fourni par B<ipptool>(8), s’il "
-"existe."
+"Définir la variable à B<1> quand la condition d’B<EXPECT> ne correspond pas. "
+"Un effet de bord de ce prédicat est que B<EXPECT> n’échouera jamais à un "
+"test."
 
-# type: TP
 #. type: TP
-#: ipptoolfile.man:643
+#: ipptoolfile.5:284
 #, no-wrap
-msgid "B<$user>"
-msgstr "B<$utilisateur>"
+msgid "B<DEFINE-VALUE >I<variable-name>"
+msgstr "B<DEFINE-VALUE >I<nom_variable>"
 
-# type: Plain text
 #. type: Plain text
-#: ipptoolfile.man:646
-msgid "Inserts the current user's login name."
-msgstr "Insérer le nom de connexion de l’utilisateur actuel."
-
-#. type: Plain text
-#: ipptoolfile.man:651
+#: ipptoolfile.5:287
 msgid ""
-"B<ipptool>(1), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
-"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
-"ipp), RFC 8011 (http://tools.ietf.org/html/rfc8011)"
+"Defines the variable to the value of the attribute when the B<EXPECT> "
+"condition matches. A side-effect of this predicate is that this B<EXPECT> "
+"will never fail a test."
 msgstr ""
-"B<ipptool>(1), IANA IPP Registry (E<lt>URL:I<http://www.iana.org/assignments/"
-"ipp-registrations>E<gt>), PWG Internet Printing Protocol Workgroup (E<lt>URL:"
-"I<http://www.pwg.org/ipp>E<gt>), RFC 8011 (E<lt>URL:I<http://tools.ietf.org/"
-"html/rfc8011>E<gt>)"
-
-#. type: TH
-#: ipptool.man:12
-#, no-wrap
-msgid "ipptool"
-msgstr "ipptool"
+"Définir la variable à la valeur de l’attribut quand la condition d’B<EXPECT> "
+"correspond. Un effet de bord de ce prédicat est que B<EXPECT> n’échouera "
+"jamais à un test."
 
-#. type: TH
-#: ipptool.man:12
+#. type: TP
+#: ipptoolfile.5:287 ipptoolfile.5:393
 #, no-wrap
-msgid "4 August 2017"
-msgstr "4 août 2017"
-
-#. type: Plain text
-#: ipptool.man:15
-msgid "ipptool - perform internet printing protocol requests"
-msgstr "ipptool - Réaliser des requêtes d’impression par internet"
-
-#. type: Plain text
-#: ipptool.man:75
-#, fuzzy
-msgid ""
-"B<ipptool> [ B<--help> ] [ B<--stop-after-include-error> ] [ B<--version> ] "
-"[ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] [ B<-I> ] [ B<-L> ] [ B<-P> "
-"I<filename.plist> ] [ B<-S> ] [ B<-T> I<seconds> ] [ B<-V> I<version> ] [ B<-"
-"X> ] [ B<-c> ] [ B<-d> I<name=value> ] [ B<-f> I<filename> ] [ B<-h> ] [ B<-"
-"i> I<seconds> ] [ B<-n> I<repeat-count> ] [ B<-q> ] [ B<-t> ] [ B<-v ]> "
-"I<printer-uri> I<testfile> [ ...  I<testfile> ]"
-msgstr ""
-"B<ipptool> [ B<--help> ] [ B<--stop-after-include-error> ] [ B<--version> ] "
-"[ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] [ B<-I> ] [ B<-L> ] [ B<-P> "
-"I<fichier.plist> ] [ B<-S> ] [ B<-T> I<secondes> ] [ B<-V> I<version> ] [ B<-"
-"X> ] [ B<-c> ] [ B<-d> I<nom=valeur> ] [ B<-f> I<fichier> ] [ B<-h> ] [ B<-"
-"i> I<secondes> ] [ B<-n> I<nombre_répétitions>] [ B<-q> ] [ B<-t> ] [ B<-"
-"v> ] I<uri_imprimante> I<fichier_test> [ ...  I<fichier_test> ]"
+msgid "B<IF-DEFINED >I<variable-name>"
+msgstr "B<IF-DEFINED >I<nom_variable>"
 
 #. type: Plain text
-#: ipptool.man:88
+#: ipptoolfile.5:290
 msgid ""
-"B<ipptool> sends IPP requests to the specified I<printer-uri> and tests and/"
-"or displays the results.  Each named I<testfile> defines one or more "
-"requests, including the expected response status, attributes, and values.  "
-"Output is either a plain text, formatted text, CSV, or XML report on the "
-"standard output, with a non-zero exit status indicating that one or more "
-"tests have failed.  The I<testfile> format is described in B<ipptoolfile>(5)."
+"Makes the B<EXPECT> conditions apply only if the specified variable is "
+"defined."
 msgstr ""
-"B<ipptool> envoie des requêtes IPP à l’I<uri_imprimante> indiqué puis teste "
-"et/ou affiche les résultats. Chaque fichier nommé I<fichier_test> définit "
-"une ou plusieurs requêtes, incluant les états, les attributs, et les valeurs "
-"des réponses attendues. La sortie est soit du texte pur, du texte formaté, "
-"du CSV ou un compte-rendu XML affiché sur la sortie standard, avec un état "
-"d’erreur non nul signifiant qu’un ou plusieurs tests ont échoués. Le format "
-"du I<fichier_test> est décrit dans B<ipptoolfile>(5)."
-
-# type: Plain text
-#. type: Plain text
-#: ipptool.man:91
-msgid "The following options are recognized by B<ipptool:>"
-msgstr "Les options suivantes sont reconnues par B<ipptool> :"
+"Appliquer les conditions d’B<EXPECT> seulement si la variable indiquée est "
+"définie."
 
 #. type: TP
-#: ipptool.man:94
+#: ipptoolfile.5:290 ipptoolfile.5:396
 #, no-wrap
-msgid "B<--stop-after-include-error>"
-msgstr "B<--stop-after-include-error>"
+msgid "B<IF-NOT-DEFINED >I<variable-name>"
+msgstr "B<IF-NOT-DEFINED >I<nom_variable>"
 
 #. type: Plain text
-#: ipptool.man:101
+#: ipptoolfile.5:293
 msgid ""
-"Tells B<ipptool> to stop if an error occurs in an included file. Normally "
-"B<ipptool> will continue with subsequent tests after the INCLUDE directive."
+"Makes the B<EXPECT> conditions apply only if the specified variable is not "
+"defined."
 msgstr ""
-"Indiquer à B<ipptool> d’arrêter si une erreur survient dans un fichier "
-"inclus. Normalement B<ipptool> continuera les tests suivants après la "
-"directive INCLUDE."
+"Appliquer les conditions d’B<EXPECT> seulement si la variable indiquée n’est "
+"pas définie."
 
-# type: Plain text
-#. type: Plain text
-#: ipptool.man:106
-msgid "Shows the version of B<ipptool> being used."
-msgstr "Afficher la version de B<ipptool> utilisée."
+#. type: TP
+#: ipptoolfile.5:293
+#, no-wrap
+msgid "B<IN-GROUP >I<tag>"
+msgstr "B<IN-GROUP >I<étiquette>"
 
-# type: Plain text
 #. type: Plain text
-#: ipptool.man:111
-msgid ""
-"Specifies that B<ipptool> must connect to the printer or server using IPv4."
+#: ipptoolfile.5:296
+msgid "Requires the B<EXPECT> attribute to be in the specified group tag."
 msgstr ""
-"Indiquer que B<ipptool> doit se connecter à l’imprimante ou au serveur en "
-"utilisant IPv4."
+"Exiger que l’attribut d’B<EXPECT> soit dans l’étiquette de groupe indiquée."
+
+#. type: TP
+#: ipptoolfile.5:296
+#, fuzzy, no-wrap
+msgid "B<OF-TYPE >I<tag[|tag,...]>"
+msgstr "B<OF-TYPE >I<étiquette[,étiquette,...]>"
 
-# type: Plain text
 #. type: Plain text
-#: ipptool.man:116
+#: ipptoolfile.5:299
 msgid ""
-"Specifies that B<ipptool> must connect to the printer or server using IPv6."
+"Requires the B<EXPECT> attribute to use one of the specified value tag(s)."
 msgstr ""
-"Indiquer que B<ipptool> doit se connecter à l’imprimante ou au serveur en "
-"utilisant IPv6."
+"Exiger que l’attribut d’B<EXPECT> utilise la valeur d’étiquette(s) indiquée."
 
 #. type: TP
-#: ipptool.man:116
+#: ipptoolfile.5:299 ipptoolfile.5:399
 #, no-wrap
-msgid "B<-C>"
-msgstr "B<-C>"
-
-#. type: Plain text
-#: ipptool.man:120
-msgid ""
-"Specifies that requests should be sent using the HTTP/1.1 \"Transfer-"
-"Encoding: chunked\" header, which is required for conformance by all "
-"versions of IPP.  The default is to use \"Transfer-Encoding: chunked\" for "
-"requests with attached files and \"Content-Length:\" for requests without "
-"attached files."
-msgstr ""
-"Indiquer que les requêtes doivent être envoyées avec l’en-tête de HTTP/1.1 "
-"« Transfer-Encoding: chunked », comme exigé pour conformité par toutes les "
-"versions d’IPP. Par défaut « Transfer-Encoding: chunked » est utilisé pour "
-"les requêtes avec des fichiers joints et « Content-Length: » pour des "
-"requêtes sans fichier joint "
+msgid "B<REPEAT-LIMIT >I<number>"
+msgstr "B<REPEAT-LIMIT >I<nombre>"
 
 # type: Plain text
 #. type: Plain text
-#: ipptool.man:123
+#: ipptoolfile.5:303
 msgid ""
-"Forces TLS encryption when connecting to the server using the HTTP \"Upgrade"
-"\" header."
+"Specifies the maximum number of times to repeat if the B<REPEAT-MATCH> or "
+"B<REPEAT-NO-MATCH> predicate is specified. The default value is 1000."
 msgstr ""
-"Forcer le chiffrement TLS lors de la connexion au serveur en utilisant l’en-"
-"tête HTTP « Upgrade »."
+"Définir le nombre maximal de répétitions si le prédicat B<REPEAT-MATCH> ou "
+"B<REPEAT-NO-MATCH> est indiqué. La valeur par défaut est B<1000>."
 
 #. type: TP
-#: ipptool.man:123
+#: ipptoolfile.5:303 ipptoolfile.5:403
 #, no-wrap
-msgid "B<-I>"
-msgstr "B<-I>"
-
-#. type: Plain text
-#: ipptool.man:128
-msgid "Specifies that B<ipptool> will continue past errors."
-msgstr "Indiquer que B<ipptool> continuera après les erreurs."
+msgid "B<REPEAT-MATCH>"
+msgstr "B<REPEAT-MATCH>"
 
 #. type: TP
-#: ipptool.man:128
+#: ipptoolfile.5:305 ipptoolfile.5:405
 #, no-wrap
-msgid "B<-L>"
-msgstr "B<-L>"
+msgid "B<REPEAT-NO-MATCH>"
+msgstr "B<REPEAT-NO-MATCH>"
 
+# type: Plain text
 #. type: Plain text
-#: ipptool.man:132
+#: ipptoolfile.5:308
 msgid ""
-"Specifies that requests should be sent using the HTTP/1.0 \"Content-Length:"
-"\" header, which is required for conformance by all versions of IPP.  The "
-"default is to use \"Transfer-Encoding: chunked\" for requests with attached "
-"files and \"Content-Length:\" for requests without attached files."
+"Specifies that the current test should be repeated when the B<EXPECT> "
+"condition matches or does not match."
 msgstr ""
-"Indiquer que les requêtes seront envoyées avec l’en-tête HTTP/1.0 « Content-"
-"Length: », comme exigé pour conformité par toutes les versions d’IPP. Par "
-"défaut « Transfer-Encoding: chunked » est utilisé pour les requêtes avec "
-"fichiers joints et « Content-Length: » pour celles sans fichier joint."
+"Indiquer que l’actuel test doit être recommencé si la condition B<EXPECT> "
+"correspond ou pas."
 
-# type: TP
 #. type: TP
-#: ipptool.man:132
+#: ipptoolfile.5:308
 #, no-wrap
-msgid "B<-P>I<\\ filename.plist>"
-msgstr "B<-P>I<\\ nom_fichier.plist>"
+msgid "B<SAME-COUNT-AS >I<attribute-name>"
+msgstr "B<SAME-COUNT-AS >I<nom_attribut>"
 
 #. type: Plain text
-#: ipptool.man:136
+#: ipptoolfile.5:311
 msgid ""
-"Specifies that the test results should be written to the named XML (Apple "
-"plist) file in addition to the regular test report (B<-t>).  This option is "
-"incompatible with the B<-i> (interval) and B<-n> (repeat-count) options."
+"Requires the B<EXPECT> attribute to have the same number of values as the "
+"specified parallel attribute."
 msgstr ""
-"Indiquer que les résultats de test devront être écrits dans le XML nommé "
-"(plist d’Apple) en plus du rapport de test normal B<-t>. Cette option est "
-"incompatible avec les options B<-i> (intervalle) et B<-n> "
-"(nombre_répétitions)."
+"Exiger que l’attribut d’B<EXPECT> ait le même nombre de valeurs que "
+"l’attribut similaire indiqué."
 
 #. type: TP
-#: ipptool.man:136
+#: ipptoolfile.5:311
 #, no-wrap
-msgid "B<-S>"
-msgstr "B<-S>"
-
-# type: Plain text
-#. type: Plain text
-#: ipptool.man:139
-msgid "Forces (dedicated) TLS encryption when connecting to the server."
-msgstr "Forcer le chiffrement TLS dédié lors de la connexion au serveur."
+msgid "B<WITH-ALL-HOSTNAMES \">I<literal string>B<\">"
+msgstr "B<WITH-ALL-HOSTNAMES \">I<chaîne_littérale>B<\">"
 
-# type: TP
 #. type: TP
-#: ipptool.man:139
+#: ipptoolfile.5:313
 #, no-wrap
-msgid "B<-T>I<\\ seconds>"
-msgstr "B<-T>I<\\ secondes>"
+msgid "B<WITH-ALL-HOSTNAMES \"/>I<regular expression>B</\">"
+msgstr "B<WITH-ALL-HOSTNAMES \"/>I<exp_rationnelle>B</\">"
 
-# type: Plain text
 #. type: Plain text
-#: ipptool.man:142
-msgid "Specifies a timeout for IPP requests in seconds."
-msgstr "Définir le délai d'attente des requêtes IPP (en seconde)."
+#: ipptoolfile.5:316
+msgid "Requires that all URI values contain a matching hostname."
+msgstr ""
+"Exiger que toutes les valeurs d’URI contiennent un nom d’hôte correspondant."
 
-# type: TP
 #. type: TP
-#: ipptool.man:142
+#: ipptoolfile.5:316
 #, no-wrap
-msgid "B<-V>I<\\ version>"
-msgstr "B<-V>I<\\ version>"
-
-#. type: Plain text
-#: ipptool.man:145
-msgid ""
-"Specifies the default IPP version to use: 1.0, 1.1, 2.0, 2.1, or 2.2. If not "
-"specified, version 1.1 is used."
-msgstr ""
-"Définir la version par défaut d’IPP à utiliser : 1.0, 1.1, 2.0, 2.1, ou 2.2. "
-"Sans indication, la version 1.1 sera utilisée."
+msgid "B<WITH-ALL-RESOURCES \">I<literal string>B<\">"
+msgstr "B<WITH-ALL-RESOURCES \">I<chaîne_littérale>B<\">"
 
 #. type: TP
-#: ipptool.man:145
+#: ipptoolfile.5:318
 #, no-wrap
-msgid "B<-X>"
-msgstr "B<-X>"
-
-#. type: Plain text
-#: ipptool.man:149
-msgid ""
-"Specifies that XML (Apple plist) output is desired instead of the plain text "
-"report.  This option is incompatible with the B<-i> (interval) and B<-n> "
-"(repeat-count) options."
-msgstr ""
-"Indiquer qu’une sortie XML (plist d’Apple) est demandée plutôt qu’en texte "
-"pur. Cette option est incompatible avec les options B<-i> (intervalle) et B<-"
-"n> (nombre_répétitions)."
+msgid "B<WITH-ALL-RESOURCES \"/>I<regular expression>B</\">"
+msgstr "B<WITH-ALL-RESOURCES \"/>I<exp_rationnelle>B</\">"
 
 #. type: Plain text
-#: ipptool.man:152
+#: ipptoolfile.5:321
 msgid ""
-"Specifies that CSV (comma-separated values) output is desired instead of the "
-"plain text output."
+"Requires that all URI values contain a matching resource (including "
+"leading /)."
 msgstr ""
-"Indiquer qu’une sortie CSV (valeurs séparées par des virgules) est demandée "
-"plutôt qu’en texte pur."
+"Exiger que toutes les valeurs d’URI contiennent une ressource correspondante "
+"y compris le « / » de début)"
 
-# type: TP
 #. type: TP
-#: ipptool.man:152
+#: ipptoolfile.5:321
 #, no-wrap
-msgid "B<-d>I<\\ name=value>"
-msgstr "B<-d>I<\\ nom=valeur>"
-
-# type: Plain text
-#. type: Plain text
-#: ipptool.man:155
-msgid "Defines the named variable."
-msgstr "Définir la variable nommée."
+msgid "B<WITH-ALL-SCHEMES \">I<literal string>B<\">"
+msgstr "B<WITH-ALL-SCHEMES \">I<chaîne_littérale>B<\">"
 
-# type: TP
 #. type: TP
-#: ipptool.man:155
+#: ipptoolfile.5:323
 #, no-wrap
-msgid "B<-f>I<\\ filename>"
-msgstr "B<-f>I<\\ nom_fichier>"
-
-# type: Plain text
-#. type: Plain text
-#: ipptool.man:158
-msgid "Defines the default request filename for tests."
-msgstr "Indiquer le nom du fichier de requêtes par défaut pour les tests."
+msgid "B<WITH-ALL-SCHEMES \"/>I<regular expression>B</\">"
+msgstr "B<WITH-ALL-SCHEMES \"/>I<exp_rationnelle>B</\">"
 
 #. type: Plain text
-#: ipptool.man:161
-msgid "Validate HTTP response headers."
-msgstr "Valider les en-têtes de réponse HTTP."
+#: ipptoolfile.5:326
+msgid "Requires that all URI values contain a matching scheme."
+msgstr ""
+"Exiger que toutes les valeurs d’URI contiennent un schéma correspondant."
 
-# type: TP
 #. type: TP
-#: ipptool.man:161
+#: ipptoolfile.5:326
 #, no-wrap
-msgid "B<-i>I<\\ seconds>"
-msgstr "B<-i>I<\\ secondes>"
+msgid "B<WITH-ALL-VALUES \">I<literal string>B<\">"
+msgstr "B<WITH-ALL-VALUES \">I<chaîne_littérale>B<\">"
 
 #. type: Plain text
-#: ipptool.man:167
+#: ipptoolfile.5:329
 msgid ""
-"Specifies that the (last)  I<testfile> should be repeated at the specified "
-"interval.  This option is incompatible with the B<-X> (XML plist output) "
-"option."
+"Requires that all values of the B<EXPECT> attribute match the literal "
+"string. Comparisons are case-sensitive."
 msgstr ""
-"Indiquer que le (dernier) fichier I<fichier_test> sera repris après "
-"l’intervalle donné. Cette option est incompatible avec l’option B<-X> "
-"(sortie plist XML)."
+"Exiger que toutes les valeurs de l’attribut d’B<EXPECT> correspondent à la "
+"chaîne littérale. Les comparaisons sont sensibles à la casse."
 
-# type: Plain text
-#. type: Plain text
-#: ipptool.man:170
-msgid "Specifies that plain text output is desired."
-msgstr "Définir si une sortie en texte pur est désirée."
+#. type: TP
+#: ipptoolfile.5:329
+#, no-wrap
+msgid "B<WITH-ALL-VALUES E<lt>>I<number>"
+msgstr "B<WITH-ALL-VALUES E<lt>>I<nombre>"
 
 #. type: TP
-#: ipptool.man:170
+#: ipptoolfile.5:331
 #, no-wrap
-msgid "B<-n>I<\\ repeat-count>"
-msgstr "B<-n> I<\\ nombre_répétitions>"
+msgid "B<WITH-ALL-VALUES =>I<number>"
+msgstr "B<WITH-ALL-VALUES =>I<nombre>"
+
+#. type: TP
+#: ipptoolfile.5:333
+#, no-wrap
+msgid "B<WITH-ALL-VALUES E<gt>>I<number>"
+msgstr "B<WITH-ALL-VALUES E<gt>>I<nombre>"
+
+#. type: TP
+#: ipptoolfile.5:335
+#, no-wrap
+msgid "B<WITH-ALL-VALUES >I<number>[I<,...,number>]"
+msgstr "B<WITH-ALL-VALUES >I<nombre>[I<,...,nombre>]"
 
 #. type: Plain text
-#: ipptool.man:176
+#: ipptoolfile.5:338
 msgid ""
-"Specifies that the (last)  I<testfile> should be repeated the specified "
-"number of times.  This option is incompatible with the I<-X> (XML plist "
-"output) option."
+"Requires that all values of the B<EXPECT> attribute match the number(s) or "
+"numeric comparison. When comparing rangeOfInteger values, the \"E<lt>\" and "
+"\"E<gt>\" operators only check the upper bound of the range."
 msgstr ""
-"Indiquer que le (dernier) fichier I<fichier_test> sera repris le nombre de "
-"fois donné. Cette option est incompatible avec l’option B<-X> (sortie plist "
-"XML)."
+"Exiger que toutes les valeurs de l’attribut d’B<EXPECT> correspondent au(x) "
+"nombre(s) ou à la comparaison numérique. Lors de la comparaison des valeurs "
+"d’intervalle de nombres entiers, les opérateurs « E<lt> » et « E<gt> » "
+"contrôlent seulement la limite supérieure de l’intervalle."
 
-#. type: Plain text
-#: ipptool.man:179
-msgid "Be quiet and produce no output."
-msgstr "Rester silencieux et ne produire aucune sortie"
+#. type: TP
+#: ipptoolfile.5:338
+#, no-wrap
+msgid "B<WITH-ALL-VALUES \"false\">"
+msgstr "B<WITH-ALL-VALUES \"false\">"
+
+#. type: TP
+#: ipptoolfile.5:340
+#, no-wrap
+msgid "B<WITH-ALL-VALUES \"true\">"
+msgstr "B<WITH-ALL-VALUES \"true\">"
 
 #. type: Plain text
-#: ipptool.man:182
+#: ipptoolfile.5:343
 msgid ""
-"Specifies that CUPS test report output is desired instead of the plain text "
-"output."
+"Requires that all values of the B<EXPECT> attribute match the boolean value "
+"given."
 msgstr ""
-"Définir si le rapport de test de CUPS plutôt qu’une sortie en texte pur est "
-"désiré."
+"Exiger que toutes les valeurs de l’attribut d’B<EXPECT> correspondent à la "
+"valeur booléenne donnée"
+
+#. type: TP
+#: ipptoolfile.5:343
+#, no-wrap
+msgid "B<WITH-ALL-VALUES \"/>I<regular expression>B</\">"
+msgstr "B<WITH-ALL-VALUES \"/>I<expr_rationnelle>B</\">"
 
 #. type: Plain text
-#: ipptool.man:186
+#: ipptoolfile.5:346
 msgid ""
-"Specifies that all request and response attributes should be output in CUPS "
-"test mode (B<-t>).  This is the default for XML output."
+"Requires that all values of the B<EXPECT> attribute match the regular "
+"expression, which must conform to the POSIX regular expression syntax. "
+"Comparisons are case-sensitive."
 msgstr ""
-"Indiquer que tous les attributs de requête et réponse seront affichés lors "
-"du mode test (B<-t>) de CUPS. C’est la sortie XML par défaut."
+"Exiger que les valeurs de l’attribut d’B<EXPECT> correspondent à "
+"l’expression rationnelle, qui doit être conforme à la syntaxe POSIX des "
+"expressions rationnelles. Les comparaisons sont sensibles à la casse."
+
+#. type: TP
+#: ipptoolfile.5:346
+#, no-wrap
+msgid "B<WITH-HOSTNAME \">I<literal string>B<\">"
+msgstr "B<WITH-HOSTNAME \">I<chaîne_littérale>B<\">"
+
+#. type: TP
+#: ipptoolfile.5:348
+#, no-wrap
+msgid "B<WITH-HOSTNAME \"/>I<regular expression>B</\">"
+msgstr "B<WITH-HOSTNAME \"/>I<exp_rationnelle>B</\">"
+
+#. type: Plain text
+#: ipptoolfile.5:351
+msgid "Requires that at least one URI value contains a matching hostname."
+msgstr ""
+"Exiger qu’au moins une valeur d’URI contienne un nom d’hôte concordant."
+
+#. type: TP
+#: ipptoolfile.5:351
+#, no-wrap
+msgid "B<WITH-RESOURCE \">I<literal string>B<\">"
+msgstr "B<WITH-RESOURCE \">I<chaîne_littérale>B<\">"
+
+#. type: TP
+#: ipptoolfile.5:353
+#, no-wrap
+msgid "B<WITH-RESOURCE \"/>I<regular expression>B</\">"
+msgstr "B<WITH-RESOURCE \"/>I<exp_rationnelle>B</\">"
 
 #. type: Plain text
-#: ipptool.man:190
+#: ipptoolfile.5:356
 msgid ""
-"The B<ipptool> program returns 0 if all tests were successful and 1 "
-"otherwise."
+"Requires that at least one URI value contains a matching resource (including "
+"leading /)."
 msgstr ""
-"Le programme B<ipptool> retourne B<0> si tous les tests réussissent, sinon "
-"B<1>."
+"Exiger qu’au moins une valeur d’URI contienne une ressource correspondante."
+"(y compris le « / » de début)."
+
+#. type: TP
+#: ipptoolfile.5:356
+#, no-wrap
+msgid "B<WITH-SCHEME \">I<literal string>B<\">"
+msgstr "B<WITH-SCHEME \">I<chaîne_littérale>B<\">"
+
+#. type: TP
+#: ipptoolfile.5:358
+#, no-wrap
+msgid "B<WITH-SCHEME \"/>I<regular expression>B</\">"
+msgstr "B<WITH-SCHEME \"/>I<exp_rationnelle>B</\">"
 
-# type: Plain text
 #. type: Plain text
-#: ipptool.man:192
-msgid "The following standard files are available:"
-msgstr "Les fichiers standard suivants sont disponibles :"
+#: ipptoolfile.5:361
+msgid "Requires that at least one URI value contains a matching scheme."
+msgstr "Exiger qu’au moins une valeur d’URI contienne un schéma concordant."
+
+#. type: TP
+#: ipptoolfile.5:361
+#, no-wrap
+msgid "B<WITH-VALUE \">I<literal string>B<\">"
+msgstr "B<WITH-VALUE \">I<chaîne_littérale>B<\">"
 
 #. type: Plain text
-#: ipptool.man:223
+#: ipptoolfile.5:364
+msgid ""
+"Requires that at least one value of the B<EXPECT> attribute matches the "
+"literal string. Comparisons are case-sensitive."
+msgstr ""
+"Exiger qu’au moins une valeur de l’attribut d’B<EXPECT> corresponde à la "
+"chaîne littérale. Les comparaisons sont sensibles à la casse."
+
+#. type: TP
+#: ipptoolfile.5:364
+#, no-wrap
+msgid "B<WITH-VALUE E<lt>>I<number>"
+msgstr "B<WITH-VALUE E<lt>>I<nombre>"
+
+#. type: TP
+#: ipptoolfile.5:366
+#, no-wrap
+msgid "B<WITH-VALUE =>I<number>"
+msgstr "B<WITH-VALUE =>I<nombre>"
+
+#. type: TP
+#: ipptoolfile.5:368
+#, no-wrap
+msgid "B<WITH-VALUE E<gt>>I<number>"
+msgstr "B<WITH-VALUE E<gt>>I<nombre>"
+
+#. type: TP
+#: ipptoolfile.5:370
 #, no-wrap
+msgid "B<WITH-VALUE >I<number>[I<,...,number>]"
+msgstr "B<WITH-VALUE >I<nombre>[I<,...,nombre>]"
+
+#. type: Plain text
+#: ipptoolfile.5:373
 msgid ""
-"I<color.jpg>\n"
-"I<create-printer-subscription.test>\n"
-"I<document-a4.pdf>\n"
-"I<document-a4.ps>\n"
-"I<document-letter.pdf>\n"
-"I<document-letter.ps>\n"
-"I<get-completed-jobs.test>\n"
-"I<get-jobs.test>\n"
-"I<get-notifications.test>\n"
-"I<get-printer-attributes.test>\n"
-"I<get-subscriptions.test>\n"
-"I<gray.jpg>\n"
-"I<ipp-1.1.test>\n"
-"I<ipp-2.0.test>\n"
-"I<ipp-2.1.test>\n"
-"I<ipp-2.2.test>\n"
-"I<ipp-everywhere.test>\n"
-"I<onepage-a4.pdf>\n"
-"I<onepage-a4.ps>\n"
-"I<onepage-letter.pdf>\n"
-"I<onepage-letter.ps>\n"
-"I<print-job.test>\n"
-"I<print-job-deflate.test>\n"
-"I<print-job-gzip.test>\n"
-"I<testfile.jpg>\n"
-"I<testfile.pcl>\n"
-"I<testfile.pdf>\n"
-"I<testfile.ps>\n"
-"I<testfile.txt>\n"
-"I<validate-job.test>\n"
+"Requires that at least one value of the B<EXPECT> attribute matches the "
+"number(s) or numeric comparison. When comparing rangeOfInteger values, the "
+"\"E<lt>\" and \"E<gt>\" operators only check the upper bound of the range."
 msgstr ""
-"I<color.jpg>\n"
-"I<create-printer-subscription.test>\n"
-"I<document-a4.pdf>\n"
-"I<document-a4.ps>\n"
-"I<document-letter.pdf>\n"
-"I<document-letter.ps>\n"
-"I<get-completed-jobs.test>\n"
-"I<get-jobs.test>\n"
-"I<get-notifications.test>\n"
-"I<get-printer-attributes.test>\n"
-"I<get-subscriptions.test>\n"
-"I<gray.jpg>\n"
-"I<ipp-1.1.test>\n"
-"I<ipp-2.0.test>\n"
-"I<ipp-2.1.test>\n"
-"I<ipp-2.2.test>\n"
-"I<ipp-everywhere.test>\n"
-"I<onepage-a4.pdf>\n"
-"I<onepage-a4.ps>\n"
-"I<onepage-letter.pdf>\n"
-"I<onepage-letter.ps>\n"
-"I<print-job.test>\n"
-"I<print-job-deflate.test>\n"
-"I<print-job-gzip.test>\n"
-"I<testfile.jpg>\n"
-"I<testfile.pcl>\n"
-"I<testfile.pdf>\n"
-"I<testfile.ps>\n"
-"I<testfile.txt>\n"
-"I<validate-job.test>\n"
+"Exiger qu’au moins une valeur de l’attribut d’B<EXPECT> corresponde au(x) "
+"nombre(s) ou à la comparaison numérique. Lors de la comparaison des valeurs "
+"d’intervalle de nombres entiers, les opérateurs « E<lt> » et « E<gt> » "
+"contrôlent seulement la limite supérieure de l’intervalle."
+
+#. type: TP
+#: ipptoolfile.5:373
+#, no-wrap
+msgid "B<WITH-VALUE \"false\">"
+msgstr "B<WITH-VALUE \"false\">"
+
+#. type: TP
+#: ipptoolfile.5:375
+#, no-wrap
+msgid "B<WITH-VALUE \"true\">"
+msgstr "B<WITH-VALUE \"true\">"
 
 #. type: Plain text
-#: ipptool.man:228
+#: ipptoolfile.5:378
 msgid ""
-"The B<ipptool> program is unique to CUPS and conforms to the Internet "
-"Printing Protocol up to version 2.2."
+"Requires that at least one value of the B<EXPECT> attribute matches the "
+"boolean value given."
+msgstr ""
+"Exiger qu’au moins une valeur de l’attribut d’B<EXPECT> corresponde à la "
+"valeur booléenne donnée"
+
+#. type: TP
+#: ipptoolfile.5:378
+#, no-wrap
+msgid "B<WITH-VALUE \"/>I<regular expression>B</\">"
+msgstr "B<WITH-VALUE \"/>I<exp_rationnelle>B</\">"
+
+#. type: Plain text
+#: ipptoolfile.5:381
+msgid ""
+"Requires that at least one value of the B<EXPECT> attribute matches the "
+"regular expression, which must conform to the POSIX regular expression "
+"syntax. Comparisons are case-sensitive."
+msgstr ""
+"Exiger qu’au moins une valeur de l’attribut d’B<EXPECT> corresponde à "
+"l’expression rationnelle, qui doit être conforme à la syntaxe POSIX des "
+"expressions rationnelles. Les comparaisons sont sensibles à la casse."
+
+#. type: TP
+#: ipptoolfile.5:381
+#, no-wrap
+msgid "B<WITH-VALUE-FROM >I<attribute-name>"
+msgstr "B<WITH-VALUE-FROM >I<nom_attribut>"
+
+#. type: Plain text
+#: ipptoolfile.5:385
+msgid ""
+"Requires that the value(s) of the B<EXPECT> attribute matches the value(s) "
+"in the specified attribute.  For example, \"EXPECT job-sheets WITH-VALUE-"
+"FROM job-sheets-supported\" requires that the \"job-sheets\" value is listed "
+"as a value of the \"job-sheets-supported\" attribute."
+msgstr ""
+"Exiger que la(es) valeur(s) de l’attribut B<EXPECT> corresponde(nt) à(ux) "
+"valeur(s) dans l’attribut indiqué.  Par exemple, « EXPECT job-sheets WITH-"
+"VALUE-FROM job-sheets-supported » exige que la valeur « job-sheets » soit "
+"listée comme valeur de l’attribut « job-sheets-supported »."
+
+#. type: SS
+#: ipptoolfile.5:385
+#, no-wrap
+msgid "STATUS PREDICATES"
+msgstr "PRÉDICATS STATUS "
+
+# type: Plain text
+#. type: Plain text
+#: ipptoolfile.5:387
+msgid ""
+"The following predicates are understood following the B<STATUS> test "
+"directive:"
+msgstr ""
+"Les prédicats ci-dessous sont compris suivant la directive de test "
+"B<STATUS> :"
+
+#. type: Plain text
+#: ipptoolfile.5:390
+msgid ""
+"Defines the variable to \"1\" when the B<STATUS> matches. A side-effect of "
+"this predicate is that this B<STATUS> will never fail a test."
+msgstr ""
+"Définir la variable à B<1> quand le B<STATUS> correspond. Un effet de bord "
+"de ce prédicat est que ce B<STATUS> n’échouera jamais à un test."
+
+#. type: Plain text
+#: ipptoolfile.5:393
+msgid ""
+"Defines the variable to \"1\" when the B<STATUS> does not match. A side-"
+"effect of this predicate is that this B<STATUS> will never fail a test."
+msgstr ""
+"Définir la variable à B<1> quand le B<STATUS> ne correspond pas. Un effet de "
+"bord de ce prédicat est que ce B<STATUS> n’échouera jamais à un test."
+
+#. type: Plain text
+#: ipptoolfile.5:396
+msgid "Makes the B<STATUS> apply only if the specified variable is defined."
+msgstr "Appliquer le B<STATUS> seulement si la variable indiquée est définie."
+
+#. type: Plain text
+#: ipptoolfile.5:399
+msgid ""
+"Makes the B<STATUS> apply only if the specified variable is not defined."
+msgstr ""
+"Appliquer le B<STATUS> seulement si la variable indiquée n’est pas définie."
+
+# type: Plain text
+#. type: Plain text
+#: ipptoolfile.5:403
+msgid ""
+"Specifies the maximum number of times to repeat. The default value is 1000."
+msgstr ""
+"Définir le nombre maximal de répétitions. La valeur par défaut est B<1000>."
+
+#. type: Plain text
+#: ipptoolfile.5:408
+msgid ""
+"Specifies that the current test should be repeated when the response status-"
+"code matches or does not match the value specified by the STATUS directive."
+msgstr ""
+"Indiquer si le test actuel doit être recommencé si le code de l’état de la "
+"réponse correspond ou ne correspond pas à la valeur indiquée par la "
+"directive B<STATUS>"
+
+# type: SH
+#. type: SS
+#: ipptoolfile.5:408
+#, no-wrap
+msgid "OPERATION CODES"
+msgstr "CODES D’OPÉRATION"
+
+#. type: Plain text
+#: ipptoolfile.5:411
+msgid ""
+"Operation codes correspond to the hexadecimal numbers (0xHHHH) and names "
+"from RFC 8011 and other IPP extension specifications. Here is a complete "
+"list of names supported by B<ipptool>(8):"
+msgstr ""
+"Les codes d’opération correspondent aux nombres hexadécimaux (0xHHHH) et "
+"noms de la RFC 8011 et d’autres spécifications d’extensions IPP. Voici une "
+"liste complète de noms pris en charge par B<ipptool>(8) :"
+
+#. type: Plain text
+#: ipptoolfile.5:480
+#, no-wrap
+msgid ""
+"    Activate-Printer\n"
+"    CUPS-Accept-Jobs\n"
+"    CUPS-Add-Modify-Class\n"
+"    CUPS-Add-Modify-Printer\n"
+"    CUPS-Authenticate-Job\n"
+"    CUPS-Delete-Class\n"
+"    CUPS-Delete-Printer\n"
+"    CUPS-Get-Classes\n"
+"    CUPS-Get-Default\n"
+"    CUPS-Get-Devices\n"
+"    CUPS-Get-Document\n"
+"    CUPS-Get-PPD\n"
+"    CUPS-Get-PPDs\n"
+"    CUPS-Get-Printers\n"
+"    CUPS-Move-Job\n"
+"    CUPS-Reject-Jobs\n"
+"    CUPS-Set-Default\n"
+"    Cancel-Current-Job\n"
+"    Cancel-Job\n"
+"    Cancel-Jobs\n"
+"    Cancel-My-Jobs\n"
+"    Cancel-Subscription\n"
+"    Close-Job\n"
+"    Create-Job\n"
+"    Create-Job-Subscriptions\n"
+"    Create-Printer-Subscriptions\n"
+"    Deactivate-Printer\n"
+"    Disable-Printer\n"
+"    Enable-Printer\n"
+"    Get-Job-Attributes\n"
+"    Get-Jobs\n"
+"    Get-Notifications\n"
+"    Get-Printer-Attributes\n"
+"    Get-Printer-Support-Files\n"
+"    Get-Printer-Supported-Values\n"
+"    Get-Subscription-Attributes\n"
+"    Get-Subscriptions\n"
+"    Hold-Job\n"
+"    Hold-New-Jobs\n"
+"    Identify-Printer\n"
+"    Pause-Printer\n"
+"    Pause-Printer-After-Current-Job\n"
+"    Print-Job\n"
+"    Print-URI\n"
+"    Promote-Job\n"
+"    Purge-Jobs\n"
+"    Release-Held-New-Jobs\n"
+"    Release-Job\n"
+"    Renew-Subscription\n"
+"    Reprocess-Job\n"
+"    Restart-Job\n"
+"    Restart-Printer\n"
+"    Resubmit-Job\n"
+"    Resume-Job\n"
+"    Resume-Printer\n"
+"    Schedule-Job-After\n"
+"    Send-Document\n"
+"    Send-Hardcopy-Document\n"
+"    Send-Notifications\n"
+"    Send-URI\n"
+"    Set-Job-Attributes\n"
+"    Set-Printer-Attributes\n"
+"    Shutdown-Printer\n"
+"    Startup-Printer\n"
+"    Suspend-Current-Job\n"
+"    Validate-Document\n"
+"    Validate-Job\n"
+msgstr ""
+"    Activate-Printer\n"
+"    CUPS-Accept-Jobs\n"
+"    CUPS-Add-Modify-Class\n"
+"    CUPS-Add-Modify-Printer\n"
+"    CUPS-Authenticate-Job\n"
+"    CUPS-Delete-Class\n"
+"    CUPS-Delete-Printer\n"
+"    CUPS-Get-Classes\n"
+"    CUPS-Get-Default\n"
+"    CUPS-Get-Devices\n"
+"    CUPS-Get-Document\n"
+"    CUPS-Get-PPD\n"
+"    CUPS-Get-PPDs\n"
+"    CUPS-Get-Printers\n"
+"    CUPS-Move-Job\n"
+"    CUPS-Reject-Jobs\n"
+"    CUPS-Set-Default\n"
+"    Cancel-Current-Job\n"
+"    Cancel-Job\n"
+"    Cancel-Jobs\n"
+"    Cancel-My-Jobs\n"
+"    Cancel-Subscription\n"
+"    Close-Job\n"
+"    Create-Job\n"
+"    Create-Job-Subscriptions\n"
+"    Create-Printer-Subscriptions\n"
+"    Deactivate-Printer\n"
+"    Disable-Printer\n"
+"    Enable-Printer\n"
+"    Get-Job-Attributes\n"
+"    Get-Jobs\n"
+"    Get-Notifications\n"
+"    Get-Printer-Attributes\n"
+"    Get-Printer-Support-Files\n"
+"    Get-Printer-Supported-Values\n"
+"    Get-Subscription-Attributes\n"
+"    Get-Subscriptions\n"
+"    Hold-Job\n"
+"    Hold-New-Jobs\n"
+"    Identify-Printer\n"
+"    Pause-Printer\n"
+"    Pause-Printer-After-Current-Job\n"
+"    Print-Job\n"
+"    Print-URI\n"
+"    Promote-Job\n"
+"    Purge-Jobs\n"
+"    Release-Held-New-Jobs\n"
+"    Release-Job\n"
+"    Renew-Subscription\n"
+"    Reprocess-Job\n"
+"    Restart-Job\n"
+"    Restart-Printer\n"
+"    Resubmit-Job\n"
+"    Resume-Job\n"
+"    Resume-Printer\n"
+"    Schedule-Job-After\n"
+"    Send-Document\n"
+"    Send-Hardcopy-Document\n"
+"    Send-Notifications\n"
+"    Send-URI\n"
+"    Set-Job-Attributes\n"
+"    Set-Printer-Attributes\n"
+"    Shutdown-Printer\n"
+"    Startup-Printer\n"
+"    Suspend-Current-Job\n"
+"    Validate-Document\n"
+"    Validate-Job\n"
+"    Activate-Printer\n"
+"    CUPS-Accept-Jobs\n"
+"    CUPS-Add-Modify-Class\n"
+"    CUPS-Add-Modify-Printer\n"
+"    CUPS-Authenticate-Job\n"
+"    CUPS-Delete-Class\n"
+"    CUPS-Delete-Printer\n"
+"    CUPS-Get-Classes\n"
+"    CUPS-Get-Default\n"
+"    CUPS-Get-Devices\n"
+"    CUPS-Get-Document\n"
+"    CUPS-Get-PPD\n"
+"    CUPS-Get-PPDs\n"
+"    CUPS-Get-Printers\n"
+"    CUPS-Move-Job\n"
+"    CUPS-Reject-Jobs\n"
+"    CUPS-Set-Default\n"
+"    Cancel-Current-Job\n"
+"    Cancel-Job\n"
+"    Cancel-Jobs\n"
+"    Cancel-My-Jobs\n"
+"    Cancel-Subscription\n"
+"    Close-Job\n"
+"    Create-Job\n"
+"    Create-Job-Subscription\n"
+"    Create-Printer-Subscription\n"
+"    Deactivate-Printer\n"
+"    Disable-Printer\n"
+"    Enable-Printer\n"
+"    Get-Job-Attributes\n"
+"    Get-Jobs\n"
+"    Get-Notifications\n"
+"    Get-Printer-Attributes\n"
+"    Get-Printer-Support-Files\n"
+"    Get-Printer-Supported-Values\n"
+"    Get-Subscription-Attributes\n"
+"    Get-Subscriptions\n"
+"    Hold-Job\n"
+"    Hold-New-Jobs\n"
+"    Identify-Printer\n"
+"    Pause-Printer\n"
+"    Pause-Printer-After-Current-Job\n"
+"    Print-Job\n"
+"    Print-URI\n"
+"    Promote-Job\n"
+"    Purge-Jobs\n"
+"    Release-Held-New-Jobs\n"
+"    Release-Job\n"
+"    Renew-Subscription\n"
+"    Reprocess-Job\n"
+"    Restart-Job\n"
+"    Restart-Printer\n"
+"    Resubmit-Job\n"
+"    Resume-Job\n"
+"    Resume-Printer\n"
+"    Schedule-Job-After\n"
+"    Send-Document\n"
+"    Send-Hardcopy-Document\n"
+"    Send-Notifications\n"
+"    Send-URI\n"
+"    Set-Job-Attributes\n"
+"    Set-Printer-Attributes\n"
+"    Shutdown-Printer\n"
+"    Startup-Printer\n"
+"    Suspend-Current-Job\n"
+"    Validate-Document\n"
+"    Validate-Job\n"
+
+# type: SH
+#. type: SS
+#: ipptoolfile.5:481
+#, no-wrap
+msgid "STATUS CODES"
+msgstr "CODES D’ÉTAT"
+
+#. type: Plain text
+#: ipptoolfile.5:484
+msgid ""
+"Status codes correspond to the hexadecimal numbers (0xHHHH) and names from "
+"RFC 8011 and other IPP extension specifications. Here is a complete list of "
+"the names supported by B<ipptool>(8):"
+msgstr ""
+"Les codes d’état correspondent aux nombres hexadécimaux (0xHHHH) et noms de "
+"la RFC 8011 et d’autres spécifications d’extensions IPP. Voici une liste "
+"complète de noms pris en charge par B<ipptool>(8) :"
+
+#. type: Plain text
+#: ipptoolfile.5:543
+#, no-wrap
+msgid ""
+"    client-error-account-authorization-failed\n"
+"    client-error-account-closed\n"
+"    client-error-account-info-needed\n"
+"    client-error-account-limit-reached\n"
+"    client-error-attributes-not-settable\n"
+"    client-error-attributes-or-values-not-supported\n"
+"    client-error-bad-request\n"
+"    client-error-charset-not-supported\n"
+"    client-error-compression-error\n"
+"    client-error-compression-not-supported\n"
+"    client-error-conflicting-attributes\n"
+"    client-error-document-access-error\n"
+"    client-error-document-format-error\n"
+"    client-error-document-format-not-supported\n"
+"    client-error-document-password-error\n"
+"    client-error-document-permission-error\n"
+"    client-error-document-security-error\n"
+"    client-error-document-unprintable-error\n"
+"    client-error-forbidden\n"
+"    client-error-gone\n"
+"    client-error-ignored-all-notifications\n"
+"    client-error-ignored-all-subscriptions\n"
+"    client-error-not-authenticated\n"
+"    client-error-not-authorized\n"
+"    client-error-not-found\n"
+"    client-error-not-possible\n"
+"    client-error-print-support-file-not-found\n"
+"    client-error-request-entity-too-large\n"
+"    client-error-request-value-too-long\n"
+"    client-error-timeout\n"
+"    client-error-too-many-subscriptions\n"
+"    client-error-uri-scheme-not-supported\n"
+"    cups-error-account-authorization-failed\n"
+"    cups-error-account-closed\n"
+"    cups-error-account-info-needed\n"
+"    cups-error-account-limit-reached\n"
+"    cups-see-other\n"
+"    redirection-other-site\n"
+"    server-error-busy\n"
+"    server-error-device-error\n"
+"    server-error-internal-error\n"
+"    server-error-job-canceled\n"
+"    server-error-multiple-document-jobs-not-supported\n"
+"    server-error-not-accepting-jobs\n"
+"    server-error-operation-not-supported\n"
+"    server-error-printer-is-deactivated\n"
+"    server-error-service-unavailable\n"
+"    server-error-temporary-error\n"
+"    server-error-version-not-supported\n"
+"    successful-ok\n"
+"    successful-ok-but-cancel-subscription\n"
+"    successful-ok-conflicting-attributes\n"
+"    successful-ok-events-complete\n"
+"    successful-ok-ignored-notifications\n"
+"    successful-ok-ignored-or-substituted-attributes\n"
+"    successful-ok-ignored-subscriptions\n"
+"    successful-ok-too-many-events\n"
 msgstr ""
-"Le programme B<ipptool> est particulier à CUPS et est conforme au protocole "
-"IPP jusqu’à la version 2.2."
-
-#. type: Plain text
-#: ipptool.man:230
-msgid "Get a list of completed jobs for \"myprinter\":"
-msgstr "Obtenir une liste de travaux terminés pour « mon_imprimante » :"
+"    client-error-account-authorization-failed\n"
+"    client-error-account-closed\n"
+"    client-error-account-info-needed\n"
+"    client-error-account-limit-reached\n"
+"    client-error-attributes-not-settable\n"
+"    client-error-attributes-or-values-not-supported\n"
+"    client-error-bad-request\n"
+"    client-error-charset-not-supported\n"
+"    client-error-compression-error\n"
+"    client-error-compression-not-supported\n"
+"    client-error-conflicting-attributes\n"
+"    client-error-document-access-error\n"
+"    client-error-document-format-error\n"
+"    client-error-document-format-not-supported\n"
+"    client-error-document-password-error\n"
+"    client-error-document-permission-error\n"
+"    client-error-document-security-error\n"
+"    client-error-document-unprintable-error\n"
+"    client-error-forbidden\n"
+"    client-error-gone\n"
+"    client-error-ignored-all-notifications\n"
+"    client-error-ignored-all-subscriptions\n"
+"    client-error-not-authenticated\n"
+"    client-error-not-authorized\n"
+"    client-error-not-found\n"
+"    client-error-not-possible\n"
+"    client-error-print-support-file-not-found\n"
+"    client-error-request-entity-too-large\n"
+"    client-error-request-value-too-long\n"
+"    client-error-timeout\n"
+"    client-error-too-many-subscriptions\n"
+"    client-error-uri-scheme-not-supported\n"
+"    cups-error-account-authorization-failed\n"
+"    cups-error-account-closed\n"
+"    cups-error-account-info-needed\n"
+"    cups-error-account-limit-reached\n"
+"    cups-see-other\n"
+"    redirection-other-site\n"
+"    server-error-busy\n"
+"    server-error-device-error\n"
+"    server-error-internal-error\n"
+"    server-error-job-canceled\n"
+"    server-error-multiple-document-jobs-not-supported\n"
+"    server-error-not-accepting-jobs\n"
+"    server-error-operation-not-supported\n"
+"    server-error-printer-is-deactivated\n"
+"    server-error-service-unavailable\n"
+"    server-error-temporary-error\n"
+"    server-error-version-not-supported\n"
+"    successful-ok\n"
+"    successful-ok-but-cancel-subscription\n"
+"    successful-ok-conflicting-attributes\n"
+"    successful-ok-events-complete\n"
+"    successful-ok-ignored-notifications\n"
+"    successful-ok-ignored-or-substituted-attributes\n"
+"    successful-ok-ignored-subscriptions\n"
+"    successful-ok-too-many-events\n"
 
-#. type: Plain text
-#: ipptool.man:233
+#. type: SS
+#: ipptoolfile.5:544
 #, no-wrap
-msgid "    ipptool ipp://localhost/printers/myprinter get-completed-jobs.test\n"
-msgstr "    ipptool ipp://localhost/printers/mon_imprimante get-completed-jobs.test\n"
+msgid "TAGS"
+msgstr "ÉTIQUETTES"
 
 #. type: Plain text
-#: ipptool.man:236
+#: ipptoolfile.5:546
 msgid ""
-"Send email notifications to \"user@example.com\" when \"myprinter\" changes:"
+"Value and group tags correspond to the names from RFC 8011 and other IPP "
+"extension specifications. Here are the group tags:"
 msgstr ""
-"Envoyer des notifications par courriel à « user@example.com » quand "
-"« mon_imprimante » change :"
+"Les étiquettes de valeur et de groupe correspondent aux noms de la RFC 8011 "
+"et d’autres spécifications d’extensions IPP. Voici les étiquettes de groupe :"
 
 #. type: Plain text
-#: ipptool.man:240
+#: ipptoolfile.5:555
 #, no-wrap
 msgid ""
-"    ipptool -d recipient=mailto:user@example.com \\e\n"
-"        ipp://localhost/printers/myprinter create-printer-subscription.test\n"
+"    document-attributes-tag\n"
+"    event-notification-attributes-tag\n"
+"    job-attributes-tag\n"
+"    operation-attributes-tag\n"
+"    printer-attributes-tag\n"
+"    subscription-attributes-tag\n"
+"    unsupported-attributes-tag\n"
 msgstr ""
-"    ipptool -d recipient=mailto:user@example.com \\e\n"
-"        ipp://localhost/printers/mon_imprimante create-printer-subscription.test\n"
+"    document-attributes-tag\n"
+"    event-notification-attributes-tag\n"
+"    job-attributes-tag\n"
+"    operation-attributes-tag\n"
+"    printer-attributes-tag\n"
+"    subscription-attributes-tag\n"
+"    unsupported-attributes-tag\n"
 
 #. type: Plain text
-#: ipptool.man:246
-msgid ""
-"B<ipptoolfile>(5), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
-"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
-"ipp)  RFC 8011 (http://tools.ietf.org/html/rfc8011),"
-msgstr ""
-"B<ipptoolfile>(5), IANA IPP Registry (E<lt>URL:I<http://www.iana.org/"
-"assignments/ipp-registrations1>E<gt>), PWG Internet Printing Protocol "
-"Workgroup (E<lt>URL:I<http://www.pwg.org/ipp1>E<gt>), RFC 8011 (E<lt>URL:"
-"I<http://tools.ietf.org/html/rfc80111>E<gt>)"
+#: ipptoolfile.5:558
+msgid "Here are the value tags:"
+msgstr "Voici les étiquettes de valeur :"
 
-# type: TH
-#. type: TH
-#: lpadmin.man:13
+#. type: Plain text
+#: ipptoolfile.5:585
 #, no-wrap
-msgid "lpadmin"
-msgstr "lpadmin"
+msgid ""
+"    admin-define\n"
+"    boolean\n"
+"    charset\n"
+"    collection\n"
+"    dateTime\n"
+"    default\n"
+"    delete-attribute\n"
+"    enum\n"
+"    integer\n"
+"    keyword\n"
+"    mimeMediaType\n"
+"    nameWithLanguage\n"
+"    nameWithoutLanguage\n"
+"    naturalLanguage\n"
+"    no-value\n"
+"    not-settable\n"
+"    octetString\n"
+"    rangeOfInteger\n"
+"    resolution\n"
+"    textWithLanguage\n"
+"    textWithoutLanguage\n"
+"    unknown\n"
+"    unsupported\n"
+"    uri\n"
+"    uriScheme\n"
+msgstr ""
+"    admin-define\n"
+"    boolean\n"
+"    charset\n"
+"    collection\n"
+"    dateTime\n"
+"    default\n"
+"    delete-attribute\n"
+"    enum\n"
+"    integer\n"
+"    keyword\n"
+"    mimeMediaType\n"
+"    nameWithLanguage\n"
+"    nameWithoutLanguage\n"
+"    naturalLanguage\n"
+"    no-value\n"
+"    not-settable\n"
+"    octetString\n"
+"    rangeOfInteger\n"
+"    resolution\n"
+"    textWithLanguage\n"
+"    textWithoutLanguage\n"
+"    unknown\n"
+"    unsupported\n"
+"    uri\n"
+"    uriScheme\n"
 
-#. type: TH
-#: lpadmin.man:13
+# type: SH
+#. type: SS
+#: ipptoolfile.5:586
 #, no-wrap
-msgid "19 August 2018"
-msgstr "19 août 2018"
-
-# type: Plain text
-#. type: Plain text
-#: lpadmin.man:16
-msgid "lpadmin - configure cups printers and classes"
-msgstr "lpadmin - Configurer les imprimantes et classes d'imprimantes CUPS."
+msgid "VARIABLES"
+msgstr "VARIABLES"
 
-# type: Plain text
 #. type: Plain text
-#: lpadmin.man:28
+#: ipptoolfile.5:590
 msgid ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
-"B<-d> I<destination>"
+"The B<ipptool>(8)  program maintains a list of variables that can be used in "
+"any literal string or attribute value by specifying \"I<$variable-name>\". "
+"Aside from variables defined using the I<-d> option or B<DEFINE> directive, "
+"the following pre-defined variables are available:"
 msgstr ""
-"B<lpadmin> [ B<-E> ] [B<-U> I<identifiant> ] [ B<-h> I<serveur>[B<:"
-">I<port>] ] B<-d> I<destination>"
+"Le programme B<ipptool>(8) conserve une liste de variables qui peuvent être "
+"utilisées dans n’importe quelle chaîne littérale ou valeur d’attribut en "
+"indiquant « I<$nom_variable> ». En plus des variables définies en utilisant "
+"l’option « B<-d> » ou la directive B<DEFINE>, les variables prédéfinies "
+"suivantes sont disponibles :"
 
-# type: Plain text
-#. type: Plain text
-#: lpadmin.man:45
-msgid ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
-"B<-p> I<destination> [ B<-R> I<name-default> ] I<option(s)>"
-msgstr ""
-"B<lpadmin> [ B<-E> ] [B<-U> I<identifiant> ] [ B<-h> I<serveur>[B<:"
-">I<port>] ] B<-p> I<destination> [ B<-R> I<nom_par_défaut>] I<option(s)>"
+#. type: TP
+#: ipptoolfile.5:590
+#, no-wrap
+msgid "B<$$>"
+msgstr "B<$$>"
 
-# type: Plain text
 #. type: Plain text
-#: lpadmin.man:57
-msgid ""
-"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
-"B<-x> I<destination>"
-msgstr ""
-"B<lpadmin> [ B<-E> ] [B<-U> I<identifiant> ] [ B<-h> I<serveur>[B<:"
-">I<port>] ] B<-x> I<destination>"
+#: ipptoolfile.5:593
+msgid "Inserts a single \"$\" character."
+msgstr "Insérer un seul caractère « $ »."
 
-# type: Plain text
-#. type: Plain text
-#: lpadmin.man:60
-msgid ""
-"B<lpadmin> configures printer and class queues provided by CUPS.  It can "
-"also be used to set the server default printer or class."
-msgstr ""
-"B<lpadmin> configure les imprimantes et les files d’attente de classes "
-"d'imprimantes fournies par CUPS. Il est également utilisé pour définir "
-"l'imprimante ou classe d'imprimante par défaut."
+#. type: TP
+#: ipptoolfile.5:593
+#, no-wrap
+msgid "B<$ENV[>I<name>B<]>"
+msgstr "B<$ENV[>I<nom>B<]>"
 
-# type: Plain text
 #. type: Plain text
-#: lpadmin.man:62
+#: ipptoolfile.5:596
 msgid ""
-"When specified before the I<-d>, I<-p>, or I<-x> options, the I<-E> option "
-"forces encryption when connecting to the server."
+"Inserts the value of the named environment variable, or an empty string if "
+"the environment variable is not defined."
 msgstr ""
-"Lorsque l'option B<-E> est indiquée avant les options B<-d>, B<-p> ou B<-x>, "
-"la communication avec le serveur est chiffrée."
+"Insérer la valeur de la variable d’environnement nommée, ou une chaîne vide "
+"si la variable d’environnement n’est pas définie."
 
-# type: Plain text
-#. type: Plain text
-#: lpadmin.man:71
-msgid ""
-"The first form of the command (I<-d>) sets the default printer or class to "
-"I<destination>.  Subsequent print jobs submitted via the B<lp>(1)  or "
-"B<lpr>(1)  commands will use this destination unless the user specifies "
-"otherwise with the B<lpoptions>(1)  command."
-msgstr ""
-"La première méthode d'utilisation de la commande (avec B<-d>) définit "
-"l'imprimante ou la classe par défaut à I<destination>. Les impressions "
-"futures demandées par les commandes B<lp>(1) ou B<lpr>(1) utiliseront cette "
-"destination sauf avis contraire de l'utilisateur par l'utilisation de la "
-"commande B<lpoptions>(1)."
+# type: TP
+#. type: TP
+#: ipptoolfile.5:596
+#, fuzzy, no-wrap
+msgid "B<$date-current>"
+msgstr "B<-H> I<restart>"
 
-# type: Plain text
 #. type: Plain text
-#: lpadmin.man:73
+#: ipptoolfile.5:599
 msgid ""
-"The second form of the command (I<-p>) configures the named printer or "
-"class.  The additional options are described below."
+"Inserts the current date and time using the ISO-8601 format (\"yyyy-mm-ddThh:"
+"mm:ssZ\")."
 msgstr ""
-"La seconde forme de la commande (avec B<-p>) configure l'imprimante ou la "
-"classe indiquée. Les options supplémentaires sont décrites ci-dessous."
 
-# type: Plain text
+# type: TP
+#. type: TP
+#: ipptoolfile.5:599
+#, fuzzy, no-wrap
+msgid "B<$date-start>"
+msgstr "B<-H> I<restart>"
+
 #. type: Plain text
-#: lpadmin.man:76
+#: ipptoolfile.5:602
 msgid ""
-"The third form of the command (I<-x>) deletes the printer or class "
-"I<destination>.  Any jobs that are pending for the destination will be "
-"removed and any job that is currently printed will be aborted."
+"Inserts the starting date and time using the ISO-8601 format (\"yyyy-mm-"
+"ddThh:mm:ssZ\")."
 msgstr ""
-"La troisième forme de la commande (avec B<-x>) supprime l'imprimante ou "
-"classe I<destination>. Tous les travaux d'impression en attente sur cette "
-"destination sont supprimés, et les travaux en cours d'impression sont "
-"arrêtés."
 
-# type: Plain text
+# type: TP
+#. type: TP
+#: ipptoolfile.5:602
+#, no-wrap
+msgid "B<$filename>"
+msgstr "B<$nom_fichier>"
+
 #. type: Plain text
-#: lpadmin.man:78
-msgid "The following options are recognized when configuring a printer queue:"
-msgstr ""
-"Les options suivantes sont reconnues pour la configuration d'une file "
-"d'impression :"
+#: ipptoolfile.5:607
+msgid "Inserts the filename provided to B<ipptool>(8)  with the I<-f> option."
+msgstr "Insérer le nom de fichier fourni à B<ipptool>(8) avec l’option B<-f>."
 
-# type: TP
 #. type: TP
-#: lpadmin.man:78
+#: ipptoolfile.5:607
 #, no-wrap
-msgid "B<-c >I<class>"
-msgstr "B<-c> I<classe>"
+msgid "B<$filetype>"
+msgstr "B<$type_fichier>"
 
-# type: Plain text
 #. type: Plain text
-#: lpadmin.man:82
+#: ipptoolfile.5:612
 msgid ""
-"Adds the named I<printer> to I<class>.  If I<class> does not exist it is "
-"created automatically."
+"Inserts the MIME media type for the filename provided to B<ipptool>(8)  with "
+"the I<-f> option."
 msgstr ""
-"Ajouter l'imprimante I<imprimante> à la classe I<classe>. Si la I<classe> "
-"n'existe pas encore, elle est créée automatiquement."
+"Insérer le type MIME de média pour le nom de fichier fourni à B<ipptool>(8) "
+"avec l’option « B<-f> »."
 
-# type: TP
 #. type: TP
-#: lpadmin.man:82
+#: ipptoolfile.5:612
 #, no-wrap
-msgid "B<-i >I<ppd-file>"
-msgstr "B<-i >I<fichier_ppd>"
+msgid "B<$hostname>"
+msgstr "B<$nom_hôte>"
+
+#. type: Plain text
+#: ipptoolfile.5:616
+msgid "Inserts the hostname from the URI provided to B<ipptool>(8)."
+msgstr "Insérer le nom d’hôte à partir de l’URI fourni à B<ipptool>(8)."
 
 # type: TP
 #. type: TP
-#: lpadmin.man:84
+#: ipptoolfile.5:616
 #, no-wrap
-msgid "B<-P >I<ppd-file>"
-msgstr "B<-P >I<fichier_ppd>"
+msgid "B<$job-id>"
+msgstr "B<$id_travail>"
 
-# type: Plain text
 #. type: Plain text
-#: lpadmin.man:87
+#: ipptoolfile.5:619
 msgid ""
-"Specifies a PostScript Printer Description (PPD) file to use with the "
-"printer."
+"Inserts the last \"job-id\" attribute value returned in a test response or 0 "
+"if no \"job-id\" attribute has been seen."
+msgstr ""
+"Insérer la valeur du dernier identifiant de tâche renvoyée par la réponse "
+"d’un test ou B<0> si aucun identifiant n’a été trouvé."
+
+#. type: TP
+#: ipptoolfile.5:619
+#, no-wrap
+msgid "B<$job-uri>"
+msgstr "B<$uri_travail>"
+
+#. type: Plain text
+#: ipptoolfile.5:622
+msgid ""
+"Inserts the last \"job-uri\" attribute value returned in a test response or "
+"an empty string if no \"job-uri\" attribute has been seen."
 msgstr ""
-"Indiquer le chemin complet du fichier PPD (« PostScript Printer "
-"Description ») à utiliser avec cette imprimante."
+"Insérer la dernière valeur de l’attribut de l’URI de travail renvoyée par la "
+"réponse d’un test ou une chaîne vide si aucun attribut d’URI n’a été trouvé."
+
+#. type: TP
+#: ipptoolfile.5:622
+#, no-wrap
+msgid "B<$notify-subscription-id>"
+msgstr "B<$id_notification_souscription>"
 
 #. type: Plain text
-#: lpadmin.man:95
-#, fuzzy
+#: ipptoolfile.5:625
 msgid ""
-"Sets a standard PPD file for the printer from the I<model> directory or "
-"using one of the driver interfaces.  Use the I<-m> option with the "
-"B<lpinfo>(8)  command to get a list of supported models.  The model \"raw\" "
-"clears any existing PPD file and the model \"everywhere\" queries the "
-"printer referred to by the specified IPP I<device-uri>.  Note: The \"raw\" "
-"model is deprecated and will not be supported in a future version of CUPS."
+"Inserts the last \"notify-subscription-id\" attribute value returned in a "
+"test response or 0 if no \"notify-subscription-id\" attribute has been seen."
 msgstr ""
-"Définir un fichier PPD standard à partir du répertoire I<modèle> ou en "
-"utilisant une des interfaces de pilotes. Utilisez l'option B<-m> avec la "
-"commande B<lpinfo>(8) pour obtenir une liste des modèles pris en charge. Le "
-"modèle « raw » outrepasse tout fichier PPD existant et le modèle "
-"« everywhere » recherche l’imprimante désignée par l’I<uri_périphérique> IPP."
+"Insérer la dernière valeur de l’attribut d’identifiant de notification de "
+"souscription renvoyée dans une réponse de test ou B<0> si aucun attribut n’a "
+"été trouvé."
 
 #. type: TP
-#: lpadmin.man:95
+#: ipptoolfile.5:625
 #, no-wrap
-msgid "B<-o cupsIPPSupplies=true>"
-msgstr "B<-o cupsIPPSupplies=true>"
+msgid "B<$port>"
+msgstr "B<$port>"
+
+#. type: Plain text
+#: ipptoolfile.5:629
+msgid "Inserts the port number from the URI provided to B<ipptool>(8)."
+msgstr "Insérer le numéro du port à partir de l’URI fourni à B<ipptool>(8)."
 
 #. type: TP
-#: lpadmin.man:97
+#: ipptoolfile.5:629
 #, no-wrap
-msgid "B<-o cupsIPPSupplies=false>"
-msgstr "B<-o cupsIPPSupplies=false>"
+msgid "B<$resource>"
+msgstr "B<$ressource>"
 
-# type: Plain text
 #. type: Plain text
-#: lpadmin.man:100
-msgid "Specifies whether IPP supply level values should be reported."
+#: ipptoolfile.5:633
+msgid "Inserts the resource path from the URI provided to B<ipptool>(8)."
 msgstr ""
-"Indiquer si les valeurs de niveau d’équipement IPP doivent être rapportées."
+"Insérer le chemin de ressource à partir de l’URI fourni à B<ipptool>(8)."
 
 #. type: TP
-#: lpadmin.man:100
+#: ipptoolfile.5:633
 #, no-wrap
-msgid "B<-o cupsSNMPSupplies=true>"
-msgstr "B<-o cupsSNMPSupplies=true>"
+msgid "B<$scheme>"
+msgstr "B<$schéma>"
+
+#. type: Plain text
+#: ipptoolfile.5:637
+msgid "Inserts the scheme from the URI provided to B<ipptool>(8)."
+msgstr "Insérer le schéma depuis l’URI fourni à B<ipptool>(8)."
 
 #. type: TP
-#: lpadmin.man:102
+#: ipptoolfile.5:637
 #, no-wrap
-msgid "B<-o cupsSNMPSupplies=false>"
-msgstr "B<-o cupsSNMPSupplies=false>"
+msgid "B<$uri>"
+msgstr "B<$uri>"
 
 #. type: Plain text
-#: lpadmin.man:105
-msgid ""
-"Specifies whether SNMP supply level (RFC 3805) values should be reported."
-msgstr ""
-"Indiquer si les valeurs SNMP de niveau d’équipement (RFC 3805) doivent être "
-"rapportées."
+#: ipptoolfile.5:641
+msgid "Inserts the URI provided to B<ipptool>(8)."
+msgstr "Insérer l’URI fourni à B<ipptool>(8)."
 
 # type: TP
 #. type: TP
-#: lpadmin.man:105
+#: ipptoolfile.5:641
 #, no-wrap
-msgid "B<-o job-k-limit=>I<value>"
-msgstr "B<-o job-k-limit=>I<valeur>"
+msgid "B<$uriuser>"
+msgstr "B<$uri_utilisateur>"
 
-# type: Plain text
 #. type: Plain text
-#: lpadmin.man:109
-msgid ""
-"Sets the kilobyte limit for per-user quotas.  The value is an integer number "
-"of kilobytes; one kilobyte is 1024 bytes."
+#: ipptoolfile.5:646
+msgid "Inserts the username from the URI provided to B<ipptool>(8), if any."
 msgstr ""
-"Définir les quotas par utilisateur en kilo-octets. La valeur est un nombre "
-"entier de kilo-octets (valant 1 024 octets)."
+"Insérer l'identifiant à partir de l’URI fourni par B<ipptool>(8), s’il "
+"existe."
 
 # type: TP
 #. type: TP
-#: lpadmin.man:109
+#: ipptoolfile.5:646
 #, no-wrap
-msgid "B<-o job-page-limit=>I<value>"
-msgstr "B<-o job-page-limit=>I<valeur>"
+msgid "B<$user>"
+msgstr "B<$utilisateur>"
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:113
+#: ipptoolfile.5:649
+msgid "Inserts the current user's login name."
+msgstr "Insérer le nom de connexion de l’utilisateur actuel."
+
+#. type: Plain text
+#: ipptoolfile.5:654
 msgid ""
-"Sets the page limit for per-user quotas.  The value is the integer number of "
-"pages that can be printed; double-sided pages are counted as two pages."
+"B<ipptool>(1), IANA IPP Registry (http://www.iana.org/assignments/ipp-"
+"registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/"
+"ipp), RFC 8011 (http://tools.ietf.org/html/rfc8011)"
 msgstr ""
-"Définir le nombre maximal de pages disponibles par utilisateur. La valeur "
-"est un nombre entier de pages pouvant être imprimées. Les pages recto verso "
-"comptent pour deux pages."
+"B<ipptool>(1), IANA IPP Registry (E<lt>URL:I<http://www.iana.org/assignments/"
+"ipp-registrations>E<gt>), PWG Internet Printing Protocol Workgroup (E<lt>URL:"
+"I<http://www.pwg.org/ipp>E<gt>), RFC 8011 (E<lt>URL:I<http://tools.ietf.org/"
+"html/rfc8011>E<gt>)"
 
-# type: TP
-#. type: TP
-#: lpadmin.man:113
+# type: TH
+#. type: TH
+#: lp.1:10
 #, no-wrap
-msgid "B<-o job-quota-period=>I<value>"
-msgstr "B<-o job-quota-period=>I<valeur>"
+msgid "lp"
+msgstr "lp"
+
+# type: Plain text
+#. type: Plain text
+#: lp.1:13
+msgid "lp - print files"
+msgstr "lp - Imprimer des fichiers."
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:117
+#: lp.1:52
 msgid ""
-"Sets the accounting period for per-user quotas.  The value is an integer "
-"number of seconds; 86,400 seconds are in one day."
+"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-d >I<destination>[B</"
+">I<instance>] ] [ B<-h >I<hostname>[B<:>I<port>] ] [ B<-m> ] [ B<-n> I<num-"
+"copies> ] [ B<-o >I<option>[B<=>I<value>] ] [ B<-q> I<priority> ] [ B<-s> ] "
+"[ B<-t> I<title> ] [ B<-H> I<handling> ] [ B<-P> I<page-list> ] [ B<--> ] "
+"[ I<file(s)> ]"
 msgstr ""
-"Définir le temps maximal disponible par utilisateur. La valeur est un nombre "
-"entier de secondes. Une journée contient 86 400 secondes."
+"B<lp> [ B<-E> ] [ B<-U> I<identifiant> ] [ B<-c> ] [ B<-d> I<destination>[B</"
+">I<instance>] ] [ B<-h> I<nom_hôte>[B<:>I<port>] ] [ B<-m> ] [ B<-n> "
+"I<nombre_copies> ] [ B<-o> I<option>[B<=>I<valeur>] ] [ B<-q> I<priorité> ] "
+"[ B<-s> ] [ B<-t> I<titre> ] [ B<-H> I<méthode> ] [ B<-P> I<liste_pages> ] "
+"[ B<--> ] [ I<fichier(s)> ]"
 
-# type: TP
-#. type: TP
-#: lpadmin.man:117
-#, no-wrap
-msgid "B<-o job-sheets-default=>I<banner>"
-msgstr "B<-o job-sheets-default=>I<bannière>"
+# type: Plain text
+#. type: Plain text
+#: lp.1:84
+msgid ""
+"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h >I<hostname>[B<:"
+">I<port>] ] [ B<-i> I<job-id> ] [ B<-n> I<num-copies> ] [ B<-o "
+">I<option>[B<=>I<value>] ] [ B<-q> I<priority> ] [ B<-t> I<title> ] [ B<-H> "
+"I<handling> ] [ B<-P> I<page-list> ]"
+msgstr ""
+"B<lp> [ B<-E> ] [ B<-U> I<identifiant> ] [ B<-c> ] [ B<-h> I<nom_hôte>[B<:"
+">I<port>] ] [ B<-i> I<id_travail> ] [ B<-n> I<nombre_copies> ] [ B<-o> "
+"I<option>[B<=>I<valeur>] ] [ B<-q> I<priorité> ] [ B<-t> I<titre> ] [ B<-H> "
+"I<méthode> ] [ B<-P> I<liste_pages> ]"
 
-# type: TP
-#. type: TP
-#: lpadmin.man:119
+# type: Plain text
+#. type: Plain text
+#: lp.1:87
+msgid ""
+"B<lp> submits files for printing or alters a pending job.  Use a filename of "
+"\"-\" to force printing from the standard input."
+msgstr ""
+"B<lp> demande l'impression d'un fichier ou modifie un travail d'impression "
+"en attente. Utiliser « B<-> » comme nom de fichier pour forcer l'impression "
+"à partir de l'entrée standard."
+
+#. type: SS
+#: lp.1:87 lpr.1:57
 #, no-wrap
-msgid "B<-o job-sheets-default=>I<banner>B<,>I<banner>"
-msgstr "B<-o job-sheets-default=>I<bannière>B<,>I<bannière>"
+msgid "THE DEFAULT DESTINATION"
+msgstr "LA DESTINATION PAR DÉFAUT"
 
-# type: Plain text
 #. type: Plain text
-#: lpadmin.man:122
-msgid "Sets the default banner page(s) to use for print jobs."
+#: lp.1:94 lpr.1:64
+msgid ""
+"CUPS provides many ways to set the default destination. The B<LPDEST> and "
+"B<PRINTER> environment variables are consulted first.  If neither are set, "
+"the current default set using the B<lpoptions>(1)  command is used, followed "
+"by the default set using the B<lpadmin>(8)  command."
 msgstr ""
-"Fixer la (les) page(s) de bannière par défaut pour les travaux d'impression."
+"CUPS fournit plusieurs façons de spécifier la destination par défaut. Les "
+"variables d'environnement « B<LPDEST> » et « B<PRINTER> » sont lues en "
+"premier. Si aucune n'est paramétrée, la valeur par défaut, spécifiée en "
+"utilisant la commande B<lpoptions>(1) est utilisée, suivie par la valeur par "
+"défaut spécifiée en utilisant la commande B<lpadmin>(8)."
+
+# type: Plain text
+#. type: Plain text
+#: lp.1:96
+msgid "The following options are recognized by I<lp>:"
+msgstr "Les options suivantes sont reconnues par B<lp> :"
 
-# type: TP
 #. type: TP
-#: lpadmin.man:122
+#: lp.1:96
 #, no-wrap
-msgid "B<-o >I<name>B<=>I<value>"
-msgstr "B<-o >I<nom>B<=>I<valeur>"
+msgid "B<-->"
+msgstr "B<-->"
+
+# type: Plain text
+#. type: Plain text
+#: lp.1:99
+msgid ""
+"Marks the end of options; use this to print a file whose name begins with a "
+"dash (-)."
+msgstr ""
+"Marquer la fin des options ; à utiliser pour imprimer un fichier dont le nom "
+"commence par un tiret (« - »)."
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:128
+#: lp.1:109
 msgid ""
-"Sets a PPD option for the printer.  PPD options can be listed using the I<-"
-"l> option with the B<lpoptions>(1)  command."
+"This option is provided for backwards-compatibility only. On systems that "
+"support it, this option forces the print file to be copied to the spool "
+"directory before printing.  In CUPS, print files are always sent to the "
+"scheduler via IPP which has the same effect."
 msgstr ""
-"Définir une option PPD pour l'imprimante. La liste des options PPD peut être "
-"obtenue en utilisant l'option B<-l> de la commande B<lpoptions>(1)."
+"Cette option n'est fournie que pour des raisons de compatibilité avec les "
+"précédentes versions. Sur les systèmes le permettant, elle force la copie du "
+"fichier d'impression dans le répertoire spool avant impression. Avec CUPS, "
+"les fichiers d'impression sont envoyés à l'ordonnanceur à travers IPP. Le "
+"résultat est le même dans les deux cas."
 
 # type: TP
 #. type: TP
-#: lpadmin.man:128
+#: lp.1:109
 #, no-wrap
-msgid "B<-o >I<name>B<-default=>I<value>"
-msgstr "B<-o >I<nom>B<-default=>I<valeur>"
+msgid "B<-d >I<destination>"
+msgstr "B<-d >I<destination>"
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:132
-msgid ""
-"Sets a default server-side option for the destination.  Any print-time "
-"option can be defaulted, e.g., \"-o number-up-default=2\" to set the default "
-"\"number-up\" option value to 2."
-msgstr ""
-"Définir au niveau du serveur une option par défaut pour la destination. "
-"Toute option pouvant être définie au moment de l'impression peut avoir une "
-"valeur par défaut, par exemple « -o number-up-default=2 » pour définir "
-"l'option « number-up » par défaut à la valeur B<2>."
+#: lp.1:112 lpr.1:82
+msgid "Prints files to the named printer."
+msgstr "Imprimer les fichiers sur l'imprimante donnée."
 
 # type: TP
 #. type: TP
-#: lpadmin.man:132
+#: lp.1:115
 #, no-wrap
-msgid "B<-o port-monitor=>I<name>"
-msgstr "B<-o port-monitor=>I<nom>"
+msgid "B<-i >I<job-id>"
+msgstr "B<-i> I<id_travail>"
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:137
-msgid ""
-"Sets the binary communications program to use when printing, \"none\", \"bcp"
-"\", or \"tbcp\".  The default program is \"none\".  The specified port "
-"monitor must be listed in the printer's PPD file."
-msgstr ""
-"Fixer le programme à utiliser pour les communications binaires lors de "
-"l'impression : « none », « bcp » ou « tbcp ». Le programme par défaut est "
-"« none ». Le port écouté indiqué doit être listé dans le fichier PPD de "
-"l'imprimante."
+#: lp.1:118
+msgid "Specifies an existing job to modify."
+msgstr "Indiquer l'identifiant du travail d'impression à modifier."
 
-# type: TP
 #. type: TP
-#: lpadmin.man:137
+#: lp.1:118 lpr.1:95 ppdc.1:70
 #, no-wrap
-msgid "B<-o printer-error-policy=>I<name>"
-msgstr "B<-o printer-error-policy=>I<nom>"
+msgid "B<-m>"
+msgstr "B<-m>"
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:143
-#, fuzzy
-msgid ""
-"Sets the error policy to be used when the printer backend is unable to send "
-"the job to the printer.  The name must be one of \"abort-job\", \"retry-job"
-"\", \"retry-current-job\", or \"stop-printer\".  The default error policy is "
-"\"stop-printer\" for printers and \"retry-current-job\" for classes."
-msgstr ""
-"Fixer la politique à utiliser en cas d'erreur quand le programme de "
-"transmission responsable de l'impression n'arrive pas à envoyer le travail à "
-"l'imprimante. Le nom doit être soit « abort-job » (annuler l'impression), "
-"« retry-job » (réessayer), « retry-current-job » (réessayer l'impression en "
-"cours) ou « stop-printer » (arrêter l'imprimante). La politique par défaut "
-"en cas d'erreur est « stop-printer » pour les imprimantes, et « retry-"
-"current-job » pour les classes."
+#: lp.1:121
+msgid "Sends an email when the job is completed."
+msgstr "Envoyer un courrier électronique lorsque l'impression est terminée."
 
-# type: TP
-#. type: TP
-#: lpadmin.man:143
-#, no-wrap
-msgid "B<-o printer-is-shared=true>"
-msgstr "B<-o printer-is-shared=true>"
+# type: Plain text
+#. type: Plain text
+#: lp.1:124 lpr.1:88
+msgid "Sets the number of copies to print."
+msgstr "Nombre de copies à effectuer."
 
 # type: TP
 #. type: TP
-#: lpadmin.man:145
+#: lp.1:124
 #, no-wrap
-msgid "B<-o printer-is-shared=false>"
-msgstr "B<-o printer-is-shared=false>"
+msgid "B<-o \">I<name>B<=>I<value >[ ... I<name>B<=>I<value >]B<\">"
+msgstr "B<-o \">I<nom>B<=>I<valeur >[ ... I<nom>B<=>I<valeur >]B<\">"
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:150
-msgid ""
-"Sets the destination to shared/published or unshared/unpublished.  Shared/"
-"published destinations are publicly announced by the server on the LAN based "
-"on the browsing configuration in I<cupsd.conf>, while unshared/unpublished "
-"destinations are not announced.  The default value is \"true\"."
+#: lp.1:128
+msgid "Sets one or more job options.  See \"COMMON JOB OPTIONS\" below."
 msgstr ""
-"Placer la destination dans l'état partagée/publique ou non partagée/non "
-"publique. Les destinations partagées/publiques sont annoncées officiellement "
-"par le serveur sur le réseau local, en fonction de la configuration pour les "
-"recherches de B<cupsd.conf>, tandis que les imprimantes non partagées/non "
-"publiques ne sont pas annoncées. La valeur par défaut est « true »."
+"Définir une ou plusieurs options pour le travail d'impression. Consultez "
+"« OPTIONS COMMUNES DES TRAVAUX » ci-après."
 
 # type: TP
 #. type: TP
-#: lpadmin.man:150
+#: lp.1:128
 #, no-wrap
-msgid "B<-o printer-op-policy=>I<name>"
-msgstr "B<-o printer-op-policy=>I<nom>"
+msgid "B<-q >I<priority>"
+msgstr "B<-q> I<priorité>"
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:155
+#: lp.1:132
 msgid ""
-"Sets the IPP operation policy associated with the destination.  The name "
-"must be defined in the I<cupsd.conf> in a Policy section.  The default "
-"operation policy is \"default\"."
+"Sets the job priority from 1 (lowest) to 100 (highest).  The default "
+"priority is 50."
 msgstr ""
-"Fixer la politique des opérations IPP associée à l'imprimante. Le nom doit "
-"être défini dans B<cupsd.conf>, dans une section « Policy ». Par défaut, la "
-"politique des opérations est « default »."
-
-# type: TP
-#. type: TP
-#: lpadmin.man:155
-#, no-wrap
-msgid "B<-R >I<name>B<-default>"
-msgstr "B<-R >I<nom>B<-default>"
+"Définir la priorité du travail d'impression, de B<1> (minimale) à B<100> "
+"(maximale). La priorité par défaut est B<50>."
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:158
-msgid "Deletes the named option from I<printer>."
-msgstr "Supprimer les options données pour l'I<imprimante>."
+#: lp.1:135
+msgid "Do not report the resulting job IDs (silent mode.)"
+msgstr "Ne pas afficher le numéro du travail (mode silencieux)."
 
 # type: TP
 #. type: TP
-#: lpadmin.man:158
+#: lp.1:135
 #, no-wrap
-msgid "B<-r >I<class>"
-msgstr "B<-r >I<classe>"
+msgid "B<-t \">I<name>B<\">"
+msgstr "B<-t \">I<nom>B<\">"
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:162
-msgid ""
-"Removes the named I<printer> from I<class>.  If the resulting class becomes "
-"empty it is removed."
-msgstr ""
-"Supprimer l'I<imprimante> de la I<classe>. Si la classe d'imprimante devient "
-"vide, celle-ci est supprimée."
+#: lp.1:138
+msgid "Sets the job name."
+msgstr "Définir le I<nom> du travail."
 
+# type: TP
 #. type: TP
-#: lpadmin.man:162
+#: lp.1:138
 #, no-wrap
-msgid "B<-u allow:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
-msgstr "B<-u allow:>{I<utilisateur>|B<@>I<groupe>}{B<,>I<utilisateur>|B<,@>I<groupe>}*"
+msgid "B<-H >I<hh:mm>"
+msgstr "B<-H> I<hh:mm>"
 
+# type: TP
 #. type: TP
-#: lpadmin.man:164
+#: lp.1:140
 #, no-wrap
-msgid "B<-u deny:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
-msgstr "B<-u deny:>{I<utilisateur>|B<@>I<groupe>}{B<,>I<utilisateur>|B<,@>I<groupe>}*"
+msgid "B<-H hold>"
+msgstr "B<-H> I<hold>"
 
 # type: TP
 #. type: TP
-#: lpadmin.man:166
+#: lp.1:142
 #, no-wrap
-msgid "B<-u allow:all>"
-msgstr "B<-u> B<allow:>I<all>"
+msgid "B<-H immediate>"
+msgstr "B<-H> I<immediate>"
 
 # type: TP
 #. type: TP
-#: lpadmin.man:168
+#: lp.1:144
 #, no-wrap
-msgid "B<-u deny:none>"
-msgstr "B<-u> B<deny:>I<none>"
-
-# type: Plain text
-#. type: Plain text
-#: lpadmin.man:174
-msgid ""
-"Sets user-level access control on a destination.  Names starting with \"@\" "
-"are interpreted as UNIX groups.  The latter two forms turn user-level access "
-"control off.  Note: The user 'root' is not granted special access - using \"-"
-"u allow:foo,bar\" will allow users 'foo' and 'bar' to access the printer but "
-"NOT 'root'."
-msgstr ""
-"Définir les accès au niveau utilisateur sur une imprimante. Les noms "
-"commençant par un « @ » sont interprétés comme des groupes UNIX. Les deux "
-"dernières expressions désactivent les contrôles d'accès au niveau "
-"utilisateur. REMARQUE : le superutilisateur ne possède par d’accès spécial. "
-"L’utilisation de « -u allow:toto,tartempion » autorise les utilisateurs "
-"« toto » et « tartempion » à accéder à l’imprimante, mais PAS le "
-"« superutilisateur »."
+msgid "B<-H restart>"
+msgstr "B<-H> I<restart>"
 
 # type: TP
 #. type: TP
-#: lpadmin.man:174
+#: lp.1:146
 #, no-wrap
-msgid "B<-v \">I<device-uri>B<\">"
-msgstr "B<-v \">I<uri_périphérique>B<\">"
+msgid "B<-H resume>"
+msgstr "B<-H> I<resume>"
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:180
+#: lp.1:152
 msgid ""
-"Sets the I<device-uri> attribute of the printer queue.  Use the I<-v> option "
-"with the B<lpinfo>(8)  command to get a list of supported device URIs and "
-"schemes."
+"Specifies when the job should be printed.  A value of I<immediate> will "
+"print the file immediately, a value of I<hold> will hold the job "
+"indefinitely, and a UTC time value (HH:MM) will hold the job until the "
+"specified UTC (not local) time.  Use a value of I<resume> with the I<-i> "
+"option to resume a held job.  Use a value of I<restart> with the I<-i> "
+"option to restart a completed job."
 msgstr ""
-"Définir l'attribut I<uri_périphérique> de la file d'impression. Utiliser "
-"l'option B<-v> avec la commande B<lpinfo>(8) pour obtenir une liste des URI "
-"de périphérique géré ainsi que leur schéma."
+"Définir quand l'impression doit être effectuée. La valeur I<immediate> "
+"effectue l'impression immédiatement, la valeur I<hold> suspend l'impression "
+"pour un temps indéterminé, une heure (non locale) UTC (HH:MM) suspend "
+"l'impression jusqu'à l'heure donnée. Utilisez la valeur I<resume> avec "
+"l'option B<-i> pour reprendre un travail suspendu. Utilisez la valeur "
+"I<restart> avec l'option B<-i> pour relancer un travail terminé."
 
 # type: TP
 #. type: TP
-#: lpadmin.man:180
+#: lp.1:152
 #, no-wrap
-msgid "B<-D \">I<info>B<\">"
-msgstr "B<-D \">I<info>B<\">"
-
-# type: Plain text
-#. type: Plain text
-#: lpadmin.man:183
-msgid "Provides a textual description of the destination."
-msgstr "Définir une description textuelle de la destination."
+msgid "B<-P >I<page-list>"
+msgstr "B<-P> I<liste_pages>"
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:191
-#, fuzzy
+#: lp.1:157
 msgid ""
-"When specified before the B<-d>, B<-p>, or B<-x> options, forces the use of "
-"TLS encryption on the connection to the scheduler.  Otherwise, enables the "
-"destination and accepts jobs; this is the same as running the "
-"B<cupsaccept>(8)  and B<cupsenable>(8)  programs on the destination."
+"Specifies which pages to print in the document.  The list can contain a list "
+"of numbers and ranges (#-#) separated by commas, e.g., \"1,3-5,16\".  The "
+"page numbers refer to the output pages and not the document's original pages "
+"- options like \"number-up\" can affect the numbering of the pages."
 msgstr ""
-"Activer la destination et accepter les travaux d'impression. Cela est "
-"identique à l’exécution des programmes B<cupsaccept>(8) et B<cupsenable>(8) "
-"avec cette destination."
+"Définir quelles sont les pages du document à imprimer. Cette liste peut "
+"contenir des numéros ou des intervalles (#-#), séparés par des virgules (par "
+"exemple : 1,3-5,16). Les numéros de page font référence à la sortie des "
+"pages et non aux pages originales du document — des options telles que "
+"« number-up » peuvent affecter la numérotation des pages."
 
-# type: TP
-#. type: TP
-#: lpadmin.man:191
+# type: SH
+#. type: SS
+#: lp.1:157 lpr.1:112
 #, no-wrap
-msgid "B<-L \">I<location>B<\">"
-msgstr "B<-L \">I<emplacement>B<\">"
-
-# type: Plain text
-#. type: Plain text
-#: lpadmin.man:194
-msgid "Provides a textual location of the destination."
-msgstr "Définir un emplacement textuel de l'imprimante."
+msgid "COMMON JOB OPTIONS"
+msgstr "OPTIONS COMMUNES DES TRAVAUX"
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:199
+#: lp.1:161 lpr.1:116
 msgid ""
-"Unlike the System V printing system, CUPS allows printer names to contain "
-"any printable character except SPACE, TAB, \"/\", or \"#\".  Also, printer "
-"and class names are I<not> case-sensitive.  Finally, the CUPS version of "
-"B<lpadmin> may ask the user for an access password depending on the printing "
-"system configuration.  This differs from the System V version which requires "
-"the root user to execute this command."
+"Aside from the printer-specific options reported by the B<lpoptions>(1)  "
+"command, the following generic options are available:"
 msgstr ""
-"Contrairement au système d'impression System V, CUPS permet des noms "
-"d'imprimantes contenant tout caractère imprimable sauf ESPACE, TABULATION, "
-"« / » ou « # ». De plus, les noms d'imprimante et de classe ne sont B<pas> "
-"sensibles à la casse. Enfin, la version CUPS de B<lpadmin> peut demander un "
-"mot de passe, suivant la configuration du système, à la différence de la "
-"version System V qui demande le mot de passe du superutilisateur lors de "
-"l'exécution de cette commande."
+"En plus des options spécifiques des imprimantes, indiquées par "
+"B<lpoptions>(1), les options génériques suivantes sont disponibles :"
 
-# type: Plain text
-#. type: Plain text
-#: lpadmin.man:201
-msgid ""
-"The CUPS version of B<lpadmin> does not support all of the System V or "
-"Solaris printing system configuration options."
-msgstr ""
-"La version CUPS de B<lpadmin> ne reconnaît pas toutes les options de "
-"configuration disponibles dans les versions System V ou Solaris."
+# type: TP
+#. type: TP
+#: lp.1:161 lpr.1:116
+#, no-wrap
+msgid "B<-o job-sheets=>I<name>"
+msgstr "B<-o job-sheets=>I<nom>"
 
 #. type: Plain text
-#: lpadmin.man:203
+#: lp.1:165 lpr.1:120
 msgid ""
-"The double meaning of the B<-E> option is an unfortunate historical oddity."
+"Prints a cover page (banner) with the document.  The \"name\" can be "
+"\"classified\", \"confidential\", \"secret\", \"standard\", \"topsecret\", "
+"or \"unclassified\"."
 msgstr ""
+"Imprimer une page d’ouverture (bannière) avec le document. Le nom peut être "
+"« name », « classified », « confidential », « secret », « standard », "
+"« topsecret », ou « unclassified »."
 
-#. type: Plain text
-#: lpadmin.man:205
-msgid "Create an IPP Everywhere print queue:"
-msgstr "Créer une file d’impression IPP Everywhere :"
-
-#. type: Plain text
-#: lpadmin.man:208
+# type: TP
+#. type: TP
+#: lp.1:165 lpr.1:120
 #, no-wrap
-msgid "    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere\n"
-msgstr "    lpadmin -p mon_imprimante -E -v ipp://mon_imprimante.local/ipp/print -m everywhere\n"
+msgid "B<-o media=>I<size>"
+msgstr "B<-o media=>I<taille>"
 
 # type: Plain text
 #. type: Plain text
-#: lpadmin.man:216
+#: lp.1:168 lpr.1:123
 msgid ""
-"B<cupsaccept>(8), B<cupsenable>(8), B<lpinfo>(8), B<lpoptions>(1), CUPS "
-"Online Help (http://localhost:631/help)"
+"Sets the page size to I<size>. Most printers support at least the size names "
+"\"a4\", \"letter\", and \"legal\"."
 msgstr ""
-"B<cupsaccept>(8), B<cupsenable>(8), B<lpinfo>(8), B<lpoptions>(1), aide en "
-"ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
+"Fixer la taille du papier à I<taille>. La plupart des imprimantes gèrent au "
+"moins les tailles appelées « a4 », « letter » et « legal »."
 
-# type: TH
-#. type: TH
-#: lpc.man:13
+# type: TP
+#. type: TP
+#: lp.1:168 lpr.1:123
 #, no-wrap
-msgid "lpc"
-msgstr "lpc"
-
-# type: Plain text
-#. type: Plain text
-#: lpc.man:16
-#, fuzzy
-msgid "lpc - line printer control program"
-msgstr "lpc - Programme de contrôle d'imprimantes en ligne de commande."
-
-# type: Plain text
-#. type: Plain text
-#: lpc.man:23
-msgid "B<lpc> [ I<command> [ I<parameter(s)> ] ]"
-msgstr "B<lpc> [ I<commande> [ I<paramètre(s)> ] ]"
+msgid "B<-o number-up=>{I<2|4|6|9|16>}"
+msgstr "B<-o number-up=>{I<2|4|6|9|16>}"
 
-# type: Plain text
 #. type: Plain text
-#: lpc.man:25
-msgid ""
-"B<lpc> provides limited control over printer and class queues provided by "
-"CUPS. It can also be used to query the state of queues."
+#: lp.1:171 lpr.1:126
+msgid "Prints 2, 4, 6, 9, or 16 document (input) pages on each output page."
 msgstr ""
-"B<lpc> permet de contrôler partiellement les files d’impression des "
-"imprimantes et classes d'imprimantes de CUPS. Il est également utilisé pour "
-"récupérer l'état des files d'impression."
+"Imprimer B<2>, B<4>, B<6>, B<9> ou B<16> pages (entrée) sur chaque page "
+"produite."
+
+# type: TP
+#. type: TP
+#: lp.1:171 lpr.1:126
+#, no-wrap
+msgid "B<-o orientation-requested=4>"
+msgstr "B<-o> I<orientation-requested=4>"
 
 # type: Plain text
 #. type: Plain text
-#: lpc.man:27
-msgid ""
-"If no command is specified on the command-line, B<lpc> displays a prompt and "
-"accepts commands from the standard input."
+#: lp.1:174 lpr.1:129
+msgid "Prints the job in landscape (rotated 90 degrees counter-clockwise)."
 msgstr ""
-"Si aucune commande n'est donnée sur la ligne de commande, B<lpc> affichera "
-"une invite et prendra ses commandes depuis l'entrée standard."
+"Imprimer en mode paysage (rotation de 90 degrés dans le sens anti-horaire)."
 
-# type: SH
-#. type: SS
-#: lpc.man:27
+# type: TP
+#. type: TP
+#: lp.1:174 lpr.1:129
 #, no-wrap
-msgid "COMMANDS"
-msgstr "COMMANDES"
+msgid "B<-o orientation-requested=5>"
+msgstr "B<-o> I<orientation-requested=5>"
 
 # type: Plain text
 #. type: Plain text
-#: lpc.man:29
-msgid ""
-"The B<lpc> program accepts a subset of commands accepted by the Berkeley "
-"B<lpc> program of the same name:"
-msgstr ""
-"B<lpc> reconnaît un sous-ensemble de commandes de mêmes noms, reconnues par "
-"le programme B<lpc> de Berkeley :"
+#: lp.1:177 lpr.1:132
+msgid "Prints the job in landscape (rotated 90 degrees clockwise)."
+msgstr "Imprimer en mode paysage (rotation de 90 degrés dans le sens horaire)."
 
 # type: TP
 #. type: TP
-#: lpc.man:29
+#: lp.1:177 lpr.1:132
 #, no-wrap
-msgid "B<exit>"
-msgstr "B<exit>"
+msgid "B<-o orientation-requested=6>"
+msgstr "B<-o> I<orientation-requested=6>"
 
 # type: Plain text
 #. type: Plain text
-#: lpc.man:32 lpc.man:40
-msgid "Exits the command interpreter."
-msgstr "Quitter l'interpréteur de commandes."
+#: lp.1:180 lpr.1:135
+msgid "Prints the job in reverse portrait (rotated 180 degrees)."
+msgstr "Imprimer en mode portrait inversé (rotation de 180 degrés)."
 
 # type: TP
 #. type: TP
-#: lpc.man:32
-#, no-wrap
-msgid "B<help >[I<command>]"
-msgstr "B<help >[I<commande>]"
+#: lp.1:180 lpr.1:135
+#, fuzzy, no-wrap
+msgid "B<-o print-quality=3>"
+msgstr "B<-o printer-op-policy=>I<nom>"
 
 # type: TP
 #. type: TP
-#: lpc.man:34
+#: lp.1:182 lpr.1:137
+#, fuzzy, no-wrap
+msgid "B<-o print-quality=4>"
+msgstr "B<-o> I<orientation-requested=4>"
+
+# type: TP
+#. type: TP
+#: lp.1:184 lpr.1:139
+#, fuzzy, no-wrap
+msgid "B<-o print-quality=5>"
+msgstr "B<-o> I<orientation-requested=5>"
+
+#. type: Plain text
+#: lp.1:187 lpr.1:142
+msgid "Specifies the output quality - draft (3), normal (4), or best (5)."
+msgstr ""
+
+# type: TP
+#. type: TP
+#: lp.1:187 lpr.1:142
 #, no-wrap
-msgid "B<? >[I<command>]"
-msgstr "B<? >[I<commande>]"
+msgid "B<-o sides=one-sided>"
+msgstr "B<-o> I<sides=one-sided>"
 
 # type: Plain text
 #. type: Plain text
-#: lpc.man:37
-msgid "Displays a short help message."
-msgstr "Afficher un message d'aide."
+#: lp.1:190 lpr.1:145
+msgid "Prints on one side of the paper."
+msgstr "Imprimer sur une seule face de feuille."
 
 # type: TP
 #. type: TP
-#: lpc.man:37
+#: lp.1:190 lpr.1:145
 #, no-wrap
-msgid "B<quit>"
-msgstr "B<quit>"
+msgid "B<-o sides=two-sided-long-edge>"
+msgstr "B<-o> I<sides=two-sided-long-edge>"
+
+#. type: Plain text
+#: lp.1:193 lpr.1:148
+msgid "Prints on both sides of the paper for portrait output."
+msgstr "Imprimer sur les deux faces de feuille pour une sortie portrait."
 
 # type: TP
 #. type: TP
-#: lpc.man:40
+#: lp.1:193 lpr.1:148
 #, no-wrap
-msgid "B<status >[I<queue>]"
-msgstr "B<status >[I<file_impression>]"
+msgid "B<-o sides=two-sided-short-edge>"
+msgstr "B<-o> I<sides=two-sided-short-edge>"
+
+#. type: Plain text
+#: lp.1:196 lpr.1:151
+msgid "Prints on both sides of the paper for landscape output."
+msgstr "Imprimer sur les deux faces de feuille pour une sortie paysage."
 
 # type: Plain text
 #. type: Plain text
-#: lpc.man:43
-msgid "Displays the status of one or more printer or class queues."
+#: lp.1:201
+msgid ""
+"The I<-q> option accepts a different range of values than the Solaris lp "
+"command, matching the IPP job priority values (1-100, 100 is highest "
+"priority) instead of the Solaris values (0-39, 0 is highest priority)."
 msgstr ""
-"Afficher l'état des files d'impression d'une ou plusieurs imprimantes ou "
-"classes d'imprimantes."
+"L'option « B<-q> » accepte des valeurs, différentes de celles utilisées par "
+"la commande B<lp> de Solaris, correspondant aux valeurs de priorité d’IPP "
+"(1-100, 100 étant la plus haute priorité), au lieu des valeurs de Solaris "
+"(0-39, 0 étant la plus haute priorité)."
 
 # type: Plain text
 #. type: Plain text
-#: lpc.man:48
-msgid ""
-"Since B<lpc> is geared towards the Berkeley printing system, it is "
-"impossible to use B<lpc> to configure printer or class queues provided by "
-"CUPS.  To configure printer or class queues you must use the B<lpadmin>(8)  "
-"command or another CUPS-compatible client with that functionality."
+#: lp.1:203 lpr.1:155
+msgid "Print two copies of a document to the default printer:"
+msgstr "Imprimer deux copies d’un document sur l’imprimante par défaut :"
+
+# type: Plain text
+#. type: Plain text
+#: lp.1:206
+#, no-wrap
+msgid "    lp -n 2 filename\n"
+msgstr "    lp -n 2 nom_fichier\n"
+
+# type: Plain text
+#. type: Plain text
+#: lp.1:209 lpr.1:161
+msgid "Print a double-sided legal document to a printer called \"foo\":"
 msgstr ""
-"Étant donné que B<lpc> est spécifique au système d'impression de Berkeley, "
-"il est impossible de l'utiliser pour configurer les files d'attente de CUPS. "
-"Pour cela, vous devez utiliser le programme B<lpadmin>(8) ou tout autre "
-"client compatible avec CUPS remplissant ces fonctions."
+"Imprimer en recto-verso sur une page « Legal » avec l'imprimante « toto » :"
+
+# type: Plain text
+#. type: Plain text
+#: lp.1:212
+#, no-wrap
+msgid "    lp -d foo -o media=legal -o sides=two-sided-long-edge filename\n"
+msgstr "    lp -d foo -o media=legal -o sides=two-sided-long-edge nom_fichier\n"
+
+# type: Plain text
+#. type: Plain text
+#: lp.1:215
+#, fuzzy
+msgid "Print a presentation document 2-up to a printer called \"bar\":"
+msgstr "Imprimer une double composition avec l'imprimante « toto »."
+
+# type: Plain text
+#. type: Plain text
+#: lp.1:218
+#, fuzzy, no-wrap
+msgid "    lp -d bar -o number-up=2 filename\n"
+msgstr "    lp -d toto -o number-up=2 nom_fichier\n"
 
 # type: Plain text
 #. type: Plain text
-#: lpc.man:58
+#: lp.1:228
 msgid ""
-"B<cancel>(1), B<cupsaccept>(8), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), "
-"B<lpr>(1), B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/"
-"help)"
+"B<cancel>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), B<lpr>(1), "
+"B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
-"B<cancel>(1), B<cupsaccept>(8), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), "
-"B<lpr>(1), B<lprm>(1), B<lpstat>(1), aide en ligne de CUPS E<lt>URL:I<http://"
+"B<cancel>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), B<lpr>(1), "
+"B<lprm>(1), B<lpstat>(1), aide en ligne de CUPS E<lt>URL:I<http://"
 "localhost:631/help>E<gt>"
 
 # type: TH
 #. type: TH
-#: lpinfo.man:13
+#: lpadmin.8:10
 #, no-wrap
-msgid "lpinfo"
-msgstr "lpinfo"
+msgid "lpadmin"
+msgstr "lpadmin"
 
-# type: TH
-#. type: TH
-#: lpinfo.man:13 lpq.man:13 mailto.conf.man:13 mime.types.man:13
-#: notifier.man:13 ppdc.man:13 ppdhtml.man:13 ppdi.man:13 ppdmerge.man:13
-#: ppdpo.man:13
-#, no-wrap
-msgid "12 June 2014"
-msgstr "12 juin 2014"
+# type: Plain text
+#. type: Plain text
+#: lpadmin.8:13
+msgid "lpadmin - configure cups printers and classes"
+msgstr "lpadmin - Configurer les imprimantes et classes d'imprimantes CUPS."
 
 # type: Plain text
 #. type: Plain text
-#: lpinfo.man:16
-#, fuzzy
-msgid "lpinfo - show available devices or drivers"
-msgstr "lpinfo - Afficher les périphériques et pilotes disponibles."
+#: lpadmin.8:25
+msgid ""
+"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
+"B<-d> I<destination>"
+msgstr ""
+"B<lpadmin> [ B<-E> ] [B<-U> I<identifiant> ] [ B<-h> I<serveur>[B<:"
+">I<port>] ] B<-d> I<destination>"
 
+# type: Plain text
 #. type: Plain text
-#: lpinfo.man:44
+#: lpadmin.8:42
 msgid ""
-"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ B<--device-"
-"id> I<device-id-string> ] [ B<--exclude-schemes> I<scheme-list> ] [ B<--"
-"include-schemes> I<scheme-list> ] [ B<--language> I<locale> ] [ B<--make-and-"
-"model> I<name> ] [ B<--product> I<name> ] B<-m>"
+"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
+"B<-p> I<destination> [ B<-R> I<name-default> ] I<option(s)>"
 msgstr ""
-"B<lpinfo> [ B<-E> ] [ B<-h >I<serveur>[B<:>I<port>] ] [ B<-l> ] [ B<--device-"
-"id> I<chaîne_id_périphérique> ] [ B<--exclude-schemes> I<liste_schéma> ] "
-"[ B<--include-schemes> I<liste-schéma> ] [ B<--language> I<locale> ] [ B<--"
-"make-and-model> I<nom> ] [ B<--product> I<nom> ] B<-m>"
+"B<lpadmin> [ B<-E> ] [B<-U> I<identifiant> ] [ B<-h> I<serveur>[B<:"
+">I<port>] ] B<-p> I<destination> [ B<-R> I<nom_par_défaut>] I<option(s)>"
 
 # type: Plain text
 #. type: Plain text
-#: lpinfo.man:63
+#: lpadmin.8:54
 msgid ""
-"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ B<--exclude-"
-"schemes> I<scheme-list> ] [ B<--include-schemes> I<scheme-list> ] [ B<--"
-"timeout> I<seconds> ] B<-v>"
+"B<lpadmin> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] "
+"B<-x> I<destination>"
 msgstr ""
-"B<lpinfo> [ B<-E> ] [ B<-h >I<serveur>[B<:>I<port>] ] [ B<-l> ] [ B<--"
-"exclude-schemes> I<liste-schéma> ] [ B<--include-schemes> I<liste-schéma> ] "
-"[ B<--timeout> I<secondes> ] B<-v>"
+"B<lpadmin> [ B<-E> ] [B<-U> I<identifiant> ] [ B<-h> I<serveur>[B<:"
+">I<port>] ] B<-x> I<destination>"
 
 # type: Plain text
 #. type: Plain text
-#: lpinfo.man:66
+#: lpadmin.8:57
 msgid ""
-"B<lpinfo> lists the available devices or drivers known to the CUPS server.  "
-"The first form (I<-m>) lists the available drivers, while the second form "
-"(I<-v>) lists the available devices."
+"B<lpadmin> configures printer and class queues provided by CUPS.  It can "
+"also be used to set the server default printer or class."
 msgstr ""
-"B<lpinfo> affiche la liste des périphériques ou pilotes connus par le "
-"serveur CUPS. La première forme (avec B<-m>) liste les pilotes disponibles, "
-"et la seconde forme (avec B<-v>) liste les périphériques disponibles."
+"B<lpadmin> configure les imprimantes et les files d’attente de classes "
+"d'imprimantes fournies par CUPS. Il est également utilisé pour définir "
+"l'imprimante ou classe d'imprimante par défaut."
 
 # type: Plain text
 #. type: Plain text
-#: lpinfo.man:68
-msgid "B<lpinfo> accepts the following options:"
-msgstr "B<lpinfo> accepte les options suivantes :"
+#: lpadmin.8:59
+msgid ""
+"When specified before the I<-d>, I<-p>, or I<-x> options, the I<-E> option "
+"forces encryption when connecting to the server."
+msgstr ""
+"Lorsque l'option B<-E> est indiquée avant les options B<-d>, B<-p> ou B<-x>, "
+"la communication avec le serveur est chiffrée."
+
+# type: Plain text
+#. type: Plain text
+#: lpadmin.8:68
+msgid ""
+"The first form of the command (I<-d>) sets the default printer or class to "
+"I<destination>.  Subsequent print jobs submitted via the B<lp>(1)  or "
+"B<lpr>(1)  commands will use this destination unless the user specifies "
+"otherwise with the B<lpoptions>(1)  command."
+msgstr ""
+"La première méthode d'utilisation de la commande (avec B<-d>) définit "
+"l'imprimante ou la classe par défaut à I<destination>. Les impressions "
+"futures demandées par les commandes B<lp>(1) ou B<lpr>(1) utiliseront cette "
+"destination sauf avis contraire de l'utilisateur par l'utilisation de la "
+"commande B<lpoptions>(1)."
+
+# type: Plain text
+#. type: Plain text
+#: lpadmin.8:70
+msgid ""
+"The second form of the command (I<-p>) configures the named printer or "
+"class.  The additional options are described below."
+msgstr ""
+"La seconde forme de la commande (avec B<-p>) configure l'imprimante ou la "
+"classe indiquée. Les options supplémentaires sont décrites ci-dessous."
 
 # type: Plain text
 #. type: Plain text
-#: lpinfo.man:74
-msgid "Selects an alternate server."
-msgstr "Sélectionner un autre serveur."
+#: lpadmin.8:73
+msgid ""
+"The third form of the command (I<-x>) deletes the printer or class "
+"I<destination>.  Any jobs that are pending for the destination will be "
+"removed and any job that is currently printed will be aborted."
+msgstr ""
+"La troisième forme de la commande (avec B<-x>) supprime l'imprimante ou "
+"classe I<destination>. Tous les travaux d'impression en attente sur cette "
+"destination sont supprimés, et les travaux en cours d'impression sont "
+"arrêtés."
 
 # type: Plain text
 #. type: Plain text
-#: lpinfo.man:77
-msgid "Shows a \"long\" listing of devices or drivers."
-msgstr "Afficher une liste « longue » des périphériques ou pilotes."
+#: lpadmin.8:75
+msgid "The following options are recognized when configuring a printer queue:"
+msgstr ""
+"Les options suivantes sont reconnues pour la configuration d'une file "
+"d'impression :"
 
+# type: TP
 #. type: TP
-#: lpinfo.man:77
+#: lpadmin.8:75
 #, no-wrap
-msgid "B<--device-id >I<device-id-string>"
-msgstr "B<--device-id> I<chaîne_id_périphérique>"
+msgid "B<-c >I<class>"
+msgstr "B<-c> I<classe>"
 
+# type: Plain text
 #. type: Plain text
-#: lpinfo.man:80
+#: lpadmin.8:79
 msgid ""
-"Specifies the IEEE-1284 device ID to match when listing drivers with the I<-"
-"m> option."
+"Adds the named I<printer> to I<class>.  If I<class> does not exist it is "
+"created automatically."
 msgstr ""
-"Indiquer l'ID des périphériques IEEE-1284 à faire correspondre lors du "
-"parcours de la liste des pilotes avec l'option B<-m>."
-
-#. type: TP
-#: lpinfo.man:80
-#, no-wrap
-msgid "B<--exclude-schemes >I<scheme-list>"
-msgstr "B<--exclude-schemes> I<liste_schéma>"
+"Ajouter l'imprimante I<imprimante> à la classe I<classe>. Si la I<classe> "
+"n'existe pas encore, elle est créée automatiquement."
 
 #. type: Plain text
-#: lpinfo.man:84
+#: lpadmin.8:87
+#, fuzzy
 msgid ""
-"Specifies a comma-delimited list of device or PPD schemes that should be "
-"excluded from the results.  Static PPD files use the \"file\" scheme."
+"Sets a standard PPD file for the printer from the I<model> directory or "
+"using one of the driver interfaces.  Use the I<-m> option with the "
+"B<lpinfo>(8)  command to get a list of supported models.  The model \"raw\" "
+"clears any existing PPD file and the model \"everywhere\" queries the "
+"printer referred to by the specified IPP I<device-uri>.  Note: Models other "
+"than \"everywhere\" are deprecated and will not be supported in a future "
+"version of CUPS."
 msgstr ""
-"Indiquer une liste séparée par des virgules de périphériques ou de schémas "
-"PPD qui devraient être exclus des résultats. Les fichiers statiques PPD "
-"utilisent le schéma « file »."
+"Définir un fichier PPD standard à partir du répertoire I<modèle> ou en "
+"utilisant une des interfaces de pilotes. Utilisez l'option B<-m> avec la "
+"commande B<lpinfo>(8) pour obtenir une liste des modèles pris en charge. Le "
+"modèle « raw » outrepasse tout fichier PPD existant et le modèle "
+"« everywhere » recherche l’imprimante désignée par l’I<uri_périphérique> IPP."
 
 #. type: TP
-#: lpinfo.man:84
+#: lpadmin.8:87
 #, no-wrap
-msgid "B<--include-schemes >I<scheme-list>"
-msgstr "B<--include-schemes> I<liste_schéma>"
+msgid "B<-o cupsIPPSupplies=true>"
+msgstr "B<-o cupsIPPSupplies=true>"
+
+#. type: TP
+#: lpadmin.8:89
+#, no-wrap
+msgid "B<-o cupsIPPSupplies=false>"
+msgstr "B<-o cupsIPPSupplies=false>"
 
+# type: Plain text
 #. type: Plain text
-#: lpinfo.man:88
-msgid ""
-"Specifies a comma-delimited list of device or PPD schemes that should be "
-"included in the results.  Static PPD files use the \"file\" scheme."
+#: lpadmin.8:92
+msgid "Specifies whether IPP supply level values should be reported."
 msgstr ""
-"Indiquer une liste séparée par des virgules de périphériques ou de schémas "
-"PPD qui devraient être inclus dans les résultats. Les fichiers statiques PPD "
-"utilisent le schéma « file »."
+"Indiquer si les valeurs de niveau d’équipement IPP doivent être rapportées."
 
-# type: TP
 #. type: TP
-#: lpinfo.man:88
+#: lpadmin.8:92
 #, no-wrap
-msgid "B<--language >I<locale>"
-msgstr "B<--language> I<locale>"
+msgid "B<-o cupsSNMPSupplies=true>"
+msgstr "B<-o cupsSNMPSupplies=true>"
+
+#. type: TP
+#: lpadmin.8:94
+#, no-wrap
+msgid "B<-o cupsSNMPSupplies=false>"
+msgstr "B<-o cupsSNMPSupplies=false>"
 
 #. type: Plain text
-#: lpinfo.man:91
+#: lpadmin.8:97
 msgid ""
-"Specifies the language to match when listing drivers with the I<-m> option."
+"Specifies whether SNMP supply level (RFC 3805) values should be reported."
 msgstr ""
-"Indiquer la langue à faire correspondre lors de la création de la liste des "
-"pilotes avec l'option B<-m>."
+"Indiquer si les valeurs SNMP de niveau d’équipement (RFC 3805) doivent être "
+"rapportées."
 
+# type: TP
 #. type: TP
-#: lpinfo.man:91
+#: lpadmin.8:97
 #, no-wrap
-msgid "B<--make-and-model >I<name>"
-msgstr "B<--make-and-model> I<nom>"
+msgid "B<-o job-k-limit=>I<value>"
+msgstr "B<-o job-k-limit=>I<valeur>"
 
+# type: Plain text
 #. type: Plain text
-#: lpinfo.man:94
+#: lpadmin.8:101
 msgid ""
-"Specifies the make and model to match when listing drivers with the I<-m> "
-"option."
+"Sets the kilobyte limit for per-user quotas.  The value is an integer number "
+"of kilobytes; one kilobyte is 1024 bytes."
 msgstr ""
-"Indiquer la marque et le modèle à faire correspondre lors de la création de "
-"la liste des pilotes avec l'option B<-m>."
+"Définir les quotas par utilisateur en kilo-octets. La valeur est un nombre "
+"entier de kilo-octets (valant 1 024 octets)."
 
 # type: TP
 #. type: TP
-#: lpinfo.man:94
+#: lpadmin.8:101
 #, no-wrap
-msgid "B<--product >I<name>"
-msgstr "B<--product> I<nom>"
+msgid "B<-o job-page-limit=>I<value>"
+msgstr "B<-o job-page-limit=>I<valeur>"
 
 # type: Plain text
 #. type: Plain text
-#: lpinfo.man:97
+#: lpadmin.8:105
 msgid ""
-"Specifies the product to match when listing drivers with the I<-m> option."
+"Sets the page limit for per-user quotas.  The value is the integer number of "
+"pages that can be printed; double-sided pages are counted as two pages."
 msgstr ""
-"Indiquer le produit à sélectionner lors de la création de la liste des "
-"pilotes avec l'option B<-m>."
+"Définir le nombre maximal de pages disponibles par utilisateur. La valeur "
+"est un nombre entier de pages pouvant être imprimées. Les pages recto verso "
+"comptent pour deux pages."
 
 # type: TP
 #. type: TP
-#: lpinfo.man:97
+#: lpadmin.8:105
 #, no-wrap
-msgid "B<--timeout >I<seconds>"
-msgstr "B<--timeout> I<secondes>"
+msgid "B<-o job-quota-period=>I<value>"
+msgstr "B<-o job-quota-period=>I<valeur>"
 
 # type: Plain text
 #. type: Plain text
-#: lpinfo.man:100
-msgid "Specifies the timeout when listing devices with the I<-v> option."
+#: lpadmin.8:109
+msgid ""
+"Sets the accounting period for per-user quotas.  The value is an integer "
+"number of seconds; 86,400 seconds are in one day."
 msgstr ""
-"Indiquer le délai d'attente lors de la création de la liste des "
-"périphériques avec l'option B<-v>."
-
-# type: Plain text
-#. type: Plain text
-#: lpinfo.man:102
-msgid "The I<lpinfo> command is unique to CUPS."
-msgstr "La commande B<lpinfo> est spécifique à CUPS."
-
-#. type: Plain text
-#: lpinfo.man:104
-msgid "List all devices:"
-msgstr "Lister tous les périphériques :"
+"Définir le temps maximal disponible par utilisateur. La valeur est un nombre "
+"entier de secondes. Une journée contient 86 400 secondes."
 
-# type: TH
-#. type: Plain text
-#: lpinfo.man:107
+# type: TP
+#. type: TP
+#: lpadmin.8:109
 #, no-wrap
-msgid "    lpinfo -v\n"
-msgstr "    lpinfo -v\n"
-
-#. type: Plain text
-#: lpinfo.man:110
-msgid "List all drivers:"
-msgstr "Lister tous les pilotes :"
+msgid "B<-o job-sheets-default=>I<banner>"
+msgstr "B<-o job-sheets-default=>I<bannière>"
 
-# type: TH
-#. type: Plain text
-#: lpinfo.man:113
+# type: TP
+#. type: TP
+#: lpadmin.8:111
 #, no-wrap
-msgid "    lpinfo -m\n"
-msgstr "    lpinfo -m\n"
+msgid "B<-o job-sheets-default=>I<banner>B<,>I<banner>"
+msgstr "B<-o job-sheets-default=>I<bannière>B<,>I<bannière>"
 
+# type: Plain text
 #. type: Plain text
-#: lpinfo.man:116
-msgid "List drivers matching \"HP LaserJet\":"
-msgstr "Lister tous les pilotes correspondants à « HP LaserJet » :"
+#: lpadmin.8:114
+msgid "Sets the default banner page(s) to use for print jobs."
+msgstr ""
+"Fixer la (les) page(s) de bannière par défaut pour les travaux d'impression."
 
-#. type: Plain text
-#: lpinfo.man:119
+# type: TP
+#. type: TP
+#: lpadmin.8:114
 #, no-wrap
-msgid "    lpinfo --make-and-model \"HP LaserJet\" -m\n"
-msgstr "    lpinfo --make-and-model \"HP LaserJet\" -m\n"
+msgid "B<-o >I<name>B<=>I<value>"
+msgstr "B<-o >I<nom>B<=>I<valeur>"
 
 # type: Plain text
 #. type: Plain text
-#: lpinfo.man:123
-msgid "B<lpadmin>(8), CUPS Online Help (http://localhost:631/help)"
+#: lpadmin.8:120
+msgid ""
+"Sets a PPD option for the printer.  PPD options can be listed using the I<-"
+"l> option with the B<lpoptions>(1)  command."
 msgstr ""
-"B<lpadmin>(8), aide en ligne de CUPS E<lt>URL:I<http://localhost:631/"
-"help>E<gt>"
-
-# type: TH
-#. type: TH
-#: lp.man:13
-#, no-wrap
-msgid "lp"
-msgstr "lp"
+"Définir une option PPD pour l'imprimante. La liste des options PPD peut être "
+"obtenue en utilisant l'option B<-l> de la commande B<lpoptions>(1)."
 
-# type: TH
-#. type: TH
-#: lp.man:13 lpr.man:13
+# type: TP
+#. type: TP
+#: lpadmin.8:120
 #, no-wrap
-msgid "2 May 2016"
-msgstr "2 mai 2016"
+msgid "B<-o >I<name>B<-default=>I<value>"
+msgstr "B<-o >I<nom>B<-default=>I<valeur>"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:16
-msgid "lp - print files"
-msgstr "lp - Imprimer des fichiers."
+#: lpadmin.8:124
+msgid ""
+"Sets a default server-side option for the destination.  Any print-time "
+"option can be defaulted, e.g., \"-o number-up-default=2\" to set the default "
+"\"number-up\" option value to 2."
+msgstr ""
+"Définir au niveau du serveur une option par défaut pour la destination. "
+"Toute option pouvant être définie au moment de l'impression peut avoir une "
+"valeur par défaut, par exemple « -o number-up-default=2 » pour définir "
+"l'option « number-up » par défaut à la valeur B<2>."
+
+# type: TP
+#. type: TP
+#: lpadmin.8:124
+#, no-wrap
+msgid "B<-o port-monitor=>I<name>"
+msgstr "B<-o port-monitor=>I<nom>"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:55
+#: lpadmin.8:129
 msgid ""
-"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-d >I<destination>[B</"
-">I<instance>] ] [ B<-h >I<hostname>[B<:>I<port>] ] [ B<-m> ] [ B<-n> I<num-"
-"copies> ] [ B<-o >I<option>[B<=>I<value>] ] [ B<-q> I<priority> ] [ B<-s> ] "
-"[ B<-t> I<title> ] [ B<-H> I<handling> ] [ B<-P> I<page-list> ] [ B<--> ] "
-"[ I<file(s)> ]"
+"Sets the binary communications program to use when printing, \"none\", \"bcp"
+"\", or \"tbcp\".  The default program is \"none\".  The specified port "
+"monitor must be listed in the printer's PPD file."
 msgstr ""
-"B<lp> [ B<-E> ] [ B<-U> I<identifiant> ] [ B<-c> ] [ B<-d> I<destination>[B</"
-">I<instance>] ] [ B<-h> I<nom_hôte>[B<:>I<port>] ] [ B<-m> ] [ B<-n> "
-"I<nombre_copies> ] [ B<-o> I<option>[B<=>I<valeur>] ] [ B<-q> I<priorité> ] "
-"[ B<-s> ] [ B<-t> I<titre> ] [ B<-H> I<méthode> ] [ B<-P> I<liste_pages> ] "
-"[ B<--> ] [ I<fichier(s)> ]"
+"Fixer le programme à utiliser pour les communications binaires lors de "
+"l'impression : « none », « bcp » ou « tbcp ». Le programme par défaut est "
+"« none ». Le port écouté indiqué doit être listé dans le fichier PPD de "
+"l'imprimante."
+
+# type: TP
+#. type: TP
+#: lpadmin.8:129
+#, no-wrap
+msgid "B<-o printer-error-policy=>I<name>"
+msgstr "B<-o printer-error-policy=>I<nom>"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:87
+#: lpadmin.8:135
+#, fuzzy
 msgid ""
-"B<lp> [ B<-E> ] [ B<-U> I<username> ] [ B<-c> ] [ B<-h >I<hostname>[B<:"
-">I<port>] ] [ B<-i> I<job-id> ] [ B<-n> I<num-copies> ] [ B<-o "
-">I<option>[B<=>I<value>] ] [ B<-q> I<priority> ] [ B<-t> I<title> ] [ B<-H> "
-"I<handling> ] [ B<-P> I<page-list> ]"
+"Sets the policy for errors such as printers that cannot be found or "
+"accessed, don't support the format being printed, fail during submission of "
+"the print data, or cause one or more filters to crash.  The name must be one "
+"of \"abort-job\" (abort the job on error), \"retry-job\" (retry the job at a "
+"future time), \"retry-current-job\" (retry the current job immediately), or "
+"\"stop-printer\" (stop the printer on error).  The default error policy is "
+"\"stop-printer\" for printers and \"retry-current-job\" for classes."
 msgstr ""
-"B<lp> [ B<-E> ] [ B<-U> I<identifiant> ] [ B<-c> ] [ B<-h> I<nom_hôte>[B<:"
-">I<port>] ] [ B<-i> I<id_travail> ] [ B<-n> I<nombre_copies> ] [ B<-o> "
-"I<option>[B<=>I<valeur>] ] [ B<-q> I<priorité> ] [ B<-t> I<titre> ] [ B<-H> "
-"I<méthode> ] [ B<-P> I<liste_pages> ]"
+"Fixer la politique à utiliser en cas d'erreur quand le programme de "
+"transmission responsable de l'impression n'arrive pas à envoyer le travail à "
+"l'imprimante. Le nom doit être soit « abort-job » (annuler l'impression), "
+"« retry-job » (réessayer), « retry-current-job » (réessayer l'impression en "
+"cours) ou « stop-printer » (arrêter l'imprimante). La politique par défaut "
+"en cas d'erreur est « stop-printer » pour les imprimantes, et « retry-"
+"current-job » pour les classes."
+
+# type: TP
+#. type: TP
+#: lpadmin.8:135
+#, no-wrap
+msgid "B<-o printer-is-shared=true>"
+msgstr "B<-o printer-is-shared=true>"
+
+# type: TP
+#. type: TP
+#: lpadmin.8:137
+#, no-wrap
+msgid "B<-o printer-is-shared=false>"
+msgstr "B<-o printer-is-shared=false>"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:90
+#: lpadmin.8:142
 msgid ""
-"B<lp> submits files for printing or alters a pending job.  Use a filename of "
-"\"-\" to force printing from the standard input."
+"Sets the destination to shared/published or unshared/unpublished.  Shared/"
+"published destinations are publicly announced by the server on the LAN based "
+"on the browsing configuration in I<cupsd.conf>, while unshared/unpublished "
+"destinations are not announced.  The default value is \"true\"."
 msgstr ""
-"B<lp> demande l'impression d'un fichier ou modifie un travail d'impression "
-"en attente. Utiliser « B<-> » comme nom de fichier pour forcer l'impression "
-"à partir de l'entrée standard."
+"Placer la destination dans l'état partagée/publique ou non partagée/non "
+"publique. Les destinations partagées/publiques sont annoncées officiellement "
+"par le serveur sur le réseau local, en fonction de la configuration pour les "
+"recherches de B<cupsd.conf>, tandis que les imprimantes non partagées/non "
+"publiques ne sont pas annoncées. La valeur par défaut est « true »."
 
-#. type: SS
-#: lp.man:90 lpr.man:60
+# type: TP
+#. type: TP
+#: lpadmin.8:142
 #, no-wrap
-msgid "THE DEFAULT DESTINATION"
-msgstr "LA DESTINATION PAR DÉFAUT"
+msgid "B<-o printer-op-policy=>I<name>"
+msgstr "B<-o printer-op-policy=>I<nom>"
 
+# type: Plain text
 #. type: Plain text
-#: lp.man:97 lpr.man:67
+#: lpadmin.8:147
 msgid ""
-"CUPS provides many ways to set the default destination. The B<LPDEST> and "
-"B<PRINTER> environment variables are consulted first.  If neither are set, "
-"the current default set using the B<lpoptions>(1)  command is used, followed "
-"by the default set using the B<lpadmin>(8)  command."
+"Sets the IPP operation policy associated with the destination.  The name "
+"must be defined in the I<cupsd.conf> in a Policy section.  The default "
+"operation policy is \"default\"."
 msgstr ""
-"CUPS fournit plusieurs façons de spécifier la destination par défaut. Les "
-"variables d'environnement « B<LPDEST> » et « B<PRINTER> » sont lues en "
-"premier. Si aucune n'est paramétrée, la valeur par défaut, spécifiée en "
-"utilisant la commande B<lpoptions>(1) est utilisée, suivie par la valeur par "
-"défaut spécifiée en utilisant la commande B<lpadmin>(8)."
+"Fixer la politique des opérations IPP associée à l'imprimante. Le nom doit "
+"être défini dans B<cupsd.conf>, dans une section « Policy ». Par défaut, la "
+"politique des opérations est « default »."
+
+# type: TP
+#. type: TP
+#: lpadmin.8:147
+#, no-wrap
+msgid "B<-R >I<name>B<-default>"
+msgstr "B<-R >I<nom>B<-default>"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:99
-msgid "The following options are recognized by I<lp>:"
-msgstr "Les options suivantes sont reconnues par B<lp> :"
+#: lpadmin.8:150
+msgid "Deletes the named option from I<printer>."
+msgstr "Supprimer les options données pour l'I<imprimante>."
 
+# type: TP
 #. type: TP
-#: lp.man:99
+#: lpadmin.8:150
 #, no-wrap
-msgid "B<-->"
-msgstr "B<-->"
+msgid "B<-r >I<class>"
+msgstr "B<-r >I<classe>"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:102
+#: lpadmin.8:154
 msgid ""
-"Marks the end of options; use this to print a file whose name begins with a "
-"dash (-)."
+"Removes the named I<printer> from I<class>.  If the resulting class becomes "
+"empty it is removed."
 msgstr ""
-"Marquer la fin des options ; à utiliser pour imprimer un fichier dont le nom "
-"commence par un tiret (« - »)."
+"Supprimer l'I<imprimante> de la I<classe>. Si la classe d'imprimante devient "
+"vide, celle-ci est supprimée."
+
+#. type: TP
+#: lpadmin.8:154
+#, no-wrap
+msgid "B<-u allow:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
+msgstr "B<-u allow:>{I<utilisateur>|B<@>I<groupe>}{B<,>I<utilisateur>|B<,@>I<groupe>}*"
+
+#. type: TP
+#: lpadmin.8:156
+#, no-wrap
+msgid "B<-u deny:>{I<user>|B<@>I<group>}{B<,>I<user>|B<,@>I<group>}*"
+msgstr "B<-u deny:>{I<utilisateur>|B<@>I<groupe>}{B<,>I<utilisateur>|B<,@>I<groupe>}*"
+
+# type: TP
+#. type: TP
+#: lpadmin.8:158
+#, no-wrap
+msgid "B<-u allow:all>"
+msgstr "B<-u> B<allow:>I<all>"
+
+# type: TP
+#. type: TP
+#: lpadmin.8:160
+#, no-wrap
+msgid "B<-u deny:none>"
+msgstr "B<-u> B<deny:>I<none>"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:112
+#: lpadmin.8:166
 msgid ""
-"This option is provided for backwards-compatibility only. On systems that "
-"support it, this option forces the print file to be copied to the spool "
-"directory before printing.  In CUPS, print files are always sent to the "
-"scheduler via IPP which has the same effect."
+"Sets user-level access control on a destination.  Names starting with \"@\" "
+"are interpreted as UNIX groups.  The latter two forms turn user-level access "
+"control off.  Note: The user 'root' is not granted special access - using \"-"
+"u allow:foo,bar\" will allow users 'foo' and 'bar' to access the printer but "
+"NOT 'root'."
 msgstr ""
-"Cette option n'est fournie que pour des raisons de compatibilité avec les "
-"précédentes versions. Sur les systèmes le permettant, elle force la copie du "
-"fichier d'impression dans le répertoire spool avant impression. Avec CUPS, "
-"les fichiers d'impression sont envoyés à l'ordonnanceur à travers IPP. Le "
-"résultat est le même dans les deux cas."
+"Définir les accès au niveau utilisateur sur une imprimante. Les noms "
+"commençant par un « @ » sont interprétés comme des groupes UNIX. Les deux "
+"dernières expressions désactivent les contrôles d'accès au niveau "
+"utilisateur. REMARQUE : le superutilisateur ne possède par d’accès spécial. "
+"L’utilisation de « -u allow:toto,tartempion » autorise les utilisateurs "
+"« toto » et « tartempion » à accéder à l’imprimante, mais PAS le "
+"« superutilisateur »."
 
 # type: TP
 #. type: TP
-#: lp.man:112
+#: lpadmin.8:166
 #, no-wrap
-msgid "B<-d >I<destination>"
-msgstr "B<-d >I<destination>"
+msgid "B<-v \">I<device-uri>B<\">"
+msgstr "B<-v \">I<uri_périphérique>B<\">"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:115 lpr.man:85
-msgid "Prints files to the named printer."
-msgstr "Imprimer les fichiers sur l'imprimante donnée."
+#: lpadmin.8:172
+msgid ""
+"Sets the I<device-uri> attribute of the printer queue.  Use the I<-v> option "
+"with the B<lpinfo>(8)  command to get a list of supported device URIs and "
+"schemes."
+msgstr ""
+"Définir l'attribut I<uri_périphérique> de la file d'impression. Utiliser "
+"l'option B<-v> avec la commande B<lpinfo>(8) pour obtenir une liste des URI "
+"de périphérique géré ainsi que leur schéma."
 
 # type: TP
 #. type: TP
-#: lp.man:118
+#: lpadmin.8:172
 #, no-wrap
-msgid "B<-i >I<job-id>"
-msgstr "B<-i> I<id_travail>"
+msgid "B<-D \">I<info>B<\">"
+msgstr "B<-D \">I<info>B<\">"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:121
-msgid "Specifies an existing job to modify."
-msgstr "Indiquer l'identifiant du travail d'impression à modifier."
+#: lpadmin.8:175
+msgid "Provides a textual description of the destination."
+msgstr "Définir une description textuelle de la destination."
+
+# type: Plain text
+#. type: Plain text
+#: lpadmin.8:183
+#, fuzzy
+msgid ""
+"When specified before the B<-d>, B<-p>, or B<-x> options, forces the use of "
+"TLS encryption on the connection to the scheduler.  Otherwise, enables the "
+"destination and accepts jobs; this is the same as running the "
+"B<cupsaccept>(8)  and B<cupsenable>(8)  programs on the destination."
+msgstr ""
+"Activer la destination et accepter les travaux d'impression. Cela est "
+"identique à l’exécution des programmes B<cupsaccept>(8) et B<cupsenable>(8) "
+"avec cette destination."
 
+# type: TP
 #. type: TP
-#: lp.man:121 lpr.man:98 ppdc.man:73
+#: lpadmin.8:183
 #, no-wrap
-msgid "B<-m>"
-msgstr "B<-m>"
+msgid "B<-L \">I<location>B<\">"
+msgstr "B<-L \">I<emplacement>B<\">"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:124
-msgid "Sends an email when the job is completed."
-msgstr "Envoyer un courrier électronique lorsque l'impression est terminée."
+#: lpadmin.8:186
+msgid "Provides a textual location of the destination."
+msgstr "Définir un emplacement textuel de l'imprimante."
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:127 lpr.man:91
-msgid "Sets the number of copies to print."
-msgstr "Nombre de copies à effectuer."
+#: lpadmin.8:188
+#, fuzzy
+msgid "The following B<lpadmin> options are deprecated:"
+msgstr "Les options suivantes sont reconnues :"
 
 # type: TP
 #. type: TP
-#: lp.man:127
-#, no-wrap
-msgid "B<-o \">I<name>B<=>I<value >[ ... I<name>B<=>I<value >]B<\">"
-msgstr "B<-o \">I<nom>B<=>I<valeur >[ ... I<nom>B<=>I<valeur >]B<\">"
+#: lpadmin.8:188
+#, fuzzy, no-wrap
+msgid "B<-i >I<filename>"
+msgstr "B<-f>I<\\ nom_fichier>"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:131
-msgid "Sets one or more job options.  See \"COMMON JOB OPTIONS\" below."
+#: lpadmin.8:193
+#, fuzzy
+msgid ""
+"This option historically has been used to provide either a System V "
+"interface script or (as an implementation side-effect) a PPD file.  Note: "
+"Interface scripts are not supported by CUPS.  PPD files and printer drivers "
+"are deprecated and will not be supported in a future version of CUPS."
 msgstr ""
-"Définir une ou plusieurs options pour le travail d'impression. Consultez "
-"« OPTIONS COMMUNES DES TRAVAUX » ci-après."
+"Définir le fichier PPD (« Postscript Printer Description ») à utiliser avec "
+"cette imprimante. Si cette option est indiquée, elle annule l'option B<-i> "
+"(script d'interface)."
 
 # type: TP
 #. type: TP
-#: lp.man:131
+#: lpadmin.8:193
 #, no-wrap
-msgid "B<-q >I<priority>"
-msgstr "B<-q> I<priorité>"
+msgid "B<-P >I<ppd-file>"
+msgstr "B<-P >I<fichier_ppd>"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:135
+#: lpadmin.8:197
+#, fuzzy
 msgid ""
-"Sets the job priority from 1 (lowest) to 100 (highest).  The default "
-"priority is 50."
+"Specifies a PostScript Printer Description (PPD) file to use with the "
+"printer.  Note: PPD files and printer drivers are deprecated and will not be "
+"supported in a future version of CUPS."
 msgstr ""
-"Définir la priorité du travail d'impression, de B<1> (minimale) à B<100> "
-"(maximale). La priorité par défaut est B<50>."
+"Définir le fichier PPD (« Postscript Printer Description ») à utiliser avec "
+"cette imprimante. Si cette option est indiquée, elle annule l'option B<-i> "
+"(script d'interface)."
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:138
-msgid "Do not report the resulting job IDs (silent mode.)"
-msgstr "Ne pas afficher le numéro du travail (mode silencieux)."
-
-# type: TP
-#. type: TP
-#: lp.man:138
-#, no-wrap
-msgid "B<-t \">I<name>B<\">"
-msgstr "B<-t \">I<nom>B<\">"
+#: lpadmin.8:203
+#, fuzzy
+msgid ""
+"Finally, the CUPS version of B<lpadmin> may ask the user for an access "
+"password depending on the printing system configuration.  This differs from "
+"the System V version which requires the root user to execute this command."
+msgstr ""
+"Les versions CUPS de B<disable> et B<enable> peuvent demander à "
+"l'utilisateur un accès par mot de passe suivant la configuration du système "
+"d'impression, à la différence des versions System V qui demandent le mot de "
+"passe superutilisateur pour exécuter ces commandes."
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:141
-msgid "Sets the job name."
-msgstr "Définir le I<nom> du travail."
+#: lpadmin.8:209
+msgid ""
+"The CUPS version of B<lpadmin> does not support all of the System V or "
+"Solaris printing system configuration options."
+msgstr ""
+"La version CUPS de B<lpadmin> ne reconnaît pas toutes les options de "
+"configuration disponibles dans les versions System V ou Solaris."
 
-# type: TP
-#. type: TP
-#: lp.man:141
-#, no-wrap
-msgid "B<-H >I<hh:mm>"
-msgstr "B<-H> I<hh:mm>"
+#. type: Plain text
+#: lpadmin.8:211
+msgid "Interface scripts are not supported for security reasons."
+msgstr ""
 
-# type: TP
-#. type: TP
-#: lp.man:143
-#, no-wrap
-msgid "B<-H hold>"
-msgstr "B<-H> I<hold>"
+#. type: Plain text
+#: lpadmin.8:213
+msgid ""
+"The double meaning of the B<-E> option is an unfortunate historical oddity."
+msgstr ""
 
-# type: TP
-#. type: TP
-#: lp.man:145
-#, no-wrap
-msgid "B<-H immediate>"
-msgstr "B<-H> I<immediate>"
+#. type: Plain text
+#: lpadmin.8:217
+msgid ""
+"The B<lpadmin> command communicates with the scheduler (B<cupsd>) to make "
+"changes to the printing system configuration.  This configuration "
+"information is stored in several files including I<printers.conf> and "
+"I<classes.conf>.  These files should not be edited directly and are an "
+"implementation detail of CUPS that is subject to change at any time."
+msgstr ""
 
-# type: TP
-#. type: TP
-#: lp.man:147
+#. type: Plain text
+#: lpadmin.8:219
+msgid "Create an IPP Everywhere print queue:"
+msgstr "Créer une file d’impression IPP Everywhere :"
+
+#. type: Plain text
+#: lpadmin.8:222
 #, no-wrap
-msgid "B<-H restart>"
-msgstr "B<-H> I<restart>"
+msgid "    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere\n"
+msgstr "    lpadmin -p mon_imprimante -E -v ipp://mon_imprimante.local/ipp/print -m everywhere\n"
 
-# type: TP
-#. type: TP
-#: lp.man:149
+# type: Plain text
+#. type: Plain text
+#: lpadmin.8:230
+msgid ""
+"B<cupsaccept>(8), B<cupsenable>(8), B<lpinfo>(8), B<lpoptions>(1), CUPS "
+"Online Help (http://localhost:631/help)"
+msgstr ""
+"B<cupsaccept>(8), B<cupsenable>(8), B<lpinfo>(8), B<lpoptions>(1), aide en "
+"ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
+
+# type: TH
+#. type: TH
+#: lpc.8:10
 #, no-wrap
-msgid "B<-H resume>"
-msgstr "B<-H> I<resume>"
+msgid "lpc"
+msgstr "lpc"
+
+# type: Plain text
+#. type: Plain text
+#: lpc.8:13
+#, fuzzy
+msgid "lpc - line printer control program (deprecated)"
+msgstr "lpc - Programme de contrôle d'imprimantes en ligne de commande."
+
+# type: Plain text
+#. type: Plain text
+#: lpc.8:20
+msgid "B<lpc> [ I<command> [ I<parameter(s)> ] ]"
+msgstr "B<lpc> [ I<commande> [ I<paramètre(s)> ] ]"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:155
+#: lpc.8:22
 msgid ""
-"Specifies when the job should be printed.  A value of I<immediate> will "
-"print the file immediately, a value of I<hold> will hold the job "
-"indefinitely, and a UTC time value (HH:MM) will hold the job until the "
-"specified UTC (not local) time.  Use a value of I<resume> with the I<-i> "
-"option to resume a held job.  Use a value of I<restart> with the I<-i> "
-"option to restart a completed job."
+"B<lpc> provides limited control over printer and class queues provided by "
+"CUPS. It can also be used to query the state of queues."
 msgstr ""
-"Définir quand l'impression doit être effectuée. La valeur I<immediate> "
-"effectue l'impression immédiatement, la valeur I<hold> suspend l'impression "
-"pour un temps indéterminé, une heure (non locale) UTC (HH:MM) suspend "
-"l'impression jusqu'à l'heure donnée. Utilisez la valeur I<resume> avec "
-"l'option B<-i> pour reprendre un travail suspendu. Utilisez la valeur "
-"I<restart> avec l'option B<-i> pour relancer un travail terminé."
-
-# type: TP
-#. type: TP
-#: lp.man:155
-#, no-wrap
-msgid "B<-P >I<page-list>"
-msgstr "B<-P> I<liste_pages>"
+"B<lpc> permet de contrôler partiellement les files d’impression des "
+"imprimantes et classes d'imprimantes de CUPS. Il est également utilisé pour "
+"récupérer l'état des files d'impression."
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:160 lp.man:223 lpr.man:178
+#: lpc.8:24
 msgid ""
-"Specifies which pages to print in the document.  The list can contain a list "
-"of numbers and ranges (#-#) separated by commas, e.g., \"1,3-5,16\".  The "
-"page numbers refer to the output pages and not the document's original pages "
-"- options like \"number-up\" can affect the numbering of the pages."
+"If no command is specified on the command-line, B<lpc> displays a prompt and "
+"accepts commands from the standard input."
 msgstr ""
-"Définir quelles sont les pages du document à imprimer. Cette liste peut "
-"contenir des numéros ou des intervalles (#-#), séparés par des virgules (par "
-"exemple : 1,3-5,16). Les numéros de page font référence à la sortie des "
-"pages et non aux pages originales du document — des options telles que "
-"« number-up » peuvent affecter la numérotation des pages."
+"Si aucune commande n'est donnée sur la ligne de commande, B<lpc> affichera "
+"une invite et prendra ses commandes depuis l'entrée standard."
 
 # type: SH
 #. type: SS
-#: lp.man:160 lpr.man:115
+#: lpc.8:24
 #, no-wrap
-msgid "COMMON JOB OPTIONS"
-msgstr "OPTIONS COMMUNES DES TRAVAUX"
+msgid "COMMANDS"
+msgstr "COMMANDES"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:164 lpr.man:119
+#: lpc.8:26
 msgid ""
-"Aside from the printer-specific options reported by the B<lpoptions>(1)  "
-"command, the following generic options are available:"
+"The B<lpc> program accepts a subset of commands accepted by the Berkeley "
+"B<lpc> program of the same name:"
 msgstr ""
-"En plus des options spécifiques des imprimantes, indiquées par "
-"B<lpoptions>(1), les options génériques suivantes sont disponibles :"
+"B<lpc> reconnaît un sous-ensemble de commandes de mêmes noms, reconnues par "
+"le programme B<lpc> de Berkeley :"
 
+# type: TP
 #. type: TP
-#: lp.man:164 lpr.man:119
+#: lpc.8:26
 #, no-wrap
-msgid "B<-o collate=true>"
-msgstr "B<-o collate=true>"
+msgid "B<exit>"
+msgstr "B<exit>"
 
-# type: TP
+# type: Plain text
 #. type: Plain text
-#: lp.man:167 lpr.man:122
-msgid "Prints collated copies."
-msgstr "Imprimer des copies assemblées."
+#: lpc.8:29 lpc.8:37
+msgid "Exits the command interpreter."
+msgstr "Quitter l'interpréteur de commandes."
 
+# type: TP
 #. type: TP
-#: lp.man:167 lpr.man:122
+#: lpc.8:29
 #, no-wrap
-msgid "B<-o fit-to-page>"
-msgstr "B<-o> I<fit-to-page>"
-
-# type: Plain text
-#. type: Plain text
-#: lp.man:170 lpr.man:125
-msgid "Scales the print file to fit on the page."
-msgstr "Mettre le fichier à l'échelle pour qu'il prenne la taille de la page."
+msgid "B<help >[I<command>]"
+msgstr "B<help >[I<commande>]"
 
 # type: TP
 #. type: TP
-#: lp.man:170 lpr.man:125
+#: lpc.8:31
 #, no-wrap
-msgid "B<-o job-hold-until=>I<when>"
-msgstr "B<-o job-hold-until=>I<quand>"
+msgid "B<? >[I<command>]"
+msgstr "B<? >[I<commande>]"
 
+# type: Plain text
 #. type: Plain text
-#: lp.man:174 lpr.man:129
-msgid ""
-"Holds the job until the specified local time.  \"when\" can be \"indefinite"
-"\" to hold the until released, \"day-time\" to print the job between 6am and "
-"6pm local time, \"night\" to print the job between 6pm and 6am local time, "
-"\"second-shift\" to print the job between 4pm and 12am local time, \"third-"
-"shift\" to print the job between 12am and 8am local time, or \"weekend\" to "
-"print the job on Saturday or Sunday."
-msgstr ""
-"Mettre en attente la tâche jusqu’au moment indiqué (heure locale). « quand » "
-"peut être « indefinite » pour une attente jusqu’au prochain ordre, « day-"
-"time » pour une impression entre 6 h 00 et 18 h 00, « night » pour une "
-"impression entre 18 h 00 et 6 h 00, « second-shift » pour une impression "
-"entre 4 h 00 et 12 h 00, « third-shift » pour une impression entre 12 h 00 "
-"et 8 h 00 ou « weekend » pour imprimer les samedi ou dimanche."
+#: lpc.8:34
+msgid "Displays a short help message."
+msgstr "Afficher un message d'aide."
 
 # type: TP
 #. type: TP
-#: lp.man:174 lpr.man:129
+#: lpc.8:34
 #, no-wrap
-msgid "B<-o job-hold-until=>I<hh:mm>"
-msgstr "B<-o job-hold-until=>I<hh:mm>"
-
-#. type: Plain text
-#: lp.man:177 lpr.man:132
-msgid "Holds the job until the specified time in hours and minutes UTC."
-msgstr ""
-"Mettre la tâche en attente jusqu’au moment indiqué en heures et minutes UTC."
+msgid "B<quit>"
+msgstr "B<quit>"
 
 # type: TP
 #. type: TP
-#: lp.man:177 lpr.man:132
+#: lpc.8:37
 #, no-wrap
-msgid "B<-o job-priority=>I<priority>"
-msgstr "B<-o job-priority=>I<priorité>"
+msgid "B<status >[I<queue>]"
+msgstr "B<status >[I<file_impression>]"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:181 lpr.man:136
-msgid ""
-"Set the priority to a value from 1 (lowest) to 100 (highest), which "
-"influences when a job is scheduled for printing.  The default priority is "
-"typically 50."
+#: lpc.8:40
+msgid "Displays the status of one or more printer or class queues."
 msgstr ""
-"Définir la priorité du travail d'impression, de B<1> (minimale) à B<100> "
-"(maximale), qui influe sur le moment prévu. La priorité par défaut est B<50>."
-
-# type: TP
-#. type: TP
-#: lp.man:181 lpr.man:136
-#, no-wrap
-msgid "B<-o job-sheets=>I<name>"
-msgstr "B<-o job-sheets=>I<nom>"
+"Afficher l'état des files d'impression d'une ou plusieurs imprimantes ou "
+"classes d'imprimantes."
 
 #. type: Plain text
-#: lp.man:185 lpr.man:140
+#: lpc.8:42
+#, fuzzy
 msgid ""
-"Prints a cover page (banner) with the document.  The \"name\" can be "
-"\"classified\", \"confidential\", \"secret\", \"standard\", \"topsecret\", "
-"or \"unclassified\"."
+"This program is deprecated and will be removed in a future feature release "
+"of CUPS."
 msgstr ""
-"Imprimer une page d’ouverture (bannière) avec le document. Le nom peut être "
-"« name », « classified », « confidential », « secret », « standard », "
-"« topsecret », ou « unclassified »."
-
-# type: TP
-#. type: TP
-#: lp.man:185 lpr.man:140
-#, no-wrap
-msgid "B<-o job-sheets=>I<start-name,end-name>"
-msgstr "B<-o job-sheets=>I<nom-début,nom-fin>"
+"B<Ce programme est obsolète et sera supprimé dans une future version de CUPS."
+">"
 
+# type: Plain text
 #. type: Plain text
-#: lp.man:188 lpr.man:143
-msgid "Prints cover pages (banners) with the document."
-msgstr "Imprimer des pages de couverture (bannières) avec le document."
-
-# type: TP
-#. type: TP
-#: lp.man:188 lpr.man:143
-#, no-wrap
-msgid "B<-o media=>I<size>"
-msgstr "B<-o media=>I<taille>"
+#: lpc.8:47
+msgid ""
+"Since B<lpc> is geared towards the Berkeley printing system, it is "
+"impossible to use B<lpc> to configure printer or class queues provided by "
+"CUPS.  To configure printer or class queues you must use the B<lpadmin>(8)  "
+"command or another CUPS-compatible client with that functionality."
+msgstr ""
+"Étant donné que B<lpc> est spécifique au système d'impression de Berkeley, "
+"il est impossible de l'utiliser pour configurer les files d'attente de CUPS. "
+"Pour cela, vous devez utiliser le programme B<lpadmin>(8) ou tout autre "
+"client compatible avec CUPS remplissant ces fonctions."
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:191 lpr.man:146
+#: lpc.8:57
 msgid ""
-"Sets the page size to I<size>. Most printers support at least the size names "
-"\"a4\", \"letter\", and \"legal\"."
+"B<cancel>(1), B<cupsaccept>(8), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), "
+"B<lpr>(1), B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/"
+"help)"
 msgstr ""
-"Fixer la taille du papier à I<taille>. La plupart des imprimantes gèrent au "
-"moins les tailles appelées « a4 », « letter » et « legal »."
+"B<cancel>(1), B<cupsaccept>(8), B<cupsenable>(8), B<lp>(1), B<lpadmin>(8), "
+"B<lpr>(1), B<lprm>(1), B<lpstat>(1), aide en ligne de CUPS E<lt>URL:I<http://"
+"localhost:631/help>E<gt>"
 
-# type: TP
-#. type: TP
-#: lp.man:191 lpr.man:146
+# type: TH
+#. type: TH
+#: lpinfo.8:10
 #, no-wrap
-msgid "B<-o mirror>"
-msgstr "B<-o mirror>"
+msgid "lpinfo"
+msgstr "lpinfo"
 
+# type: Plain text
 #. type: Plain text
-#: lp.man:194 lpr.man:149
-msgid "Mirrors each page."
-msgstr "Appliquer un effet miroir pour chaque page."
-
-# type: TP
-#. type: TP
-#: lp.man:194 lpr.man:149
-#, no-wrap
-msgid "B<-o number-up=>{I<2|4|6|9|16>}"
-msgstr "B<-o number-up=>{I<2|4|6|9|16>}"
+#: lpinfo.8:13
+#, fuzzy
+msgid "lpinfo - show available devices or drivers (deprecated)"
+msgstr "lpinfo - Afficher les périphériques et pilotes disponibles."
 
 #. type: Plain text
-#: lp.man:197 lpr.man:152
-msgid "Prints 2, 4, 6, 9, or 16 document (input) pages on each output page."
+#: lpinfo.8:41
+msgid ""
+"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ B<--device-"
+"id> I<device-id-string> ] [ B<--exclude-schemes> I<scheme-list> ] [ B<--"
+"include-schemes> I<scheme-list> ] [ B<--language> I<locale> ] [ B<--make-and-"
+"model> I<name> ] [ B<--product> I<name> ] B<-m>"
 msgstr ""
-"Imprimer B<2>, B<4>, B<6>, B<9> ou B<16> pages (entrée) sur chaque page "
-"produite."
-
-# type: TP
-#. type: TP
-#: lp.man:197 lpr.man:152
-#, no-wrap
-msgid "B<-o number-up-layout=>I<layout>"
-msgstr "B<-o number-up-layout=>I<mise_en_page>"
+"B<lpinfo> [ B<-E> ] [ B<-h >I<serveur>[B<:>I<port>] ] [ B<-l> ] [ B<--device-"
+"id> I<chaîne_id_périphérique> ] [ B<--exclude-schemes> I<liste_schéma> ] "
+"[ B<--include-schemes> I<liste-schéma> ] [ B<--language> I<locale> ] [ B<--"
+"make-and-model> I<nom> ] [ B<--product> I<nom> ] B<-m>"
 
+# type: Plain text
 #. type: Plain text
-#: lp.man:202 lpr.man:157
+#: lpinfo.8:60
 msgid ""
-"Specifies the layout of pages with the \"number-up\" option.  The \"layout\" "
-"string can be \"btlr\", \"btrl\", \"lrbt\", \"lrtb\", \"rlbt\", \"rltb\", "
-"\"tblr\", or \"tbrl\" - the first two letters determine the column order "
-"while the second two letters determine the row order.  \"bt\" is bottom-to-"
-"top, \"lr\" is left-to-right, \"rl\" is right-to-left, and \"tb\" is top-to-"
-"bottom."
+"B<lpinfo> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-l> ] [ B<--exclude-"
+"schemes> I<scheme-list> ] [ B<--include-schemes> I<scheme-list> ] [ B<--"
+"timeout> I<seconds> ] B<-v>"
 msgstr ""
-"Indiquer la mise en page avec l’option « mise_en_page ».  La chaîne "
-"« mise_en_page » peut être « btlr », « btrl », « lrbt », « lrtb », « rlbt », "
-"« rltb », « tblr » ou « tbrl ». Les deux premières lettres indiquent l’ordre "
-"des colonnes tandis que les deux suivantes indiquent l’ordre des lignes.  "
-"« bt » veut dire bas vers haut, « lr » gauche vers droite, « rl » droite "
-"vers gauche et « tb » haut vers bas."
-
-# type: TP
-#. type: TP
-#: lp.man:202 lpr.man:157
-#, no-wrap
-msgid "B<-o orientation-requested=4>"
-msgstr "B<-o> I<orientation-requested=4>"
+"B<lpinfo> [ B<-E> ] [ B<-h >I<serveur>[B<:>I<port>] ] [ B<-l> ] [ B<--"
+"exclude-schemes> I<liste-schéma> ] [ B<--include-schemes> I<liste-schéma> ] "
+"[ B<--timeout> I<secondes> ] B<-v>"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:205 lpr.man:160
-msgid "Prints the job in landscape (rotated 90 degrees counter-clockwise)."
+#: lpinfo.8:63
+msgid ""
+"B<lpinfo> lists the available devices or drivers known to the CUPS server.  "
+"The first form (I<-m>) lists the available drivers, while the second form "
+"(I<-v>) lists the available devices."
 msgstr ""
-"Imprimer en mode paysage (rotation de 90 degrés dans le sens anti-horaire)."
+"B<lpinfo> affiche la liste des périphériques ou pilotes connus par le "
+"serveur CUPS. La première forme (avec B<-m>) liste les pilotes disponibles, "
+"et la seconde forme (avec B<-v>) liste les périphériques disponibles."
 
-# type: TP
-#. type: TP
-#: lp.man:205 lpr.man:160
-#, no-wrap
-msgid "B<-o orientation-requested=5>"
-msgstr "B<-o> I<orientation-requested=5>"
+# type: Plain text
+#. type: Plain text
+#: lpinfo.8:65
+msgid "B<lpinfo> accepts the following options:"
+msgstr "B<lpinfo> accepte les options suivantes :"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:208 lpr.man:163
-msgid "Prints the job in landscape (rotated 90 degrees clockwise)."
-msgstr "Imprimer en mode paysage (rotation de 90 degrés dans le sens horaire)."
+#: lpinfo.8:71
+msgid "Selects an alternate server."
+msgstr "Sélectionner un autre serveur."
+
+# type: Plain text
+#. type: Plain text
+#: lpinfo.8:74
+msgid "Shows a \"long\" listing of devices or drivers."
+msgstr "Afficher une liste « longue » des périphériques ou pilotes."
 
-# type: TP
 #. type: TP
-#: lp.man:208 lpr.man:163
+#: lpinfo.8:74
 #, no-wrap
-msgid "B<-o orientation-requested=6>"
-msgstr "B<-o> I<orientation-requested=6>"
+msgid "B<--device-id >I<device-id-string>"
+msgstr "B<--device-id> I<chaîne_id_périphérique>"
 
-# type: Plain text
 #. type: Plain text
-#: lp.man:211 lpr.man:166
-msgid "Prints the job in reverse portrait (rotated 180 degrees)."
-msgstr "Imprimer en mode portrait inversé (rotation de 180 degrés)."
+#: lpinfo.8:77
+msgid ""
+"Specifies the IEEE-1284 device ID to match when listing drivers with the I<-"
+"m> option."
+msgstr ""
+"Indiquer l'ID des périphériques IEEE-1284 à faire correspondre lors du "
+"parcours de la liste des pilotes avec l'option B<-m>."
 
-# type: TP
 #. type: TP
-#: lp.man:211 lpr.man:166
+#: lpinfo.8:77
 #, no-wrap
-msgid "B<-o outputorder=reverse>"
-msgstr "B<-o> I<outputorder=reverse>"
+msgid "B<--exclude-schemes >I<scheme-list>"
+msgstr "B<--exclude-schemes> I<liste_schéma>"
 
 #. type: Plain text
-#: lp.man:214 lpr.man:169
-msgid "Prints pages in reverse order."
-msgstr "Imprimer en ordre inverse."
+#: lpinfo.8:81
+msgid ""
+"Specifies a comma-delimited list of device or PPD schemes that should be "
+"excluded from the results.  Static PPD files use the \"file\" scheme."
+msgstr ""
+"Indiquer une liste séparée par des virgules de périphériques ou de schémas "
+"PPD qui devraient être exclus des résultats. Les fichiers statiques PPD "
+"utilisent le schéma « file »."
 
 #. type: TP
-#: lp.man:214 lpr.man:169
+#: lpinfo.8:81
 #, no-wrap
-msgid "B<-o page-border=>I<border>"
-msgstr "B<-o page-border=>I<bordure>"
+msgid "B<--include-schemes >I<scheme-list>"
+msgstr "B<--include-schemes> I<liste_schéma>"
 
 #. type: Plain text
-#: lp.man:218 lpr.man:173
+#: lpinfo.8:85
 msgid ""
-"Prints a border around each document page.  \"border\" is \"double\", "
-"\"double-thick\", \"single\", or \"single-thick\"."
+"Specifies a comma-delimited list of device or PPD schemes that should be "
+"included in the results.  Static PPD files use the \"file\" scheme."
 msgstr ""
-"Imprimer un encadrement pour chaque page du document. « bordure » est soit "
-"« double », « double-thick », « single » ou « single-thick »."
+"Indiquer une liste séparée par des virgules de périphériques ou de schémas "
+"PPD qui devraient être inclus dans les résultats. Les fichiers statiques PPD "
+"utilisent le schéma « file »."
 
 # type: TP
 #. type: TP
-#: lp.man:218 lpr.man:173
+#: lpinfo.8:85
 #, no-wrap
-msgid "B<-o page-ranges=>I<page-list>"
-msgstr "B<-o page-ranges=>I<liste_pages>"
+msgid "B<--language >I<locale>"
+msgstr "B<--language> I<locale>"
+
+#. type: Plain text
+#: lpinfo.8:88
+msgid ""
+"Specifies the language to match when listing drivers with the I<-m> option."
+msgstr ""
+"Indiquer la langue à faire correspondre lors de la création de la liste des "
+"pilotes avec l'option B<-m>."
 
-# type: TP
 #. type: TP
-#: lp.man:223 lpr.man:178
+#: lpinfo.8:88
 #, no-wrap
-msgid "B<-o sides=one-sided>"
-msgstr "B<-o> I<sides=one-sided>"
+msgid "B<--make-and-model >I<name>"
+msgstr "B<--make-and-model> I<nom>"
 
-# type: Plain text
 #. type: Plain text
-#: lp.man:226 lpr.man:181
-msgid "Prints on one side of the paper."
-msgstr "Imprimer sur une seule face de feuille."
+#: lpinfo.8:91
+msgid ""
+"Specifies the make and model to match when listing drivers with the I<-m> "
+"option."
+msgstr ""
+"Indiquer la marque et le modèle à faire correspondre lors de la création de "
+"la liste des pilotes avec l'option B<-m>."
 
 # type: TP
 #. type: TP
-#: lp.man:226 lpr.man:181
+#: lpinfo.8:91
 #, no-wrap
-msgid "B<-o sides=two-sided-long-edge>"
-msgstr "B<-o> I<sides=two-sided-long-edge>"
+msgid "B<--product >I<name>"
+msgstr "B<--product> I<nom>"
 
+# type: Plain text
 #. type: Plain text
-#: lp.man:229 lpr.man:184
-msgid "Prints on both sides of the paper for portrait output."
-msgstr "Imprimer sur les deux faces de feuille pour une sortie portrait."
+#: lpinfo.8:94
+msgid ""
+"Specifies the product to match when listing drivers with the I<-m> option."
+msgstr ""
+"Indiquer le produit à sélectionner lors de la création de la liste des "
+"pilotes avec l'option B<-m>."
 
 # type: TP
 #. type: TP
-#: lp.man:229 lpr.man:184
+#: lpinfo.8:94
 #, no-wrap
-msgid "B<-o sides=two-sided-short-edge>"
-msgstr "B<-o> I<sides=two-sided-short-edge>"
-
-#. type: Plain text
-#: lp.man:232 lpr.man:187
-msgid "Prints on both sides of the paper for landscape output."
-msgstr "Imprimer sur les deux faces de feuille pour une sortie paysage."
+msgid "B<--timeout >I<seconds>"
+msgstr "B<--timeout> I<secondes>"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:237
-msgid ""
-"The I<-q> option accepts a different range of values than the Solaris lp "
-"command, matching the IPP job priority values (1-100, 100 is highest "
-"priority) instead of the Solaris values (0-39, 0 is highest priority)."
+#: lpinfo.8:97
+msgid "Specifies the timeout when listing devices with the I<-v> option."
 msgstr ""
-"L'option « B<-q> » accepte des valeurs, différentes de celles utilisées par "
-"la commande B<lp> de Solaris, correspondant aux valeurs de priorité d’IPP "
-"(1-100, 100 étant la plus haute priorité), au lieu des valeurs de Solaris "
-"(0-39, 0 étant la plus haute priorité)."
+"Indiquer le délai d'attente lors de la création de la liste des "
+"périphériques avec l'option B<-v>."
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:239 lpr.man:191
-msgid "Print two copies of a document to the default printer:"
-msgstr "Imprimer deux copies d’un document sur l’imprimante par défaut :"
+#: lpinfo.8:99
+msgid "The I<lpinfo> command is unique to CUPS."
+msgstr "La commande B<lpinfo> est spécifique à CUPS."
 
-# type: Plain text
 #. type: Plain text
-#: lp.man:242
+#: lpinfo.8:101
+msgid "List all devices:"
+msgstr "Lister tous les périphériques :"
+
+# type: TH
+#. type: Plain text
+#: lpinfo.8:104
 #, no-wrap
-msgid "    lp -n 2 filename\n"
-msgstr "    lp -n 2 nom_fichier\n"
+msgid "    lpinfo -v\n"
+msgstr "    lpinfo -v\n"
 
-# type: Plain text
 #. type: Plain text
-#: lp.man:245 lpr.man:197
-msgid "Print a double-sided legal document to a printer called \"foo\":"
-msgstr ""
-"Imprimer en recto-verso sur une page « Legal » avec l'imprimante « toto » :"
+#: lpinfo.8:107
+msgid "List all drivers:"
+msgstr "Lister tous les pilotes :"
 
-# type: Plain text
+# type: TH
 #. type: Plain text
-#: lp.man:248
+#: lpinfo.8:110
 #, no-wrap
-msgid "    lp -d foo -o media=legal -o sides=two-sided-long-edge filename\n"
-msgstr "    lp -d foo -o media=legal -o sides=two-sided-long-edge nom_fichier\n"
+msgid "    lpinfo -m\n"
+msgstr "    lpinfo -m\n"
 
-# type: Plain text
 #. type: Plain text
-#: lp.man:251 lpr.man:203
-msgid "Print a presentation document 2-up to a printer called \"foo\":"
-msgstr "Imprimer une double composition avec l'imprimante « toto »."
+#: lpinfo.8:113
+msgid "List drivers matching \"HP LaserJet\":"
+msgstr "Lister tous les pilotes correspondants à « HP LaserJet » :"
 
-# type: Plain text
 #. type: Plain text
-#: lp.man:254
+#: lpinfo.8:116
 #, no-wrap
-msgid "    lp -d foo -o number-up=2 filename\n"
-msgstr "    lp -d toto -o number-up=2 nom_fichier\n"
+msgid "    lpinfo --make-and-model \"HP LaserJet\" -m\n"
+msgstr "    lpinfo --make-and-model \"HP LaserJet\" -m\n"
 
 # type: Plain text
 #. type: Plain text
-#: lp.man:264
-msgid ""
-"B<cancel>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), B<lpr>(1), "
-"B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
+#: lpinfo.8:124
+msgid "B<lpadmin>(8), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
-"B<cancel>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), B<lpr>(1), "
-"B<lprm>(1), B<lpstat>(1), aide en ligne de CUPS E<lt>URL:I<http://"
-"localhost:631/help>E<gt>"
+"B<lpadmin>(8), aide en ligne de CUPS E<lt>URL:I<http://localhost:631/"
+"help>E<gt>"
 
 # type: TH
 #. type: TH
-#: lpmove.man:13
+#: lpmove.8:10
 #, no-wrap
 msgid "lpmove"
 msgstr "lpmove"
 
-# type: TH
-#. type: TH
-#: lpmove.man:13
-#, no-wrap
-msgid "26 May 2016"
-msgstr "26 mai 2016"
-
 # type: Plain text
 #. type: Plain text
-#: lpmove.man:16
+#: lpmove.8:13
 msgid "lpmove - move a job or all jobs to a new destination"
 msgstr ""
 "lpmove - Déplacer un travail d'impression (ou tous) vers une nouvelle "
@@ -15698,7 +15674,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpmove.man:28
+#: lpmove.8:25
 msgid ""
 "B<lpmove> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-U> I<username> ] "
 "I<job> I<destination>"
@@ -15708,7 +15684,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpmove.man:40
+#: lpmove.8:37
 msgid ""
 "B<lpmove> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-U> I<username> ] "
 "I<source> I<destination>"
@@ -15718,7 +15694,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpmove.man:42
+#: lpmove.8:39
 msgid ""
 "B<lpmove> moves the specified I<job> or all jobs from I<source> to "
 "I<destination>. I<job> can be the job ID number or the old destination and "
@@ -15730,44 +15706,44 @@ msgstr ""
 "travail."
 
 #. type: Plain text
-#: lpmove.man:44
+#: lpmove.8:41
 msgid "The B<lpmove> command supports the following options:"
 msgstr "B<lpmove> accepte les options suivantes :"
 
 # type: Plain text
 #. type: Plain text
-#: lpmove.man:50 lpq.man:50 lpr.man:88 lprm.man:52 lpstat.man:86
+#: lpmove.8:47 lpq.1:47 lpr.1:85 lprm.1:49 lpstat.1:82
 msgid "Specifies an alternate username."
 msgstr "Utiliser un autre I<identifiant>."
 
 #. type: Plain text
-#: lpmove.man:55
+#: lpmove.8:52
 msgid "Move job 123 from \"oldprinter\" to \"newprinter\":"
 msgstr ""
 "Déplacer le travail 123 d’« ancienne_imprimante » vers "
 "« nouvelle_imprimante » :"
 
 #. type: Plain text
-#: lpmove.man:58
+#: lpmove.8:55
 #, no-wrap
 msgid "    lpmove 123 newprinter\n"
 msgstr "    lpmove 123 nouvelle_imprimante\n"
 
 #. type: Plain text
-#: lpmove.man:60
+#: lpmove.8:57
 #, no-wrap
 msgid "            I<or>\n"
 msgstr "            ou\n"
 
 # type: Plain text
 #. type: Plain text
-#: lpmove.man:62
+#: lpmove.8:59
 #, no-wrap
 msgid "    lpmove oldprinter-123 newprinter\n"
 msgstr "    lpmove ancienne_imprimante-123 nouvelle_imprimante\n"
 
 #. type: Plain text
-#: lpmove.man:65
+#: lpmove.8:62
 msgid "Move all jobs from \"oldprinter\" to \"newprinter\":"
 msgstr ""
 "Déplacer tous les travaux de « ancienne_imprimante » vers "
@@ -15775,34 +15751,27 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpmove.man:68
+#: lpmove.8:65
 #, no-wrap
 msgid "    lpmove oldprinter newprinter\n"
 msgstr "    lpmove ancienne_imprimante nouvelle_imprimante\n"
 
 # type: Plain text
 #. type: Plain text
-#: lpmove.man:74
+#: lpmove.8:71
 msgid "B<cancel>(1), B<lp>(1), B<lpr>(1), B<lprm>(1),"
 msgstr "B<cancel>(1), B<lp>(1), B<lpr>(1), B<lprm>(1),"
 
 # type: TH
 #. type: TH
-#: lpoptions.man.in:13
+#: lpoptions.1:10
 #, no-wrap
 msgid "lpoptions"
 msgstr "lpoptions"
 
-# type: TH
-#. type: TH
-#: lpoptions.man.in:13
-#, fuzzy, no-wrap
-msgid "10 April 2018"
-msgstr "15 avril 2014"
-
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:16
+#: lpoptions.1:13
 msgid "lpoptions - display or set printer options and defaults"
 msgstr ""
 "lpoptions - Afficher et définir les options et paramètres par défaut d'une "
@@ -15810,7 +15779,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:27
+#: lpoptions.1:24
 #, fuzzy
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] B<-d "
@@ -15821,7 +15790,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:37
+#: lpoptions.1:34
 #, fuzzy
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-p "
@@ -15833,7 +15802,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:48
+#: lpoptions.1:45
 #, fuzzy
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-p "
@@ -15844,7 +15813,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:56
+#: lpoptions.1:53
 #, fuzzy
 msgid ""
 "B<lpoptions> [ B<-E> ] [ B<-h >I<server>[B<:>I<port>] ] B<-x "
@@ -15855,7 +15824,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:60
+#: lpoptions.1:57
 msgid ""
 "B<lpoptions> displays or sets printer options and defaults.  If no printer "
 "is specified using the I<-p> option, the default printer is used as "
@@ -15867,7 +15836,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:62
+#: lpoptions.1:59
 msgid ""
 "If no I<-l>, I<-o>, or I<-r> options are specified, the current options are "
 "reported on the standard output."
@@ -15877,7 +15846,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:68
+#: lpoptions.1:65
 msgid ""
 "Options set with the B<lpoptions> command are used by the B<lp>(1)  and "
 "B<lpr>(1)  commands when submitting jobs."
@@ -15887,7 +15856,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:71
+#: lpoptions.1:68
 msgid ""
 "When run by the root user, B<lpoptions> gets and sets default options and "
 "instances for all users in the I</etc/cups/lpoptions> file.  Otherwise, the "
@@ -15900,26 +15869,26 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:73
+#: lpoptions.1:70
 msgid "B<lpoptions> supports the following options:"
 msgstr "B<lpoptions> accepte les options suivantes :"
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:76
+#: lpoptions.1:73
 msgid "Enables encryption when communicating with the CUPS server."
 msgstr "Activer le chiffrement pour la communication avec le serveur CUPS."
 
 # type: TP
 #. type: TP
-#: lpoptions.man.in:76
+#: lpoptions.1:73
 #, no-wrap
 msgid "B<-d >I<destination>[B</>I<instance>]"
 msgstr "B<-d> I<destination>[B</>I<instance>]"
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:81
+#: lpoptions.1:78
 msgid ""
 "Sets the user default printer to I<destination>.  If I<instance> is supplied "
 "then that particular instance is used.  This option overrides the system "
@@ -15932,39 +15901,39 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:84
+#: lpoptions.1:81
 msgid "Uses an alternate server."
 msgstr "Utiliser un autre serveur."
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:87
+#: lpoptions.1:84
 msgid "Lists the printer specific options and their current settings."
 msgstr "Afficher les options spécifiques d'une imprimante et leur valeur."
 
 # type: TP
 #. type: TP
-#: lpoptions.man.in:87 lpr.man:101
+#: lpoptions.1:84 lpr.1:98
 #, no-wrap
 msgid "B<-o >I<option>[B<=>I<value>]"
 msgstr "B<-o> I<option>[B<=>I<valeur>]"
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:90
+#: lpoptions.1:87
 msgid "Specifies a new option for the named destination."
 msgstr "Définir une nouvelle option pour la destination donnée."
 
 # type: TP
 #. type: TP
-#: lpoptions.man.in:90
+#: lpoptions.1:87
 #, no-wrap
 msgid "B<-p >I<destination>[B</>I<instance>]"
 msgstr "B<-p> I<destination>[B</>I<instance>]"
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:97
+#: lpoptions.1:94
 msgid ""
 "Sets the destination and instance, if specified, for any options that "
 "follow.  If the named instance does not exist then it is created.  "
@@ -15977,27 +15946,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: lpoptions.man.in:97
+#: lpoptions.1:94
 #, no-wrap
 msgid "B<-r >I<option>"
 msgstr "B<-r> I<option>"
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:100
+#: lpoptions.1:97
 msgid "Removes the specified option from the named destination."
 msgstr "Supprimer une option de la destination fournie en paramètre."
 
 # type: TP
 #. type: TP
-#: lpoptions.man.in:100
+#: lpoptions.1:97
 #, no-wrap
 msgid "B<-x >I<destination>[B</>I<instance>]"
 msgstr "B<-x> I<destination>[B</>I<instance>]"
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:107
+#: lpoptions.1:104
 msgid ""
 "Removes the options for the named destination and instance, if specified.  "
 "If the named instance does not exist then this does nothing.  Destinations "
@@ -16010,7 +15979,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:109
+#: lpoptions.1:106
 msgid ""
 "I<~/.cups/lpoptions> - user defaults and instances created by non-root users."
 msgstr ""
@@ -16019,7 +15988,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:111
+#: lpoptions.1:108
 msgid ""
 "I</etc/cups/lpoptions> - system-wide defaults and instances created by the "
 "root user."
@@ -16029,12 +15998,12 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpoptions.man.in:113
+#: lpoptions.1:110
 msgid "The B<lpoptions> command is unique to CUPS."
 msgstr "La commande B<lpoptions> est spécifique à CUPS."
 
 #. type: Plain text
-#: lpoptions.man.in:120
+#: lpoptions.1:117
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpadmin>(8), B<lpr>(1), B<lprm>(1), CUPS Online "
 "Help (http://localhost:631/help)"
@@ -16044,20 +16013,20 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: lpq.man:13
+#: lpq.1:10
 #, no-wrap
 msgid "lpq"
 msgstr "lpq"
 
 # type: Plain text
 #. type: Plain text
-#: lpq.man:16
+#: lpq.1:13
 msgid "lpq - show printer queue status"
 msgstr "lpq - Afficher l'état d'une file d'impression."
 
 # type: Plain text
 #. type: Plain text
-#: lpq.man:34
+#: lpq.1:31
 msgid ""
 "B<lpq> [ B<-E> ] [ B<-U> I<username> ] [ B<-h >I<server>[B<:>I<port>] ] [ B<-"
 "P >I<destination>[B</>I<instance>] ] [ B<-a> ] [ B<-l> ] [ B<+>I<interval> ]"
@@ -16068,7 +16037,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpq.man:37
+#: lpq.1:34
 msgid ""
 "B<lpq> shows the current print queue status on the named printer.  Jobs "
 "queued on the default destination will be shown if no printer or class is "
@@ -16081,7 +16050,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpq.man:39
+#: lpq.1:36
 msgid ""
 "The I<+interval> option allows you to continuously report the jobs in the "
 "queue until the queue is empty; the list of jobs is shown once every "
@@ -16093,38 +16062,38 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpq.man:41
+#: lpq.1:38
 msgid "B<lpq> supports the following options:"
 msgstr "B<lpq> accepte les options suivantes :"
 
 # type: TP
 #. type: TP
-#: lpq.man:44 lpr.man:82
+#: lpq.1:41 lpr.1:79
 #, no-wrap
 msgid "B<-P >I<destination>[B</>I<instance>]"
 msgstr "B<-P> I<destination>[B</>I<instance>]"
 
 # type: Plain text
 #. type: Plain text
-#: lpq.man:47
+#: lpq.1:44
 msgid "Specifies an alternate printer or class name."
 msgstr "Utiliser un autre nom d’imprimante ou classe d'imprimante."
 
 # type: Plain text
 #. type: Plain text
-#: lpq.man:53
+#: lpq.1:50
 msgid "Reports jobs on all printers."
 msgstr "Afficher les travaux de toutes les imprimantes."
 
 # type: Plain text
 #. type: Plain text
-#: lpq.man:59
+#: lpq.1:56
 msgid "Requests a more verbose (long) reporting format."
 msgstr "Demander un format de rapport plus bavard."
 
 # type: Plain text
 #. type: Plain text
-#: lpq.man:66
+#: lpq.1:63
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpr>(1), B<lprm>(1), B<lpstat>(1), CUPS Online "
 "Help (http://localhost:631/help)"
@@ -16134,20 +16103,20 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: lpr.man:13
+#: lpr.1:10
 #, no-wrap
 msgid "lpr"
 msgstr "lpr"
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:16
+#: lpr.1:13
 msgid "lpr - print files"
 msgstr "lpr - Imprimer des fichiers."
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:56
+#: lpr.1:53
 msgid ""
 "B<lpr> [ B<-E> ] [ B<-H >I<server>[B<:>I<port>] ] [ B<-U> I<username> ] [ B<-"
 "P >I<destination>[B</>I<instance>] ] [ B<-#> I<num-copies> [ B<-h> ] [ B<-"
@@ -16162,7 +16131,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:60
+#: lpr.1:57
 msgid ""
 "B<lpr> submits files for printing.  Files named on the command line are sent "
 "to the named printer or the default destination if no destination is "
@@ -16176,54 +16145,54 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:69
+#: lpr.1:66
 msgid "The following options are recognized by I<lpr>:"
 msgstr "Les options suivantes sont gérées par B<lpr> :"
 
 # type: TP
 #. type: TP
-#: lpr.man:72
+#: lpr.1:69
 #, no-wrap
 msgid "B<-H >I<server>[B<:>I<port>]"
 msgstr "B<-H> I<serveur>[B<:>I<port>]"
 
 # type: TP
 #. type: TP
-#: lpr.man:75
+#: lpr.1:72
 #, no-wrap
 msgid "B<-C \">I<name>B<\">"
 msgstr "B<-C \">I<nom>B<\">"
 
 # type: TP
 #. type: TP
-#: lpr.man:77
+#: lpr.1:74
 #, no-wrap
 msgid "B<-J \">I<name>B<\">"
 msgstr "B<-J \">I<nom>B<\">"
 
 # type: TP
 #. type: TP
-#: lpr.man:79
+#: lpr.1:76
 #, no-wrap
 msgid "B<-T \">I<name>B<\">"
 msgstr "B<-T \">I<nom>B<\">"
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:82
+#: lpr.1:79
 msgid "Sets the job name/title."
 msgstr "Définir le nom et titre du travail."
 
 # type: TP
 #. type: TP
-#: lpr.man:88
+#: lpr.1:85
 #, no-wrap
 msgid "B<-# >I<copies>"
 msgstr "B<-#> I<copies>"
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:94
+#: lpr.1:91
 msgid ""
 "Disables banner printing. This option is equivalent to I<-o job-sheets=none>."
 msgstr ""
@@ -16232,7 +16201,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:98
+#: lpr.1:95
 msgid ""
 "Specifies that the print file is already formatted for the destination and "
 "should be sent without filtering.  This option is equivalent to I<-o raw>."
@@ -16243,12 +16212,12 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:101
+#: lpr.1:98
 msgid "Send an email on job completion."
 msgstr "Envoyer un courrier électronique à la fin du travail d'impression."
 
 #. type: Plain text
-#: lpr.man:105
+#: lpr.1:102
 msgid "Sets a job option.  See \"COMMON JOB OPTIONS\" below."
 msgstr ""
 "Définir une option de travail. Consultez « OPTIONS COMMUNES DES TRAVAUX » ci-"
@@ -16256,7 +16225,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:109
+#: lpr.1:106
 msgid ""
 "Specifies that the print file should be formatted with a shaded header with "
 "the date, time, job name, and page number.  This option is equivalent to I<-"
@@ -16269,13 +16238,13 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:112
+#: lpr.1:109
 msgid "Hold job for printing."
 msgstr "Suspendre l'impression d'un travail."
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:115
+#: lpr.1:112
 msgid ""
 "Specifies that the named print files should be deleted after submitting them."
 msgstr ""
@@ -16283,7 +16252,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:189
+#: lpr.1:153
 msgid ""
 "The I<-c>, I<-d>, I<-f>, I<-g>, I<-i>, I<-n>, I<-t>, I<-v>, and I<-w> "
 "options are not supported by CUPS and produce a warning message if used."
@@ -16294,28 +16263,34 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:194
+#: lpr.1:158
 #, no-wrap
 msgid "    lpr -# 2 filename\n"
 msgstr "    lpr -# 2 nom_fichier\n"
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:200
+#: lpr.1:164
 #, no-wrap
 msgid "    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename\n"
 msgstr "    lpr -P foo -o media=legal -o sides=two-sided-long-edge nom_fichier\n"
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:206
+#: lpr.1:167
+msgid "Print a presentation document 2-up to a printer called \"foo\":"
+msgstr "Imprimer une double composition avec l'imprimante « toto »."
+
+# type: Plain text
+#. type: Plain text
+#: lpr.1:170
 #, no-wrap
 msgid "    lpr -P foo -o number-up=2 filename\n"
 msgstr "    lpr -P foo -o number-up=2 nom_fichier\n"
 
 # type: Plain text
 #. type: Plain text
-#: lpr.man:216
+#: lpr.1:180
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpadmin>(8), B<lpoptions>(1), B<lpq>(1), "
 "B<lprm>(1), B<lpstat>(1), CUPS Online Help (http://localhost:631/help)"
@@ -16326,27 +16301,20 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: lprm.man:13
+#: lprm.1:10
 #, no-wrap
 msgid "lprm"
 msgstr "lprm"
 
-# type: TH
-#. type: TH
-#: lprm.man:13
-#, no-wrap
-msgid "22 May 2014"
-msgstr "22 mai 2014"
-
 # type: Plain text
 #. type: Plain text
-#: lprm.man:16
+#: lprm.1:13
 msgid "lprm - cancel print jobs"
 msgstr "lprm - Annuler des travaux d'impression."
 
 # type: Plain text
 #. type: Plain text
-#: lprm.man:34
+#: lprm.1:31
 msgid ""
 "B<lprm> [ B<-E> ] [ B<-U> I<username> ] [ B<-h> I<server>[I<:port>] ] [ B<-"
 "P> I<destination>[I</instance>] ] [ B<-> ] [ I<job-id(s)> ]"
@@ -16357,7 +16325,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lprm.man:39
+#: lprm.1:36
 msgid ""
 "B<lprm> cancels print jobs that have been queued for printing.  If no "
 "arguments are supplied, the current job on the default destination is "
@@ -16372,33 +16340,33 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lprm.man:43
+#: lprm.1:40
 msgid "The B<lprm> command supports the following options:"
 msgstr "B<lprm> accepte les options suivantes :"
 
 # type: TP
 #. type: TP
-#: lprm.man:46
+#: lprm.1:43
 #, no-wrap
 msgid "B<-P >I<destination>[I</instance>]"
 msgstr "B<-P> I<destination>[B</>B<instance>]"
 
 # type: Plain text
 #. type: Plain text
-#: lprm.man:49
+#: lprm.1:46
 msgid "Specifies the destination printer or class."
 msgstr "Indiquer l'imprimante ou la classe d'imprimante de destination."
 
 # type: TP
 #. type: TP
-#: lprm.man:52
+#: lprm.1:49
 #, no-wrap
 msgid "B<-h >I<server>[I<:port>]"
 msgstr "B<-h> I<serveur>[B<:>I<port>]"
 
 # type: Plain text
 #. type: Plain text
-#: lprm.man:59
+#: lprm.1:56
 msgid ""
 "The CUPS version of B<lprm> is compatible with the standard Berkeley command "
 "of the same name."
@@ -16407,37 +16375,37 @@ msgstr ""
 "Berkeley."
 
 #. type: Plain text
-#: lprm.man:61
+#: lprm.1:58
 msgid "Cancel the current job on the default printer:"
 msgstr "Annuler le travail en cours sur l’imprimante par défaut :"
 
 # type: TH
 #. type: Plain text
-#: lprm.man:64
+#: lprm.1:61
 #, no-wrap
 msgid "    lprm\n"
 msgstr "    lprm\n"
 
 #. type: Plain text
-#: lprm.man:67
+#: lprm.1:64
 msgid "Cancel job 1234:"
 msgstr "Annuler le travail 1234 :"
 
 #. type: Plain text
-#: lprm.man:70
+#: lprm.1:67
 #, no-wrap
 msgid "    lprm 1234\n"
 msgstr "    lprm 1234\n"
 
 #. type: Plain text
-#: lprm.man:76
+#: lprm.1:73
 #, no-wrap
 msgid "    lprm -\n"
 msgstr "    lprm -\n"
 
 # type: Plain text
 #. type: Plain text
-#: lprm.man:84
+#: lprm.1:81
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpq>(1), B<lpr>(1), B<lpstat>(1), CUPS Online Help "
 "(http://localhost:631/help)"
@@ -16447,27 +16415,20 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: lpstat.man:13
+#: lpstat.1:9
 #, no-wrap
 msgid "lpstat"
 msgstr "lpstat"
 
-# type: TH
-#. type: TH
-#: lpstat.man:13
-#, no-wrap
-msgid "26 May 2017"
-msgstr "26 mai 2017"
-
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:16
+#: lpstat.1:12
 msgid "lpstat - print cups status information"
 msgstr "lpstat - Afficher l'état de CUPS."
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:69
+#: lpstat.1:65
 msgid ""
 "B<lpstat> [ B<-E> ] [ B<-H> ] [ B<-U> I<username> ] [ B<-h >I<hostname>[B<:"
 ">I<port>] ] [ B<-l> ] [ B<-W> I<which-jobs> ] [ B<-a> "
@@ -16484,7 +16445,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:72
+#: lpstat.1:68
 msgid ""
 "B<lpstat> displays status information about the current classes, jobs, and "
 "printers.  When run with no arguments, B<lpstat> will list active jobs "
@@ -16496,44 +16457,44 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:74
+#: lpstat.1:70
 msgid "The B<lpstat> command supports the following options:"
 msgstr "B<lpstat> accepte les options suivantes :"
 
 #. type: TP
-#: lpstat.man:77
+#: lpstat.1:73
 #, no-wrap
 msgid "B<-H>"
 msgstr "B<-H>"
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:80
+#: lpstat.1:76
 msgid "Shows the server hostname and port."
 msgstr "Afficher le nom d’hôte du serveur et son port."
 
 #. type: TP
-#: lpstat.man:80
+#: lpstat.1:76
 #, no-wrap
 msgid "B<-R>"
 msgstr "B<-R>"
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:83
+#: lpstat.1:79
 msgid "Shows the ranking of print jobs."
 msgstr "Afficher le rang des travaux d'impression."
 
 # type: TP
 #. type: TP
-#: lpstat.man:86
+#: lpstat.1:82
 #, no-wrap
 msgid "B<-W >I<which-jobs>"
 msgstr "B<-W> I<quels_travaux>"
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:90
+#: lpstat.1:86
 msgid ""
 "Specifies which jobs to show, \"completed\" or \"not-completed\" (the "
 "default).  This option I<must> appear before the I<-o> option and/or any "
@@ -16548,14 +16509,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: lpstat.man:90
+#: lpstat.1:86
 #, no-wrap
 msgid "B<-a >[I<printer(s)>]"
 msgstr "B<-a> [I<imprimante(s)>]"
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:94
+#: lpstat.1:90
 msgid ""
 "Shows the accepting state of printer queues.  If no printers are specified "
 "then all printers are listed."
@@ -16566,14 +16527,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: lpstat.man:94
+#: lpstat.1:90
 #, no-wrap
 msgid "B<-c >[I<class(es)>]"
 msgstr "B<-c> [I<classe(s)>]"
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:98
+#: lpstat.1:94
 msgid ""
 "Shows the printer classes and the printers that belong to them.  If no "
 "classes are specified then all classes are listed."
@@ -16583,25 +16544,25 @@ msgstr ""
 "affichées."
 
 #. type: TP
-#: lpstat.man:98
+#: lpstat.1:94
 #, no-wrap
 msgid "B<-d>"
 msgstr "B<-d>"
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:101
+#: lpstat.1:97
 msgid "Shows the current default destination."
 msgstr "Afficher la destination par défaut."
 
 #. type: Plain text
-#: lpstat.man:104
+#: lpstat.1:100
 msgid "Shows all available destinations on the local network."
 msgstr "Afficher toutes les destinations disponibles sur le réseau local."
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:110
+#: lpstat.1:106
 msgid "Shows a long listing of printers, classes, or jobs."
 msgstr ""
 "Afficher une liste détaillée des imprimantes, classes et travaux "
@@ -16609,14 +16570,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: lpstat.man:110
+#: lpstat.1:106
 #, no-wrap
 msgid "B<-o >[I<destination(s)>]"
 msgstr "B<-o> [I<destination(s)>]"
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:114
+#: lpstat.1:110
 msgid ""
 "Shows the jobs queued on the specified destinations.  If no destinations are "
 "specified all jobs are shown."
@@ -16627,14 +16588,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: lpstat.man:114
+#: lpstat.1:110
 #, no-wrap
 msgid "B<-p >[I<printer(s)>]"
 msgstr "B<-p> [I<imprimante(s)>]"
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:118
+#: lpstat.1:114
 msgid ""
 "Shows the printers and whether they are enabled for printing.  If no "
 "printers are specified then all printers are listed."
@@ -16645,13 +16606,13 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:121
+#: lpstat.1:117
 msgid "Shows whether the CUPS server is running."
 msgstr "Afficher si le serveur CUPS est actif."
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:125
+#: lpstat.1:121
 msgid ""
 "Shows a status summary, including the default destination, a list of classes "
 "and their member printers, and a list of printers and their associated "
@@ -16664,7 +16625,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:129
+#: lpstat.1:125
 msgid ""
 "Shows all status information.  This is equivalent to using the I<-r>, I<-d>, "
 "I<-c>, I<-v>, I<-a>, I<-p>, and I<-o> options."
@@ -16674,14 +16635,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: lpstat.man:129
+#: lpstat.1:125
 #, no-wrap
 msgid "B<-u >[I<user(s)>]"
 msgstr "B<-u> [I<utilisateur(s)>]"
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:133
+#: lpstat.1:129
 msgid ""
 "Shows a list of print jobs queued by the specified users.  If no users are "
 "specified, lists the jobs queued by the current user."
@@ -16692,14 +16653,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: lpstat.man:133
+#: lpstat.1:129
 #, no-wrap
 msgid "B<-v >[I<printer(s)>]"
 msgstr "B<-v> [I<imprimante(s)>]"
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:137
+#: lpstat.1:133
 msgid ""
 "Shows the printers and what device they are attached to.  If no printers are "
 "specified then all printers are listed."
@@ -16710,7 +16671,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:140
+#: lpstat.1:136
 msgid ""
 "Unlike the System V printing system, CUPS allows printer names to contain "
 "any printable character except SPACE, TAB, \"/\", and \"#\".  Also, printer "
@@ -16723,20 +16684,20 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:142
+#: lpstat.1:138
 msgid "The I<-h>, I<-e>, I<-E>, I<-U>, and I<-W> options are unique to CUPS."
 msgstr ""
 "Les options B<-h>, B<-e>, B<-E>, B<-U> et B<-W> sont spécifiques à CUPS."
 
 # type: Plain text
 #. type: Plain text
-#: lpstat.man:144
+#: lpstat.1:140
 msgid "The Solaris I<-f>, I<-P>, and I<-S> options are silently ignored."
 msgstr ""
 "Les options B<-f>, B<-P> et B<-S> de Solaris sont ignorées sans affichage."
 
 #. type: Plain text
-#: lpstat.man:151
+#: lpstat.1:147
 msgid ""
 "B<cancel>(1), B<lp>(1), B<lpq>(1), B<lpr>(1), B<lprm>(1), CUPS Online Help "
 "(http://localhost:631/help)"
@@ -16746,14 +16707,14 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: mailto.conf.man:13
+#: mailto.conf.5:10
 #, no-wrap
 msgid "mailto.conf"
 msgstr "mailto.conf"
 
 # type: Plain text
 #. type: Plain text
-#: mailto.conf.man:16
+#: mailto.conf.5:13
 msgid "mailto.conf - configuration file for cups email notifier"
 msgstr ""
 "mailto.conf - Fichier de configuration pour les notifications par courrier "
@@ -16761,7 +16722,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: mailto.conf.man:18
+#: mailto.conf.5:15
 msgid ""
 "The B<mailto.conf> file defines the local mail server and email notification "
 "preferences for CUPS."
@@ -16771,14 +16732,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: mailto.conf.man:24
+#: mailto.conf.5:21
 #, no-wrap
 msgid "B<Cc >I<cc-address@domain.com>"
 msgstr "B<Cc> I<adresse_copie@domaine.com>"
 
 # type: Plain text
 #. type: Plain text
-#: mailto.conf.man:27
+#: mailto.conf.5:24
 msgid "Specifies an additional recipient for all email notifications."
 msgstr ""
 "Indiquer une adresse supplémentaire à laquelle les notifications par "
@@ -16786,27 +16747,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: mailto.conf.man:27
+#: mailto.conf.5:24
 #, no-wrap
 msgid "B<From >I<from-address@domain.com>"
 msgstr "B<From> I<adresse_émetteur@domaine.com>"
 
 # type: Plain text
 #. type: Plain text
-#: mailto.conf.man:30
+#: mailto.conf.5:27
 msgid "Specifies the sender of email notifications."
 msgstr "Indiquer l'émetteur des notifications par courrier électronique."
 
 # type: Plain text
 #. type: TP
-#: mailto.conf.man:30
+#: mailto.conf.5:27
 #, no-wrap
 msgid "B<Sendmail >I<sendmail command and options>"
 msgstr "B<Sendmail> I<commande_sendmail_et_options>"
 
 # type: Plain text
 #. type: Plain text
-#: mailto.conf.man:35
+#: mailto.conf.5:32
 msgid ""
 "Specifies the sendmail command to use when sending email notifications.  "
 "Only one I<Sendmail> or I<SMTPServer> line may be present in the B<mailto."
@@ -16819,14 +16780,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: mailto.conf.man:35
+#: mailto.conf.5:32
 #, no-wrap
 msgid "B<SMTPServer >I<servername>"
 msgstr "B<SMTPServer> I<nom_serveur>"
 
 # type: Plain text
 #. type: Plain text
-#: mailto.conf.man:40
+#: mailto.conf.5:37
 msgid ""
 "Specifies a SMTP server to send email notifications to.  Only one "
 "I<Sendmail> or I<SMTPServer> line may be present in the B<mailto.conf> "
@@ -16839,48 +16800,42 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: mailto.conf.man:40
+#: mailto.conf.5:37
 #, no-wrap
 msgid "B<Subject >I<subject-prefix>"
 msgstr "B<Subject> I<préfixe_sujet>"
 
 # type: Plain text
 #. type: Plain text
-#: mailto.conf.man:43
+#: mailto.conf.5:40
 msgid ""
 "Specifies a prefix string for the subject line of an email notification."
 msgstr "Utiliser un préfixe dans les sujets des courriers de notification."
 
 # type: Plain text
 #. type: Plain text
-#: mailto.conf.man:46
+#: mailto.conf.5:43
 msgid "B<cupsd>(8), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 "B<cupsd>(8), aide en ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
 
 # type: TH
 #. type: TH
-#: mime.convs.man:13
+#: mime.convs.5:10
 #, no-wrap
 msgid "mime.convs"
 msgstr "mime.convs"
 
-#. type: TH
-#: mime.convs.man:13
-#, no-wrap
-msgid "26 August 2015"
-msgstr "26 août 2015"
-
 # type: Plain text
 #. type: Plain text
-#: mime.convs.man:16
+#: mime.convs.5:13
 #, fuzzy
-msgid "mime.convs - mime type conversion file for cups"
+msgid "mime.convs - mime type conversion file for cups (deprecated)"
 msgstr "mime.convs - Fichier de conversion des types MIME pour CUPS."
 
 # type: Plain text
 #. type: Plain text
-#: mime.convs.man:19
+#: mime.convs.5:16
 msgid ""
 "The B<mime.convs> file defines the filters that are available for converting "
 "files from one format to another.  The standard filters support text, PDF, "
@@ -16892,7 +16847,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: mime.convs.man:21
+#: mime.convs.5:18
 msgid ""
 "Additional filters are specified in files with the extension I<.convs> in "
 "the CUPS configuration directory."
@@ -16902,7 +16857,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: mime.convs.man:26
+#: mime.convs.5:23
 msgid ""
 "Each line in the B<mime.convs> file is a comment, blank, or filter line.  "
 "Comment lines start with the # character.  Filter lines specify the source "
@@ -16915,13 +16870,13 @@ msgstr ""
 "cible, le coût virtuel du filtre, puis le filtre lui-même :"
 
 #. type: Plain text
-#: mime.convs.man:29
+#: mime.convs.5:26
 #, no-wrap
 msgid "    source/type destination/type cost filter\n"
 msgstr "    source/type destination/type coût filtre\n"
 
 #. type: Plain text
-#: mime.convs.man:32
+#: mime.convs.5:29
 msgid ""
 "The I<source/type> field specifies the source MIME media type that is "
 "consumed by the filter."
@@ -16930,7 +16885,7 @@ msgstr ""
 "filtre."
 
 #. type: Plain text
-#: mime.convs.man:34
+#: mime.convs.5:31
 msgid ""
 "The I<destination/type> field specifies the destination MIME media type that "
 "is produced by the filter."
@@ -16939,7 +16894,7 @@ msgstr ""
 "produit par le filtre."
 
 #. type: Plain text
-#: mime.convs.man:37
+#: mime.convs.5:34
 msgid ""
 "The I<cost> field specifies the relative cost for running the filter.  A "
 "value of 100 means that the filter uses a large amount of resources while a "
@@ -16950,7 +16905,7 @@ msgstr ""
 "une très petite quantité."
 
 #. type: Plain text
-#: mime.convs.man:40
+#: mime.convs.5:37
 msgid ""
 "The I<filter> field specifies the filter program filename.  Filenames are "
 "relative to the CUPS filter directory."
@@ -16960,24 +16915,24 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: mime.convs.man:42 mime.types.man:92
+#: mime.convs.5:39 mime.types.5:89
 msgid "I</etc/cups> - Typical CUPS configuration directory."
 msgstr "I</etc/cups> — répertoire de configuration classique de CUPS."
 
 #. type: Plain text
-#: mime.convs.man:44
+#: mime.convs.5:41
 msgid "I</usr/lib/cups/filter> - Typical CUPS filter directory."
 msgstr ""
 "I</usr/lib/cups/filter> — répertoire de configuration classique des filtres "
 "CUPS."
 
 #. type: Plain text
-#: mime.convs.man:46
+#: mime.convs.5:43
 msgid "I</usr/libexec/cups/filter> - CUPS filter directory on macOS."
 msgstr "I</usr/libexec/cups/filter> - répertoire de filtres CUPS pour macOS."
 
 #. type: Plain text
-#: mime.convs.man:48
+#: mime.convs.5:45
 msgid ""
 "Define a filter that converts PostScript documents to CUPS Raster format:"
 msgstr ""
@@ -16986,13 +16941,21 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: mime.convs.man:51
+#: mime.convs.5:48
 #, no-wrap
 msgid "    application/vnd.cups-postscript application/vnd.cups-raster 50 pstoraster\n"
 msgstr "    application/vnd.cups-postscript application/vnd.cups-raster 50 pstoraster\n"
 
 #. type: Plain text
-#: mime.convs.man:60
+#: mime.convs.5:54
+msgid ""
+"CUPS filters are deprecated and will no longer be supported in a future "
+"feature release of CUPS.  Printers that do not support IPP can be supported "
+"using applications such as B<ippeveprinter>(1)."
+msgstr ""
+
+#. type: Plain text
+#: mime.convs.5:61
 msgid ""
 "B<cups-files.conf>(5), B<cupsd.conf>(5), B<cupsd>(8), B<cupsfilter>(8), "
 "B<mime.types>(5), CUPS Online Help (http://localhost:631/help)"
@@ -17003,27 +16966,27 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: mime.types.man:13
+#: mime.types.5:10
 #, no-wrap
 msgid "mime.types"
 msgstr "mime.types"
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:16
+#: mime.types.5:13
 msgid "mime.types - mime type description file for cups"
 msgstr "mime.types - Fichier de description des types MIME de CUPS."
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:18
+#: mime.types.5:15
 msgid "The B<mime.types> file defines the recognized file types."
 msgstr ""
 "Le fichier I<mime.types> définit les types de fichier reconnus par CUPS."
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:20
+#: mime.types.5:17
 msgid ""
 "Additional file types are specified in files with the extension I<.types> in "
 "the CUPS configuration directory."
@@ -17033,7 +16996,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:24
+#: mime.types.5:21
 msgid ""
 "Each line in the B<mime.types> file is a comment, blank, or rule line.  "
 "Comment lines start with the # character.  Rule lines start with the MIME "
@@ -17047,13 +17010,13 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:27
+#: mime.types.5:24
 #, no-wrap
 msgid "    I<mime/type >[ I<rule >... I<rule >]\n"
 msgstr "    I<mime/type >[ I<règle >... I<règle >]\n"
 
 #. type: Plain text
-#: mime.types.man:30
+#: mime.types.5:27
 msgid ""
 "Rules can be extended over multiple lines using the backslash character "
 "(\\e):"
@@ -17062,7 +17025,7 @@ msgstr ""
 "inverse (\\e) :"
 
 #. type: Plain text
-#: mime.types.man:34
+#: mime.types.5:31
 #, no-wrap
 msgid ""
 "    I<mime/type >[ I<really-really-really-long-rule >... B<\\e\n"
@@ -17072,7 +17035,7 @@ msgstr ""
 "      >I<règle >]\n"
 
 #. type: Plain text
-#: mime.types.man:38
+#: mime.types.5:35
 msgid ""
 "MIME media types specified by the I<mime/type> field are case-insensitive "
 "and are sorted in ascending alphanumeric order for the purposes of "
@@ -17086,7 +17049,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:40
+#: mime.types.5:37
 msgid ""
 "The rules may be grouped using parenthesis, joined using \"+\" for a logical "
 "AND, joined using \",\" or whitespace for a logical OR, and negated using \"!"
@@ -17098,14 +17061,14 @@ msgstr ""
 
 # type: SH
 #. type: SS
-#: mime.types.man:40
+#: mime.types.5:37
 #, no-wrap
 msgid "RULES"
 msgstr "RÈGLES"
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:44
+#: mime.types.5:41
 msgid ""
 "Rules take two forms - a filename extension by itself and functions with "
 "test values inside parenthesis.  The following functions are available:"
@@ -17116,27 +17079,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: mime.types.man:44
+#: mime.types.5:41
 #, no-wrap
 msgid "B<match(\">I<pattern>B<\")>"
 msgstr "B<match(\">I<motif>B<\")>"
 
 #. type: Plain text
-#: mime.types.man:47
+#: mime.types.5:44
 msgid "True if the filename matches the given shell wildcard I<pattern>."
 msgstr ""
 "Vrai si le nom de fichier correspond au caractère générique fourni I<motif>."
 
 # type: TP
 #. type: TP
-#: mime.types.man:47
+#: mime.types.5:44
 #, no-wrap
 msgid "B<ascii(>I<offset>B<,>I<length>B<)>"
 msgstr "B<ascii>(I<décalage>B<,>I<taille>)"
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:50
+#: mime.types.5:47
 msgid ""
 "True if the I<length> bytes starting at I<offset> are valid printable ASCII "
 "(CR, NL, TAB, BS, 32-126)."
@@ -17146,14 +17109,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: mime.types.man:50
+#: mime.types.5:47
 #, no-wrap
 msgid "B<printable(>I<offset>B<,>I<length>B<)>"
 msgstr "B<printable(>I<décalage>B<,>I<taille>B<)I>"
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:53
+#: mime.types.5:50
 msgid ""
 "True if the I<length> bytes starting at I<offset> are printable 8-bit chars "
 "(CR, NL, TAB, BS, 32-126, 128-254)."
@@ -17163,13 +17126,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: mime.types.man:53
+#: mime.types.5:50
 #, no-wrap
 msgid "B<priority(>I<number>B<)>"
 msgstr "B<priorité(>I<nombre>B<)>"
 
 #. type: Plain text
-#: mime.types.man:58
+#: mime.types.5:55
 msgid ""
 "Specifies the relative priority of this MIME media type.  The default "
 "priority is 100.  Larger values have higher priority while smaller values "
@@ -17181,27 +17144,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: mime.types.man:58
+#: mime.types.5:55
 #, no-wrap
 msgid "B<string(>I<offset>B<,\">I<string>B<\")>"
 msgstr "B<string(>I<décalage>B<,\">I<chaîne>B<\")>"
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:61
+#: mime.types.5:58
 msgid "True if the bytes starting at I<offset> are identical to I<string>."
 msgstr ""
 "Vrai si les octets commençant à I<décalage> sont identiques à I<chaîne>."
 
 # type: TP
 #. type: TP
-#: mime.types.man:61
+#: mime.types.5:58
 #, no-wrap
 msgid "B<istring(>I<offset>B<,\">I<string>B<\")>"
 msgstr "B<istring(>I<décalage>B<,\">I<chaîne>B<\")>"
 
 #. type: Plain text
-#: mime.types.man:64
+#: mime.types.5:61
 msgid ""
 "True if the bytes starting at I<offset> match I<string> without respect to "
 "case."
@@ -17211,27 +17174,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: mime.types.man:64
+#: mime.types.5:61
 #, no-wrap
 msgid "B<char(>I<offset>B<,>I<value>B<)>"
 msgstr "B<char(>I<décalage>B<,>I<valeur>B<)>"
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:67
+#: mime.types.5:64
 msgid "True if the byte at I<offset> is identical to I<value>."
 msgstr "Vrai si l’octet à B<décalage> est identique à I<valeur>"
 
 # type: TP
 #. type: TP
-#: mime.types.man:67
+#: mime.types.5:64
 #, no-wrap
 msgid "B<short(>I<offset>B<,>I<value>B<)>"
 msgstr "B<short(>I<décalage>B<,>I<valeur>B<)>"
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:70
+#: mime.types.5:67
 msgid ""
 "True if the 16-bit big-endian integer at I<offset> is identical to I<value>."
 msgstr ""
@@ -17240,14 +17203,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: mime.types.man:70
+#: mime.types.5:67
 #, no-wrap
 msgid "B<int(>I<offset>B<,>I<value>B<)>"
 msgstr "B<int(>I<décalage>B<,>I<valeur>B<)>"
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:73
+#: mime.types.5:70
 msgid ""
 "True if the 32-bit big-endian integer at I<offset> is identical to I<value>."
 msgstr ""
@@ -17256,26 +17219,26 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: mime.types.man:73
+#: mime.types.5:70
 #, no-wrap
 msgid "B<locale(\">I<string>B<\")>"
 msgstr "B<locale(\">I<chaîne>B<\")>"
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:76
+#: mime.types.5:73
 msgid "True if current locale matches I<string>."
 msgstr "Vrai si le langage local correspond à I<chaîne>."
 
 # type: TP
 #. type: TP
-#: mime.types.man:76
+#: mime.types.5:73
 #, no-wrap
 msgid "B<contains(>I<offset>B<,>I<range>B<,\">I<string>B<\")>"
 msgstr "B<contains(>I<décalage>B<,>I<intervalle>B<,\">I<chaîne>B<\")>"
 
 #. type: Plain text
-#: mime.types.man:79
+#: mime.types.5:76
 msgid ""
 "True if the bytes starting at I<offset> for I<range> bytes contains "
 "I<string>."
@@ -17285,14 +17248,14 @@ msgstr ""
 
 # type: SH
 #. type: SS
-#: mime.types.man:79
+#: mime.types.5:76
 #, no-wrap
 msgid "STRING CONSTANTS"
 msgstr "CHAÎNES DE CARACTÈRES"
 
 # type: Plain text
 #. type: Plain text
-#: mime.types.man:81
+#: mime.types.5:78
 msgid ""
 "String constants can be specified inside quotes (\"\") for strings "
 "containing whitespace and angle brackets (E<lt>E<gt>) for hexadecimal "
@@ -17303,13 +17266,13 @@ msgstr ""
 "chaînes en hexadécimal."
 
 #. type: SS
-#: mime.types.man:81
+#: mime.types.5:78
 #, no-wrap
 msgid "TYPE MATCHING AND PRIORITY"
 msgstr "CORRESPONDANCE DE TYPE ET PRIORITÉ"
 
 #. type: Plain text
-#: mime.types.man:85
+#: mime.types.5:82
 msgid ""
 "When CUPS needs to determine the MIME media type of a given file, it checks "
 "every MIME media type defined in the I<.types> files.  When two or more "
@@ -17327,7 +17290,7 @@ msgstr ""
 "ascendant, et le premier type est sélectionné."
 
 #. type: Plain text
-#: mime.types.man:90
+#: mime.types.5:87
 msgid ""
 "For example, if two types \"text/bar\" and \"text/foo\" are defined as "
 "matching the extension \"doc\", normally the type \"text/bar\" will be "
@@ -17342,7 +17305,7 @@ msgstr ""
 "« text/titi », « texte/toto » sera choisi à la place."
 
 #. type: Plain text
-#: mime.types.man:94
+#: mime.types.5:91
 msgid ""
 "Define two MIME media types for raster data, with one being a subset with "
 "higher priority:"
@@ -17351,7 +17314,7 @@ msgstr ""
 "ensemble avec une haute priorité :"
 
 #. type: Plain text
-#: mime.types.man:99
+#: mime.types.5:96
 #, no-wrap
 msgid ""
 "    application/vnd.cups-raster  string(0,\"RaSt\") string(0,\"tSaR\") \\e\n"
@@ -17363,7 +17326,7 @@ msgstr ""
 "                                  string(0,\"RaS3\") string(0,\"3SaR\")\n"
 
 #. type: Plain text
-#: mime.types.man:102
+#: mime.types.5:99
 #, no-wrap
 msgid ""
 "    image/pwg-raster              string(0,\"RaS2\") + \\e\n"
@@ -17373,7 +17336,7 @@ msgstr ""
 "                                  string(4,PwgRasterE<lt>00E<gt>) priority(150)\n"
 
 #. type: Plain text
-#: mime.types.man:110
+#: mime.types.5:107
 msgid ""
 "B<cups-files.conf>(5), B<cupsd.conf>(5), B<cupsd>(8), B<cupsfilter>(8), "
 "B<mime.convs>(5), CUPS Online Help (http://localhost:631/help)"
@@ -17383,82 +17346,273 @@ msgstr ""
 "help>E<gt>"
 
 #. type: TH
-#: notifier.man:13
+#: notifier.7:10
 #, no-wrap
 msgid "notifier"
 msgstr "notifier"
 
 # type: Plain text
 #. type: Plain text
-#: notifier.man:16
-msgid "notifier - cups notification interface"
-msgstr "notifier - Interface de notification pour CUPS"
+#: notifier.7:13
+msgid "notifier - cups notification interface"
+msgstr "notifier - Interface de notification pour CUPS"
+
+#. type: Plain text
+#: notifier.7:19
+msgid "B<notifier> I<recipient> [ I<user-data> ]"
+msgstr "B<notifier> I<destinataire> [ I<données_utilisateur> ]"
+
+# type: Plain text
+#. type: Plain text
+#: notifier.7:22
+msgid ""
+"The CUPS notifier interface provides a standard method for adding support "
+"for new event notification methods to CUPS.  Each notifier delivers one or "
+"more IPP events from the standard input to the specified recipient."
+msgstr ""
+"L’interface B<notifier> de CUPS fournit une méthode standard pour ajouter "
+"une prise en charge de nouvelles méthodes de notification d’évènement à "
+"CUPS. Chaque notification signifie un ou plusieurs évènements IPP à partir "
+"de l’entrée standard au destinataire indiqué."
+
+#. type: Plain text
+#: notifier.7:31
+msgid ""
+"Notifiers B<MUST> read IPP messages from the standard input using the "
+"B<ippNew>()  and B<ippReadFile>()  functions and exit on error.  Notifiers "
+"are encouraged to exit after a suitable period of inactivity, however they "
+"may exit after reading the first message or stay running until an error is "
+"seen.  Notifiers inherit the environment and can use the logging mechanism "
+"documented in B<filter>(7)."
+msgstr ""
+"Les appels B<notifier> B<doivent> lire les messages IPP à partir de l’entrée "
+"standard avec les fonctions B<ippNew>() et B<ippReadFile>() et quitter lors "
+"d’une erreur. Les appels sont incités à se terminer après une période "
+"convenable d’inactivité, cependant, ils peuvent finir après la lecture du "
+"premier message ou continuer jusqu’à l’apparition d’une erreur. B<notifier> "
+"hérite de l’environnement et peut utiliser le mécanisme de journalisation "
+"documenté dans B<filter>(7)."
+
+# type: Plain text
+#. type: Plain text
+#: notifier.7:35
+msgid "B<cupsd>(8), B<filter>(7), CUPS Online Help (http://localhost:631/help)"
+msgstr ""
+"B<cupsd>(8), B<filter>(7), aide en ligne de CUPS E<lt>URL:I<http://"
+"localhost:631/help>E<gt>."
+
+#. type: TH
+#: ppdc.1:10
+#, no-wrap
+msgid "ppdc"
+msgstr "ppdc"
+
+#. type: Plain text
+#: ppdc.1:13
+msgid "ppdc - cups ppd compiler (deprecated)"
+msgstr "ppdc - Compilateur ppd pour CUPS (obsolète)"
+
+# type: Plain text
+#. type: Plain text
+#: ppdc.1:45
+msgid ""
+"B<ppdc> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] [ B<-"
+"c> I<message-catalog> ] [ B<-d> I<output-directory> ] [ B<-l> "
+"I<language(s)> ] [ B<-m> ] [ B<-t> ] [ B<-v> ] [ B<-z> ] [ B<--cr> ] [ B<--"
+"crlf> ] [ B<--lf> ] I<source-file>"
+msgstr ""
+"B<ppdc> [ B<-D >I<nom>[B<=>I<valeur>] ] [ B<-I> I<répertoire_à_inclure> ] "
+"[ B<-c> I<catalogue_messages> ] [ B<-d> I<répertoire_sortie> ] [ B<-l> "
+"I<langage(s)> ] [ B<-m> ] [ B<-t> ] [ B<-v> ] [ B<-z> ] [ B<--cr> ] [ B<--"
+"crlf> ] [ B<--lf> ] I<fichier_source>"
+
+#. type: Plain text
+#: ppdc.1:48
+msgid ""
+"B<ppdc> compiles PPDC source files into one or more PPD files.  B<This "
+"program is deprecated and will be removed in a future release of CUPS.>"
+msgstr ""
+"B<ppdc> compile les fichiers source PPDC dans un ou plusieurs fichiers PPD. "
+"B<Ce programme est obsolète et sera supprimé dans une future version de CUPS."
+">"
+
+# type: Plain text
+#. type: Plain text
+#: ppdc.1:50
+msgid "B<ppdc> supports the following options:"
+msgstr "B<ppdc> accepte les options suivantes :"
+
+# type: TP
+#. type: TP
+#: ppdc.1:50 ppdhtml.1:27 ppdpo.1:30
+#, no-wrap
+msgid "B<-D >I<name>[B<=>I<value>]"
+msgstr "B<-D >I<nom>[B<=>I<valeur>]"
+
+#. type: Plain text
+#: ppdc.1:54 ppdhtml.1:31 ppdpo.1:34
+msgid ""
+"Sets the named variable for use in the source file.  It is equivalent to "
+"using the I<#define> directive in the source file."
+msgstr ""
+"Définir la valeur nommée pour utilisation dans le fichier source. Cela est "
+"équivalent à utiliser la directive I<#define> dans le fichier source."
+
+# type: TP
+#. type: TP
+#: ppdc.1:54 ppdhtml.1:31 ppdi.1:32 ppdpo.1:34
+#, no-wrap
+msgid "B<-I >I<include-directory>"
+msgstr "B<-I >I<répertoire_à_inclure>"
+
+#. type: Plain text
+#: ppdc.1:58 ppdhtml.1:35 ppdi.1:36 ppdpo.1:38
+msgid ""
+"Specifies an alternate include directory.  Multiple I<-I> options can be "
+"supplied to add additional directories."
+msgstr ""
+"Indiquer un autre répertoire à inclure. Plusieurs options I<-I> peuvent être "
+"fournies pour ajouter des répertoires."
+
+# type: TP
+#. type: TP
+#: ppdc.1:58
+#, no-wrap
+msgid "B<-c >I<message-catalog>"
+msgstr "B<-c >I<catalogue_messages>"
+
+#. type: Plain text
+#: ppdc.1:61
+msgid ""
+"Specifies a single message catalog file in GNU gettext (filename.po) or "
+"Apple strings (filename.strings) format to be used for localization."
+msgstr ""
+"Indiquer un fichier de catalogue de messages au format gettext GNU (fichier."
+"po) ou de chaînes Apple (fichier.strings) pour localisation."
+
+# type: TP
+#. type: TP
+#: ppdc.1:61
+#, no-wrap
+msgid "B<-d >I<output-directory>"
+msgstr "B<-d >I<répertoire_sortie>"
+
+# type: Plain text
+#. type: Plain text
+#: ppdc.1:65
+msgid ""
+"Specifies the output directory for PPD files.  The default output directory "
+"is \"ppd\"."
+msgstr ""
+"Indiquer le répertoire de sortie pour les fichiers PPD. Par défaut, « ppd »."
+
+# type: TP
+#. type: TP
+#: ppdc.1:65
+#, no-wrap
+msgid "B<-l >I<language(s)>"
+msgstr "B<-l >I<langage(s)>"
+
+#. type: Plain text
+#: ppdc.1:70
+msgid ""
+"Specifies one or more languages to use when localizing the PPD file(s).  The "
+"default language is \"en\" (English).  Separate multiple languages with "
+"commas, for example \"de_DE,en_UK,es_ES,es_MX,es_US,fr_CA,fr_FR,it_IT\" will "
+"create PPD files with German, UK English, Spanish (Spain, Mexico, and US), "
+"French (France and Canada), and Italian languages in each file."
+msgstr ""
+"Indiquer une ou plusieurs langues à utiliser pour l’internationalisation "
+"de(s) fichier(s) PPD. La langue par défaut est l’anglais « en ». Séparer les "
+"langues par des virgules, par exemple « de_DE,en_UK,es_ES,es_MX,es_US,fr_CA,"
+"fr_FR,it_IT » créera des fichiers PPD en allemand, anglais_UK, espagnol "
+"(Espagne, Mexique et US), français (France et Canada) et italien dans chaque "
+"fichier."
+
+# type: Plain text
+#. type: Plain text
+#: ppdc.1:73
+msgid ""
+"Specifies that the output filename should be based on the ModelName value "
+"instead of FileName or PCFilenName."
+msgstr ""
+"Indiquer que le nom du fichier de sortie sera basé sur la valeur ModelName "
+"au lieu de FileName ou PCFilenName."
 
+# type: Plain text
 #. type: Plain text
-#: notifier.man:22
-msgid "B<notifier> I<recipient> [ I<user-data> ]"
-msgstr "B<notifier> I<destinataire> [ I<données_utilisateur> ]"
+#: ppdc.1:76
+msgid "Specifies that PPD files should be tested instead of generated."
+msgstr ""
+"Indiquer que les fichiers PPD doivent être testés au lieu d’être créés."
 
-# type: Plain text
 #. type: Plain text
-#: notifier.man:25
+#: ppdc.1:82
 msgid ""
-"The CUPS notifier interface provides a standard method for adding support "
-"for new event notification methods to CUPS.  Each notifier delivers one or "
-"more IPP events from the standard input to the specified recipient."
+"Specifies verbose output, basically a running status of which files are "
+"being loaded or written.  B<-z> Generates compressed PPD files (filename.ppd."
+"gz).  The default is to generate uncompressed PPD files."
 msgstr ""
-"L’interface B<notifier> de CUPS fournit une méthode standard pour ajouter "
-"une prise en charge de nouvelles méthodes de notification d’évènement à "
-"CUPS. Chaque notification signifie un ou plusieurs évènements IPP à partir "
-"de l’entrée standard au destinataire indiqué."
+"Demander une sortie loquace, essentiellement un état courant des fichiers en "
+"cours de chargement ou écrits. B<-z> crée des fichiers compressés (fichier."
+"ppd.gz). Par défaut, les fichiers PPD sont compressés."
+
+# type: TP
+#. type: TP
+#: ppdc.1:82
+#, no-wrap
+msgid "B<--cr>"
+msgstr "B<--cr>"
+
+# type: TP
+#. type: TP
+#: ppdc.1:84
+#, no-wrap
+msgid "B<--crlf>"
+msgstr "B<--crlf>"
+
+# type: TP
+#. type: TP
+#: ppdc.1:86
+#, no-wrap
+msgid "B<--lf>"
+msgstr "B<--lf>"
 
 #. type: Plain text
-#: notifier.man:34
+#: ppdc.1:90
 msgid ""
-"Notifiers B<MUST> read IPP messages from the standard input using the "
-"B<ippNew>()  and B<ippReadFile>()  functions and exit on error.  Notifiers "
-"are encouraged to exit after a suitable period of inactivity, however they "
-"may exit after reading the first message or stay running until an error is "
-"seen.  Notifiers inherit the environment and can use the logging mechanism "
-"documented in B<filter>(7)."
+"Specifies the line ending to use - carriage return, carriage return and line "
+"feed, or line feed alone.  The default is to use the line feed character "
+"alone."
 msgstr ""
-"Les appels B<notifier> B<doivent> lire les messages IPP à partir de l’entrée "
-"standard avec les fonctions B<ippNew>() et B<ippReadFile>() et quitter lors "
-"d’une erreur. Les appels sont incités à se terminer après une période "
-"convenable d’inactivité, cependant, ils peuvent finir après la lecture du "
-"premier message ou continuer jusqu’à l’apparition d’une erreur. B<notifier> "
-"hérite de l’environnement et peut utiliser le mécanisme de journalisation "
-"documenté dans B<filter>(7)."
+"Indiquer la fin de ligne à utiliser — retour chariot, retour chariot et saut "
+"de ligne ou uniquement saut de ligne. Par défaut, le caractère de saut de "
+"ligne seul."
 
 # type: Plain text
 #. type: Plain text
-#: notifier.man:38
-msgid "B<cupsd>(8), B<filter>(7), CUPS Online Help (http://localhost:631/help)"
+#: ppdc.1:101
+msgid ""
+"B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
+"Online Help (http://localhost:631/help)"
 msgstr ""
-"B<cupsd>(8), B<filter>(7), aide en ligne de CUPS E<lt>URL:I<http://"
-"localhost:631/help>E<gt>."
+"B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), aide "
+"en ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>."
 
 #. type: TH
-#: ppdcfile.man:13
+#: ppdcfile.5:10
 #, no-wrap
 msgid "ppdcfile"
 msgstr "ppdcfile"
 
-# type: TH
-#. type: TH
-#: ppdcfile.man:13
-#, no-wrap
-msgid "5 March 2016"
-msgstr "5 mars 2016"
-
 #. type: Plain text
-#: ppdcfile.man:16
+#: ppdcfile.5:13
 #, fuzzy
-msgid "ppdcfile - cups ppd compiler source file format"
+msgid "ppdcfile - cups ppd compiler source file format (deprecated)"
 msgstr "ppdcfile - Format de fichier source ppd pour compilateur CUPS"
 
 #. type: Plain text
-#: ppdcfile.man:20
+#: ppdcfile.5:17
 msgid ""
 "The CUPS PPD compiler reads meta files that contain descriptions of one or "
 "more PPD files to be generated by B<ppdc>(1).  This man page provides a "
@@ -17471,7 +17625,7 @@ msgstr ""
 "être utilisée de concert avec l’aide en ligne de CUPS."
 
 #. type: Plain text
-#: ppdcfile.man:22
+#: ppdcfile.5:19
 msgid ""
 "The source file format is plain ASCII text that can be edited using your "
 "favorite text editor. Comments are supported using the C (/* ... */) and C++ "
@@ -17482,7 +17636,7 @@ msgstr ""
 "utilisant les mécanismes des langages C (/* ... */) et C++."
 
 #. type: Plain text
-#: ppdcfile.man:24
+#: ppdcfile.5:21
 msgid ""
 "Printer driver information can be grouped and shared using curly braces "
 "({ ... }); PPD files are written when a close brace or end-of-file is seen "
@@ -17493,7 +17647,7 @@ msgstr ""
 "écrits lorsqu’une directive PCFileName a été définie."
 
 #. type: Plain text
-#: ppdcfile.man:26
+#: ppdcfile.5:23
 msgid ""
 "Directives may be placed anywhere on a line and are followed by one or more "
 "values. The following is a list of the available directives and the values "
@@ -17505,411 +17659,411 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:26
+#: ppdcfile.5:23
 #, no-wrap
 msgid "B<#define >I<name value>"
 msgstr "B<#define >I<nom valeur>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:28
+#: ppdcfile.5:25
 #, no-wrap
 msgid "B<#elif >{I<name >| I<value>}"
 msgstr "B<#elif >{I<nom >| I<valeur>}"
 
 #. type: TP
-#: ppdcfile.man:30
+#: ppdcfile.5:27
 #, no-wrap
 msgid "B<#else>"
 msgstr "B<#else>"
 
 #. type: TP
-#: ppdcfile.man:32
+#: ppdcfile.5:29
 #, no-wrap
 msgid "B<#endif>"
 msgstr "B<#endif>"
 
 #. type: TP
-#: ppdcfile.man:34
+#: ppdcfile.5:31
 #, no-wrap
 msgid "B<#font >I<name encoding \"version\" charset status>"
 msgstr "B<#font >I<nom encodage \"version\" jeu_de_caractères état>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:36
+#: ppdcfile.5:33
 #, no-wrap
 msgid "B<#if >{I<name >| I<value>}"
 msgstr "B<#if >{I<nom >| I<valeur>}"
 
 #. type: TP
-#: ppdcfile.man:38
+#: ppdcfile.5:35
 #, no-wrap
 msgid "B<#include E<lt>>I<filename>B<E<gt>>"
 msgstr "B<#include E<lt>>I<nom_fichier>B<E<gt>>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:40
+#: ppdcfile.5:37
 #, no-wrap
 msgid "B<#include \">I<filename>B<\">"
 msgstr "B<#include \">I<nom_fichier>B<\">"
 
 #. type: TP
-#: ppdcfile.man:42
+#: ppdcfile.5:39
 #, no-wrap
 msgid "B<#media >I<name width length>"
 msgstr "B<#media >I<nom largeur hauteur>"
 
 #. type: TP
-#: ppdcfile.man:44
+#: ppdcfile.5:41
 #, no-wrap
 msgid "B<#media \">I<name>B</>I<text>B<\" >I<width length>"
 msgstr "B<#media \">I<nom>B</>I<texte>B<\" >I<largeur hauteur>"
 
 #. type: TP
-#: ppdcfile.man:46
+#: ppdcfile.5:43
 #, no-wrap
 msgid "B<#po >I<locale >B<\">I<filename>B<\">"
 msgstr "B<#po >I<locale >B<\">I<nom_fichier>B<\">"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:48
+#: ppdcfile.5:45
 #, no-wrap
 msgid "B<Attribute >I<name >B<\"\" >I<value>"
 msgstr "B<Attribute >I<nom >B<\"\" >I<valeur>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:50
+#: ppdcfile.5:47
 #, no-wrap
 msgid "B<Attribute >I<name keyword value>"
 msgstr "B<Attribute >I<nom mot-clef valeur>"
 
 #. type: TP
-#: ppdcfile.man:52
+#: ppdcfile.5:49
 #, no-wrap
 msgid "B<Attribute >I<name >B<\">I<keyword>B</>I<text>B<\" >I<value>"
 msgstr "B<Attribute >I<nom >B<\">I<mot-clef>B</>I<texte>B<\" >I<valeur>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:54
+#: ppdcfile.5:51
 #, no-wrap
 msgid "B<Choice >I<name >B<\">I<code>B<\">"
 msgstr "B<Choice >I<nom >B<\">I<code>B<\">"
 
 #. type: TP
-#: ppdcfile.man:56
+#: ppdcfile.5:53
 #, no-wrap
 msgid "B<Choice \">I<name>B</>I<text>B<\" \">I<code>B<\">"
 msgstr "B<Choice \">I<nom>B</>I<texte>B<\" \">I<code>B<\">"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:58
+#: ppdcfile.5:55
 #, no-wrap
 msgid "B<ColorDevice >I<boolean-value>"
 msgstr "B<ColorDevice >I<valeur_booléenne>"
 
 #. type: TP
-#: ppdcfile.man:60
+#: ppdcfile.5:57
 #, no-wrap
 msgid "B<ColorModel >I<name colorspace colororder compression>"
 msgstr "B<ColorModel >I<nom espace_colorimétrique ordre_des_couleurs compression>"
 
 #. type: TP
-#: ppdcfile.man:62
+#: ppdcfile.5:59
 #, no-wrap
 msgid "B<ColorModel \">I<name>B</>I<text>B<\" >I<colorspace colororder compression>"
 msgstr "B<ColorModel \">I<nom>B</>I<texte>B<\" >I<espace_colorimétrique ordre_des_couleurs compression>"
 
 #. type: TP
-#: ppdcfile.man:64
+#: ppdcfile.5:61
 #, no-wrap
 msgid "B<ColorProfile >I<resolution>B</>I<mediatype gamma density matrix>"
 msgstr "B<ColorProfile >I<résolution>B</>I<type_média gamma densité_matrice>"
 
 #. type: TP
-#: ppdcfile.man:66
+#: ppdcfile.5:63
 #, no-wrap
 msgid "B<Copyright \">I<text>\""
 msgstr "B<Copyright \">I<texte>\""
 
 #. type: TP
-#: ppdcfile.man:68
+#: ppdcfile.5:65
 #, no-wrap
 msgid "B<CustomMedia >I<name width length left bottom right top >B<\">I<size-code>B<\" \">I<region-code>B<\">"
 msgstr "B<CustomMedia >I<nom largeur hauteur gauche bas droite haut >B<\">I<code_dimension>B<\" \">I<code_région>B<\">"
 
 #. type: TP
-#: ppdcfile.man:70
+#: ppdcfile.5:67
 #, no-wrap
 msgid "B<CustomMedia \">I<name>B</>I<text>B<\" >I<width length left bottom right top >B<\">I<size-code>B<\" \">I<region-code>B<\">"
 msgstr "B<CustomMedia \">I<nom>B</>I<texte>B<\" >I<largeur hauteur gauche bas droite haut >B<\">I<code_dimension>B<\" \">I<code_région>B<\">"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:72
+#: ppdcfile.5:69
 #, no-wrap
 msgid "B<Cutter >I<boolean-value>"
 msgstr "B<Cutter >I<valeur_booléenne>"
 
 #. type: TP
-#: ppdcfile.man:74
+#: ppdcfile.5:71
 #, no-wrap
 msgid "B<Darkness >I<temperature name>"
 msgstr "B<Darkness >I<température nom>"
 
 #. type: TP
-#: ppdcfile.man:76
+#: ppdcfile.5:73
 #, no-wrap
 msgid "B<Darkness >I<temperature >B<\">I<name>B</>I<text>B<\">"
 msgstr "B<Darkness >I<température >B<\">I<nom>B</>I<texte>B<\">"
 
 # type: TH
 #. type: TP
-#: ppdcfile.man:78
+#: ppdcfile.5:75
 #, no-wrap
 msgid "B<DriverType >I<type>"
 msgstr "B<DriverType >I<type>"
 
 # type: TH
 #. type: TP
-#: ppdcfile.man:80
+#: ppdcfile.5:77
 #, no-wrap
 msgid "B<Duplex >I<type>"
 msgstr "B<Duplex >I<type>"
 
 #. type: TP
-#: ppdcfile.man:82
+#: ppdcfile.5:79
 #, no-wrap
 msgid "B<Filter >I<mime-type cost program>"
 msgstr "B<Filter >I<type_mime coût programme>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:84
+#: ppdcfile.5:81
 #, no-wrap
 msgid "B<Finishing >I<name>"
 msgstr "B<Finishing >I<nom>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:86
+#: ppdcfile.5:83
 #, no-wrap
 msgid "B<Finishing \">I<name>B</>I<text>B<\">"
 msgstr "B<Finishing \">I<nom>B</>I<texte>B<\">"
 
 #. type: TP
-#: ppdcfile.man:88
+#: ppdcfile.5:85
 #, no-wrap
 msgid "B<Font *>"
 msgstr "B<Font *>"
 
 #. type: TP
-#: ppdcfile.man:90
+#: ppdcfile.5:87
 #, no-wrap
 msgid "B<Font >I<name encoding >B<\">I<version>B<\" >I<charset status>"
 msgstr "B<Font >I<nom encodage >B<\">I<version>B<\" >I<jeu_de_caractères état>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:92
+#: ppdcfile.5:89
 #, no-wrap
 msgid "B<Group >I<name>"
 msgstr "B<Group >I<nom>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:94
+#: ppdcfile.5:91
 #, no-wrap
 msgid "B<Group \">I<name>B</>I<text>B<\">"
 msgstr "B<Group \">I<nom>B</>I<texte>B<\">"
 
 #. type: TP
-#: ppdcfile.man:96
+#: ppdcfile.5:93
 #, no-wrap
 msgid "B<HWMargins >I<left bottom right top>"
 msgstr "B<HWMargins >I<gauche bas droite haut>"
 
 #. type: TP
-#: ppdcfile.man:98
+#: ppdcfile.5:95
 #, no-wrap
 msgid "B<InputSlot >I<position name>"
 msgstr "B<InputSlot >I<position nom>"
 
 #. type: TP
-#: ppdcfile.man:100
+#: ppdcfile.5:97
 #, no-wrap
 msgid "B<InputSlot >I<position >B<\">I<name>B</>I<text>B<\">"
 msgstr "B<InputSlot >I<position >B<\">I<nom>B</>I<texte>B<\">"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:102
+#: ppdcfile.5:99
 #, no-wrap
 msgid "B<Installable >I<name>"
 msgstr "B<Installable >I<nom>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:104
+#: ppdcfile.5:101
 #, no-wrap
 msgid "B<Installable \">I<name>B</>I<text>B<\">"
 msgstr "B<Installable \">I<nom>B</>I<texte>B<\">"
 
 #. type: TP
-#: ppdcfile.man:106
+#: ppdcfile.5:103
 #, no-wrap
 msgid "B<LocAttribute >I<name >B<\">I<keyword>B</>I<text>B<\" >I<value>"
 msgstr "B<LocAttribute >I<nom >B<\">I<mot-clef>B</>I<texte>B<\" >I<valeur>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:108
+#: ppdcfile.5:105
 #, no-wrap
 msgid "B<ManualCopies >I<boolean-value>"
 msgstr "B<ManualCopies >I<valeur_booléenne>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:110
+#: ppdcfile.5:107
 #, no-wrap
 msgid "B<Manufacturer \">I<name>B<\">"
 msgstr "B<Manufacturer \">I<nom>B<\">"
 
 #. type: TP
-#: ppdcfile.man:112
+#: ppdcfile.5:109
 #, no-wrap
 msgid "B<MaxSize >I<width length>"
 msgstr "B<MaxSize >I<largeur hauteur>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:114
+#: ppdcfile.5:111
 #, no-wrap
 msgid "B<MediaSize >I<name>"
 msgstr "B<MediaSize >I<nom>"
 
 #. type: TP
-#: ppdcfile.man:116
+#: ppdcfile.5:113
 #, no-wrap
 msgid "B<MediaType >I<type name>"
 msgstr "B<MediaType >I<type nom>"
 
 #. type: TP
-#: ppdcfile.man:118
+#: ppdcfile.5:115
 #, no-wrap
 msgid "B<MediaType >I<type >B<\">I<name>B</>I<text>B<\">"
 msgstr "B<MediaType >I<type >B<\">I<nom>B</>I<texte>B<\">"
 
 #. type: TP
-#: ppdcfile.man:120
+#: ppdcfile.5:117
 #, no-wrap
 msgid "B<MinSize >I<width length>"
 msgstr "B<MinSize >I<largeur hauteur>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:122
+#: ppdcfile.5:119
 #, no-wrap
 msgid "B<ModelName \">I<name>B<\">"
 msgstr "B<ModelName \">I<nom>B<\">"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:124
+#: ppdcfile.5:121
 #, no-wrap
 msgid "B<ModelNumber >I<number>"
 msgstr "B<ModelNumber >I<numéro>"
 
 #. type: TP
-#: ppdcfile.man:126
+#: ppdcfile.5:123
 #, no-wrap
 msgid "B<Option >I<name type section order>"
 msgstr "B<Option >I<nom type section ordre>"
 
 #. type: TP
-#: ppdcfile.man:128
+#: ppdcfile.5:125
 #, no-wrap
 msgid "B<Option \">I<name>B</>I<text>B<\" >I<type section order>"
 msgstr "B<Option \">I<nom>B</>I<texte>B<\" >I<type section ordre>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:130
+#: ppdcfile.5:127
 #, no-wrap
 msgid "B<PCFileName \">I<filename.ppd>B<\">"
 msgstr "B<PCFileName \">I<nom_fichier.ppd>B<\">"
 
 #. type: TP
-#: ppdcfile.man:132
+#: ppdcfile.5:129
 #, no-wrap
 msgid "B<Resolution >I<colorspace bits-per-color row-count row-feed row-step name>"
 msgstr "B<Resolution >I<espace_colorimétrique octets_par_couleur row-count row-feed row-step nom>"
 
 #. type: TP
-#: ppdcfile.man:134
+#: ppdcfile.5:131
 #, no-wrap
 msgid "B<Resolution >I<colorspace bits-per-color row-count row-feed row-step >B<\">I<name>B</>I<text>B<\">"
 msgstr "B<Resolution >I<espace_colorimétrique octets_par_couleur row-count row-feed row-step >B<\">I<nom>B</>I<texte>B<\">"
 
 #. type: TP
-#: ppdcfile.man:136
+#: ppdcfile.5:133
 #, no-wrap
 msgid "B<SimpleColorProfile >I<resolution>B</>I<mediatype density yellow-density red-density gamma red-adjust green-adjust blue-adjust>"
 msgstr "B<SimpleColorProfile >I<résolution>B</>I<type_média densité densité_jaune densité_rouge gamma ajustement_rouge ajustement_vert ajustement_bleu>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:138
+#: ppdcfile.5:135
 #, no-wrap
 msgid "B<Throughput >I<pages-per-minute>"
 msgstr "B<Throughput >I<pages_par_minute>"
 
 #. type: TP
-#: ppdcfile.man:140
+#: ppdcfile.5:137
 #, no-wrap
 msgid "B<UIConstraints \">I<*Option1 *Option2>B<\">"
 msgstr "B<UIConstraints \">I<*Option1 *Option2>B<\">"
 
 #. type: TP
-#: ppdcfile.man:142
+#: ppdcfile.5:139
 #, no-wrap
 msgid "B<UIConstraints \">I<*Option1 Choice1 *Option2>B<\">"
 msgstr "B<UIConstraints \">I<*Option1 Choix1 *Option2>B<\">"
 
 #. type: TP
-#: ppdcfile.man:144
+#: ppdcfile.5:141
 #, no-wrap
 msgid "B<UIConstraints \">I<*Option1 *Option2 Choice2>B<\">"
 msgstr "B<UIConstraints \">I<*Option1 *Option2 Choix2>B<\">"
 
 #. type: TP
-#: ppdcfile.man:146
+#: ppdcfile.5:143
 #, no-wrap
 msgid "B<UIConstraints \">I<*Option1 Choice1 *Option2 Choice2>B<\">"
 msgstr "B<UIConstraints \">I<*Option1 Choix1 *Option2 Choix2>B<\">"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:148
+#: ppdcfile.5:145
 #, no-wrap
 msgid "B<VariablePaperSize >I<boolean-value>"
 msgstr "B<VariablePaperSize >I<valeur_booléenne>"
 
 # type: TP
 #. type: TP
-#: ppdcfile.man:150
+#: ppdcfile.5:147
 #, no-wrap
 msgid "B<Version >I<number>"
 msgstr "B<Version >I<numéro>"
 
 # type: Plain text
 #. type: Plain text
-#: ppdcfile.man:159
+#: ppdcfile.5:160
 msgid ""
 "B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), CUPS "
 "Online Help (http://localhost:631/help)"
@@ -17918,217 +18072,19 @@ msgstr ""
 "ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
 
 #. type: TH
-#: ppdc.man:13
-#, no-wrap
-msgid "ppdc"
-msgstr "ppdc"
-
-#. type: Plain text
-#: ppdc.man:16
-msgid "ppdc - cups ppd compiler (deprecated)"
-msgstr "ppdc - Compilateur ppd pour CUPS (obsolète)"
-
-# type: Plain text
-#. type: Plain text
-#: ppdc.man:48
-msgid ""
-"B<ppdc> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] [ B<-"
-"c> I<message-catalog> ] [ B<-d> I<output-directory> ] [ B<-l> "
-"I<language(s)> ] [ B<-m> ] [ B<-t> ] [ B<-v> ] [ B<-z> ] [ B<--cr> ] [ B<--"
-"crlf> ] [ B<--lf> ] I<source-file>"
-msgstr ""
-"B<ppdc> [ B<-D >I<nom>[B<=>I<valeur>] ] [ B<-I> I<répertoire_à_inclure> ] "
-"[ B<-c> I<catalogue_messages> ] [ B<-d> I<répertoire_sortie> ] [ B<-l> "
-"I<langage(s)> ] [ B<-m> ] [ B<-t> ] [ B<-v> ] [ B<-z> ] [ B<--cr> ] [ B<--"
-"crlf> ] [ B<--lf> ] I<fichier_source>"
-
-#. type: Plain text
-#: ppdc.man:51
-msgid ""
-"B<ppdc> compiles PPDC source files into one or more PPD files.  B<This "
-"program is deprecated and will be removed in a future release of CUPS.>"
-msgstr ""
-"B<ppdc> compile les fichiers source PPDC dans un ou plusieurs fichiers PPD. "
-"B<Ce programme est obsolète et sera supprimé dans une future version de CUPS."
-">"
-
-# type: Plain text
-#. type: Plain text
-#: ppdc.man:53
-msgid "B<ppdc> supports the following options:"
-msgstr "B<ppdc> accepte les options suivantes :"
-
-# type: TP
-#. type: TP
-#: ppdc.man:53 ppdhtml.man:30 ppdpo.man:33
-#, no-wrap
-msgid "B<-D >I<name>[B<=>I<value>]"
-msgstr "B<-D >I<nom>[B<=>I<valeur>]"
-
-#. type: Plain text
-#: ppdc.man:57 ppdhtml.man:34 ppdpo.man:37
-msgid ""
-"Sets the named variable for use in the source file.  It is equivalent to "
-"using the I<#define> directive in the source file."
-msgstr ""
-"Définir la valeur nommée pour utilisation dans le fichier source. Cela est "
-"équivalent à utiliser la directive I<#define> dans le fichier source."
-
-# type: TP
-#. type: TP
-#: ppdc.man:57 ppdhtml.man:34 ppdi.man:35 ppdpo.man:37
-#, no-wrap
-msgid "B<-I >I<include-directory>"
-msgstr "B<-I >I<répertoire_à_inclure>"
-
-#. type: Plain text
-#: ppdc.man:61 ppdhtml.man:38 ppdi.man:39 ppdpo.man:41
-msgid ""
-"Specifies an alternate include directory.  Multiple I<-I> options can be "
-"supplied to add additional directories."
-msgstr ""
-"Indiquer un autre répertoire à inclure. Plusieurs options I<-I> peuvent être "
-"fournies pour ajouter des répertoires."
-
-# type: TP
-#. type: TP
-#: ppdc.man:61
-#, no-wrap
-msgid "B<-c >I<message-catalog>"
-msgstr "B<-c >I<catalogue_messages>"
-
-#. type: Plain text
-#: ppdc.man:64
-msgid ""
-"Specifies a single message catalog file in GNU gettext (filename.po) or "
-"Apple strings (filename.strings) format to be used for localization."
-msgstr ""
-"Indiquer un fichier de catalogue de messages au format gettext GNU (fichier."
-"po) ou de chaînes Apple (fichier.strings) pour localisation."
-
-# type: TP
-#. type: TP
-#: ppdc.man:64
-#, no-wrap
-msgid "B<-d >I<output-directory>"
-msgstr "B<-d >I<répertoire_sortie>"
-
-# type: Plain text
-#. type: Plain text
-#: ppdc.man:68
-msgid ""
-"Specifies the output directory for PPD files.  The default output directory "
-"is \"ppd\"."
-msgstr ""
-"Indiquer le répertoire de sortie pour les fichiers PPD. Par défaut, « ppd »."
-
-# type: TP
-#. type: TP
-#: ppdc.man:68
-#, no-wrap
-msgid "B<-l >I<language(s)>"
-msgstr "B<-l >I<langage(s)>"
-
-#. type: Plain text
-#: ppdc.man:73
-msgid ""
-"Specifies one or more languages to use when localizing the PPD file(s).  The "
-"default language is \"en\" (English).  Separate multiple languages with "
-"commas, for example \"de_DE,en_UK,es_ES,es_MX,es_US,fr_CA,fr_FR,it_IT\" will "
-"create PPD files with German, UK English, Spanish (Spain, Mexico, and US), "
-"French (France and Canada), and Italian languages in each file."
-msgstr ""
-"Indiquer une ou plusieurs langues à utiliser pour l’internationalisation "
-"de(s) fichier(s) PPD. La langue par défaut est l’anglais « en ». Séparer les "
-"langues par des virgules, par exemple « de_DE,en_UK,es_ES,es_MX,es_US,fr_CA,"
-"fr_FR,it_IT » créera des fichiers PPD en allemand, anglais_UK, espagnol "
-"(Espagne, Mexique et US), français (France et Canada) et italien dans chaque "
-"fichier."
-
-# type: Plain text
-#. type: Plain text
-#: ppdc.man:76
-msgid ""
-"Specifies that the output filename should be based on the ModelName value "
-"instead of FileName or PCFilenName."
-msgstr ""
-"Indiquer que le nom du fichier de sortie sera basé sur la valeur ModelName "
-"au lieu de FileName ou PCFilenName."
-
-# type: Plain text
-#. type: Plain text
-#: ppdc.man:79
-msgid "Specifies that PPD files should be tested instead of generated."
-msgstr ""
-"Indiquer que les fichiers PPD doivent être testés au lieu d’être créés."
-
-#. type: Plain text
-#: ppdc.man:85
-msgid ""
-"Specifies verbose output, basically a running status of which files are "
-"being loaded or written.  B<-z> Generates compressed PPD files (filename.ppd."
-"gz).  The default is to generate uncompressed PPD files."
-msgstr ""
-"Demander une sortie loquace, essentiellement un état courant des fichiers en "
-"cours de chargement ou écrits. B<-z> crée des fichiers compressés (fichier."
-"ppd.gz). Par défaut, les fichiers PPD sont compressés."
-
-# type: TP
-#. type: TP
-#: ppdc.man:85
-#, no-wrap
-msgid "B<--cr>"
-msgstr "B<--cr>"
-
-# type: TP
-#. type: TP
-#: ppdc.man:87
-#, no-wrap
-msgid "B<--crlf>"
-msgstr "B<--crlf>"
-
-# type: TP
-#. type: TP
-#: ppdc.man:89
-#, no-wrap
-msgid "B<--lf>"
-msgstr "B<--lf>"
-
-#. type: Plain text
-#: ppdc.man:93
-msgid ""
-"Specifies the line ending to use - carriage return, carriage return and line "
-"feed, or line feed alone.  The default is to use the line feed character "
-"alone."
-msgstr ""
-"Indiquer la fin de ligne à utiliser — retour chariot, retour chariot et saut "
-"de ligne ou uniquement saut de ligne. Par défaut, le caractère de saut de "
-"ligne seul."
-
-# type: Plain text
-#. type: Plain text
-#: ppdc.man:100
-msgid ""
-"B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
-"Online Help (http://localhost:631/help)"
-msgstr ""
-"B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), aide "
-"en ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>."
-
-#. type: TH
-#: ppdhtml.man:13
+#: ppdhtml.1:10
 #, no-wrap
 msgid "ppdhtml"
 msgstr "ppdhtml"
 
 #. type: Plain text
-#: ppdhtml.man:16
+#: ppdhtml.1:13
 msgid "ppdhtml - cups html summary generator (deprecated)"
 msgstr "ppdhtml - Création d’un résumé HTML pour CUPS (obsolète)"
 
 # type: Plain text
 #. type: Plain text
-#: ppdhtml.man:25
+#: ppdhtml.1:22
 msgid ""
 "B<ppdhtml> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] "
 "I<source-file>"
@@ -18137,7 +18093,7 @@ msgstr ""
 "I<fichier_source>"
 
 #. type: Plain text
-#: ppdhtml.man:28
+#: ppdhtml.1:25
 msgid ""
 "B<ppdhtml> reads a driver information file and produces a HTML summary page "
 "that lists all of the drivers in a file and the supported options.  B<This "
@@ -18150,13 +18106,13 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ppdhtml.man:30
+#: ppdhtml.1:27
 msgid "B<ppdhtml> supports the following options:"
 msgstr "B<ppdhtml> accepte les options suivantes :"
 
 # type: Plain text
 #. type: Plain text
-#: ppdhtml.man:45
+#: ppdhtml.1:46
 msgid ""
 "B<ppdc>(1), B<ppdcfile>(5), B<ppdi>(1), B<ppdmerge>(1), B<ppdpo>(1), CUPS "
 "Online Help (http://localhost:631/help)"
@@ -18165,18 +18121,18 @@ msgstr ""
 "ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>."
 
 #. type: TH
-#: ppdi.man:13
+#: ppdi.1:10
 #, no-wrap
 msgid "ppdi"
 msgstr "ppdi"
 
 #. type: Plain text
-#: ppdi.man:16
+#: ppdi.1:13
 msgid "ppdi - import ppd files (deprecated)"
 msgstr "ppdi - Importation de fichiers PPD (obsolète)"
 
 #. type: Plain text
-#: ppdi.man:29
+#: ppdi.1:26
 msgid ""
 "B<ppdi> [ B<-I> I<include-directory> ] [ B<-o> I<source-file> ] I<ppd-file> "
 "[ ...  I<ppd-file> ]"
@@ -18185,7 +18141,7 @@ msgstr ""
 "I<fichier_ppd> [ ...  I<fichier_ppd> ]"
 
 #. type: Plain text
-#: ppdi.man:33
+#: ppdi.1:30
 msgid ""
 "B<ppdi> imports one or more PPD files into a PPD compiler source file.  "
 "Multiple languages of the same PPD file are merged into a single printer "
@@ -18200,19 +18156,19 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ppdi.man:35
+#: ppdi.1:32
 msgid "B<ppdi> supports the following options:"
 msgstr "B<ppdi> accepte les options suivantes :"
 
 # type: TP
 #. type: TP
-#: ppdi.man:39
+#: ppdi.1:36
 #, no-wrap
 msgid "B<-o >I<source-file>"
 msgstr "B<-o >I<fichier_source>"
 
 #. type: Plain text
-#: ppdi.man:45
+#: ppdi.1:42
 msgid ""
 "Specifies the PPD source file to update.  If the source file does not exist, "
 "a new source file is created.  Otherwise the existing file is merged with "
@@ -18227,7 +18183,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ppdi.man:52
+#: ppdi.1:53
 msgid ""
 "B<ppdc>(1), B<ppdhtml>(1), B<ppdmerge>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
 "Online Help (http://localhost:631/help)"
@@ -18236,18 +18192,18 @@ msgstr ""
 "en ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
 
 #. type: TH
-#: ppdmerge.man:13
+#: ppdmerge.1:10
 #, no-wrap
 msgid "ppdmerge"
 msgstr "ppdmerge"
 
 #. type: Plain text
-#: ppdmerge.man:16
+#: ppdmerge.1:13
 msgid "ppdmerge - merge ppd files (deprecated)"
 msgstr "ppdmerge - Fusion de fichiers PPD (obsolète)"
 
 #. type: Plain text
-#: ppdmerge.man:27
+#: ppdmerge.1:24
 msgid ""
 "B<ppdmerge> [ B<-o> I<output-ppd-file> ] I<ppd-file> I<ppd-file> [ ...  "
 "I<ppd-file> ]"
@@ -18256,7 +18212,7 @@ msgstr ""
 "[ ...  I<fichier_ppd> ]"
 
 #. type: Plain text
-#: ppdmerge.man:31
+#: ppdmerge.1:28
 msgid ""
 "B<ppdmerge> merges two or more PPD files into a single, multi-language PPD "
 "file.  B<This program is deprecated and will be removed in a future release "
@@ -18268,19 +18224,19 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ppdmerge.man:33
+#: ppdmerge.1:30
 msgid "B<ppdmerge> supports the following options:"
 msgstr "B<ppdmerge> accepte les options suivantes :"
 
 # type: TP
 #. type: TP
-#: ppdmerge.man:33
+#: ppdmerge.1:30
 #, no-wrap
 msgid "B<-o >I<output-ppd-file>"
 msgstr "B<-o >I<fichier_sortie_ppd>"
 
 #. type: Plain text
-#: ppdmerge.man:38
+#: ppdmerge.1:35
 msgid ""
 "Specifies the PPD file to create.  If not specified, the merged PPD file is "
 "written to the standard output.  If the output file already exists, it is "
@@ -18291,7 +18247,7 @@ msgstr ""
 "déjà, il est réécrit sans avertissement."
 
 #. type: Plain text
-#: ppdmerge.man:41
+#: ppdmerge.1:42
 msgid ""
 "B<ppdmerge> does not check whether the merged PPD files are for the same "
 "device.  Merging of different device PPDs will yield unpredictable results."
@@ -18302,7 +18258,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ppdmerge.man:48
+#: ppdmerge.1:49
 msgid ""
 "B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdpo>(1), B<ppdcfile>(5), CUPS "
 "Online Help (http://localhost:631/help)"
@@ -18311,19 +18267,19 @@ msgstr ""
 "ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>."
 
 #. type: TH
-#: ppdpo.man:13
+#: ppdpo.1:10
 #, no-wrap
 msgid "ppdpo"
 msgstr "ppdpo"
 
 #. type: Plain text
-#: ppdpo.man:16
+#: ppdpo.1:13
 msgid "ppdpo - ppd message catalog generator (deprecated)"
 msgstr "ppdpo - Création de catalogue de messages PPD (obsolète)"
 
 # type: Plain text
 #. type: Plain text
-#: ppdpo.man:28
+#: ppdpo.1:25
 msgid ""
 "B<ppdpo> [ B<-D >I<name>[B<=>I<value>] ] [ B<-I> I<include-directory> ] [ B<-"
 "o> I<output-file> ] I<source-file>"
@@ -18332,7 +18288,7 @@ msgstr ""
 "[ B<-o> I<fichier_sortie> ] I<fichier_source>"
 
 #. type: Plain text
-#: ppdpo.man:31
+#: ppdpo.1:28
 msgid ""
 "B<ppdpo> extracts UI strings from PPDC source files and updates either a GNU "
 "gettext or macOS strings format message catalog source file for "
@@ -18347,19 +18303,19 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ppdpo.man:33
+#: ppdpo.1:30
 msgid "B<ppdpo> supports the following options:"
 msgstr "B<ppdpo> accepte les options suivantes :"
 
 # type: TP
 #. type: TP
-#: ppdpo.man:41
+#: ppdpo.1:38
 #, no-wrap
 msgid "B<-o >I<output-file>"
 msgstr "B<-o >I<fichier_sortie>"
 
 #. type: Plain text
-#: ppdpo.man:45
+#: ppdpo.1:42
 msgid ""
 "Specifies the output file.  The supported extensions are I<.po> or I<.po.gz> "
 "for GNU gettext format message catalogs and I<.strings> for macOS strings "
@@ -18371,7 +18327,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ppdpo.man:52
+#: ppdpo.1:53
 msgid ""
 "B<ppdc>(1), B<ppdhtml>(1), B<ppdi>(1), B<ppdmerge>(1), B<ppdcfile(5),> CUPS "
 "Online Help (http://localhost:631/help)"
@@ -18381,20 +18337,20 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: printers.conf.man:13
+#: printers.conf.5:9
 #, no-wrap
 msgid "printers.conf"
 msgstr "printers.conf"
 
 # type: Plain text
 #. type: Plain text
-#: printers.conf.man:16
+#: printers.conf.5:12
 msgid "printers.conf - printer configuration file for cups"
 msgstr "printers.conf - Fichier de configuration des imprimantes CUPS."
 
 # type: Plain text
 #. type: Plain text
-#: printers.conf.man:20
+#: printers.conf.5:16
 msgid ""
 "The B<printers.conf> file defines the local printers that are available. It "
 "is normally located in the I</etc/cups> directory and is maintained by the "
@@ -18408,12 +18364,12 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: printers.conf.man:30
+#: printers.conf.5:27
 #, fuzzy
 msgid ""
-"B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime."
-"types>(5), B<subscriptions.conf>(5), CUPS Online Help (http://localhost:631/"
-"help)"
+"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), "
+"B<mime.convs>(5), B<mime.types>(5), B<subscriptions.conf>(5), CUPS Online "
+"Help (http://localhost:631/help)"
 msgstr ""
 "B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime."
 "types>(5), B<subscriptions.conf>(5), aide en ligne de CUPS E<lt>URL:I<http://"
@@ -18421,26 +18377,26 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: subscriptions.conf.man:13
+#: subscriptions.conf.5:10
 #, no-wrap
 msgid "subscriptions.conf"
 msgstr "subscriptions.conf"
 
 # type: Plain text
 #. type: Plain text
-#: subscriptions.conf.man:16
+#: subscriptions.conf.5:13
 msgid "subscriptions.conf - subscription configuration file for cups"
 msgstr ""
 "subscriptions.conf - Fichier de configuration des abonnements pour CUPS"
 
 # type: Plain text
 #. type: Plain text
-#: subscriptions.conf.man:20
+#: subscriptions.conf.5:19
 #, fuzzy
 msgid ""
 "The B<subscriptions.conf> file defines the local event notification "
-"subscriptions that are active. It is normally located in the I</etc/cups> "
-"directory and is maintained by the B<cupsd>(8)  program. This file is not "
+"subscriptions that are active.  It is normally located in the I</etc/cups> "
+"directory and is maintained by the B<cupsd>(8)  program.  This file is not "
 "intended to be edited or managed manually."
 msgstr ""
 "Le fichier I<subscriptions.conf> définit les abonnements locaux aux "
@@ -18450,28 +18406,42 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: subscriptions.conf.man:30
+#: subscriptions.conf.5:30
 #, fuzzy
 msgid ""
-"B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime."
-"types>(5), B<printers.conf>(5), CUPS Online Help (http://localhost:631/help)"
+"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), "
+"B<mime.convs>(5), B<mime.types>(5), B<printers.conf>(5), CUPS Online Help "
+"(http://localhost:631/help)"
 msgstr ""
 "B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime."
 "types>(5), B<printers.conf>(5), aide en ligne de CUPS E<lt>URL:I<http://"
 "localhost:631/help>E<gt>."
 
 # type: TH
-#, fuzzy
-#~ msgid "26 April 2019"
-#~ msgstr "16 avril 2014"
+#~ msgid "4 April 2014"
+#~ msgstr "4 avril 2014"
 
 # type: Plain text
-#, fuzzy
-#~ msgid ""
-#~ "client.conf - client configuration file for cups (deprecated on macos)"
-#~ msgstr "client.conf - Fichier de configuration de client pour CUPS"
+#~ msgid "Copyright \\[co] 2007-2017 by Apple Inc."
+#~ msgstr "Copyright 2007-2017 par Apple Inc."
+
+# type: TH
+#~ msgid "15 April 2014"
+#~ msgstr "15 avril 2014"
+
+# type: TH
+#~ msgid "19 October 2017"
+#~ msgstr "19 octobre 2017"
 
+# type: Plain text
 #, fuzzy
+#~| msgid "classes.conf - class configuration file for cups"
+#~ msgid "client.conf - client configuration file for cups"
+#~ msgstr "classes.conf - Fichier de configuration des classes de CUPS"
+
+#~ msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
+#~ msgstr "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
+
 #~ msgid ""
 #~ "Sets encryption options (only in /etc/cups/client.conf).  By default, "
 #~ "CUPS only supports encryption using TLS v1.0 or higher using known secure "
@@ -18483,10 +18453,7 @@ msgstr ""
 #~ "clients.  The I<AllowSSL3> option enables SSL v3.0, which is required for "
 #~ "some older clients that do not support TLS v1.0.  The I<DenyCBC> option "
 #~ "disables all CBC cipher suites.  The I<DenyTLS1.0> option disables TLS "
-#~ "v1.0 support - this sets the minimum protocol version to TLS v1.1.  The "
-#~ "I<MinTLS> options set the minimum TLS version to support.  The I<MaxTLS> "
-#~ "options set the maximum TLS version to support.  Not all operating "
-#~ "systems support TLS 1.3 at this time."
+#~ "v1.0 support - this sets the minimum protocol version to TLS v1.1."
 #~ msgstr ""
 #~ "Définir les options de chiffrement (seulement dans I</etc/cups/client."
 #~ "conf>). Par défaut, CUPS prend en charge le chiffrement avec TLS "
@@ -18504,299 +18471,632 @@ msgstr ""
 #~ "TLS version 1.0 – cela oblige la version minimale du protocole à TLS "
 #~ "version 1.1."
 
-# type: TP
-#, fuzzy
-#~ msgid "B<UserAgentTokens None>"
-#~ msgstr "B<ServerTokens> I<None>"
+# type: TH
+#~ msgid "10 June 2014"
+#~ msgstr "10 juin 2014"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<UserAgentTokens ProductOnly>"
-#~ msgstr "B<ServerTokens> I<ProductOnly>"
+# type: TH
+#~ msgid "cupsaddsmb"
+#~ msgstr "cupsaddsmb"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<UserAgentTokens Major>"
-#~ msgstr "B<ServerTokens> I<Major>"
+# type: TH
+#~ msgid "11 June 2014"
+#~ msgstr "11 juin 2014"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<UserAgentTokens Minor>"
-#~ msgstr "B<ServerTokens> I<Minor>"
+# type: Plain text
+#~ msgid "cupsaddsmb - export printers to samba for windows clients"
+#~ msgstr ""
+#~ "cupsaddsmb - Exporter des imprimantes vers Samba pour les clients Windows"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<UserAgentTokens Minimal>"
-#~ msgstr "B<ServerTokens> I<Minimal>"
+# type: Plain text
+#~ msgid ""
+#~ "B<cupsaddsmb> [ B<-H> I<samba-server> ] [ B<-U> I<samba-user[%samba-"
+#~ "password]> ] [ B<-h> I<cups-server[:port]> ] [ B<-v> ] B<-a>"
+#~ msgstr ""
+#~ "B<cupsaddsmb> [ B<-H> I<serveur_samba> ] [ B<-U> I<identifiant_samba>[I<"
+#~ "%mot-de-passe_samba>] ] [ B<-h> I<serveur_cups>[B<:>I<port>] ] [ B<-v> ] "
+#~ "B<-a>"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<UserAgentTokens OS>"
-#~ msgstr "B<ServerTokens> I<OS>"
+# type: Plain text
+#~ msgid ""
+#~ "B<cupsaddsmb> [ B<-H> I<samba-server> ] [ B<-U> I<samba-user[%samba-"
+#~ "password]> ] [ B<-h> I<cups-server[:port]> ] [ B<-v> ] I<printer> [ ...  "
+#~ "I<printer> ]"
+#~ msgstr ""
+#~ "B<cupsaddsmb> [ B<-H> I<serveur_samba> ] [ B<-U> I<identifiant_samba>[I<"
+#~ "%mot-de-passe_samba>] ] [ B<-h> I<serveur_cups>[B<:>I<port>] ] [ B<-v> ] "
+#~ "I<imprimante> [ ... I<imprimante> ]"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<UserAgentTokens Full>"
-#~ msgstr "B<ServerTokens> I<Full>"
+# type: Plain text
+#~ msgid ""
+#~ "The B<cupsaddsmb> program exports printers to the SAMBA software (version "
+#~ "2.2.0 or higher) for use with Windows clients.  Depending on the SAMBA "
+#~ "configuration, you may need to provide a password to export the "
+#~ "printers.  This program requires the Windows printer driver files "
+#~ "described below."
+#~ msgstr ""
+#~ "B<cupsaddsmb> permet l'export d'imprimantes vers SAMBA (version 2.2.0 ou "
+#~ "supérieure) pour utilisation par des clients Windows. Suivant la "
+#~ "configuration de SAMBA, il est possible qu'un mot de passe soit demandé "
+#~ "pour l'export. Ce programme requiert les fichiers du pilote Windows, "
+#~ "comme indiqué plus bas."
 
-#, fuzzy
+# type: SH
+#~ msgid "SAMBA CONFIGURATION"
+#~ msgstr "CONFIGURATION DE SAMBA"
+
+# type: Plain text
 #~ msgid ""
-#~ "Specifies what information is included in the User-Agent header of HTTP "
-#~ "requests.  \"None\" disables the User-Agent header.  \"ProductOnly\" "
-#~ "reports \"CUPS\".  \"Major\" reports \"CUPS/major IPP/2\".  \"Minor\" "
-#~ "reports \"CUPS/major.minor IPP/2.1\".  \"Minimal\" reports \"CUPS/major."
-#~ "minor.patch IPP/2.1\".  \"OS\" reports \"CUPS/major.minor.path (osname "
-#~ "osversion) IPP/2.1\".  \"Full\" reports \"CUPS/major.minor.path (osname "
-#~ "osversion; architecture) IPP/2.1\".  The default is \"Minimal\"."
+#~ "B<cupsaddsmb> uses the RPC-based printing support in SAMBA to provide "
+#~ "printer drivers and PPD files to Windows client machines.  In order to "
+#~ "use this functionality, you must first configure the SAMBA B<smb."
+#~ "conf>(5)  file to support printing through CUPS and provide a printer "
+#~ "driver download share, as follows:"
 #~ msgstr ""
-#~ "Indiquer l’information à inclure dans l’en-tête du serveur pour les "
-#~ "réponses HTTP. « None » désactive l’en-tête, « ProductOnly » renvoie "
-#~ "« CUPS », « Major » renvoie « CUPS 2», « Minor » renvoie « CUPS 2.0 », "
-#~ "« Minimal » renvoie « CUPS 2.0.0 », « OS » renvoie « CUPS 2.0.0 (UNAME) » "
-#~ "ou UNAME est la sortie de la commande B<uname>(1), « Full » renvoie "
-#~ "« CUPS 2.0.0 (UNAME) IPP/2.0 ». Par défaut, « Minimal »."
+#~ "B<cupsaddsmb> utilise le mode d'impression basé sur RPC dans SAMBA, pour "
+#~ "fournir aux clients Windows les pilotes d'impression et les fichiers PPD. "
+#~ "Pour utiliser cette fonctionnalité, vous devez configurer le fichier "
+#~ "I<smb.conf> de SAMBA pour qu'il utilise l'impression à travers CUPS, et "
+#~ "fournisse un pilote à télécharger. Cela est fait de la manière suivante :"
+
+# type: Plain text
+#~ msgid ""
+#~ "    [global]\n"
+#~ "\tload printers = yes\n"
+#~ "\tprinting = cups\n"
+#~ "\tprintcap name = cups\n"
+#~ msgstr ""
+#~ "    [global]\n"
+#~ "\tload printers = yes\n"
+#~ "\tprinting = cups\n"
+#~ "\tprintcap name = cups\n"
+
+# type: Plain text
+#~ msgid ""
+#~ "    [printers]\n"
+#~ "\tcomment = All Printers\n"
+#~ "\tpath = /var/spool/samba\n"
+#~ "\tbrowseable = no\n"
+#~ "\tpublic = yes\n"
+#~ "\tguest ok = yes\n"
+#~ "\twritable = no\n"
+#~ "\tprintable = yes\n"
+#~ msgstr ""
+#~ "    [printers]\n"
+#~ "\tcomment = All Printers\n"
+#~ "\tpath = /var/spool/samba\n"
+#~ "\tbrowseable = no\n"
+#~ "\tpublic = yes\n"
+#~ "\tguest ok = yes\n"
+#~ "\twritable = no\n"
+#~ "\tprintable = yes\n"
+
+# type: Plain text
+#~ msgid ""
+#~ "    [print$]\n"
+#~ "\tcomment = Printer Drivers\n"
+#~ "\tpath = /etc/samba/drivers\n"
+#~ "\tbrowseable = yes\n"
+#~ "\tguest ok = no\n"
+#~ "\tread only = yes\n"
+#~ "\twrite list = root\n"
+#~ msgstr ""
+#~ "    [print$]\n"
+#~ "\tcomment = Printer Drivers\n"
+#~ "\tpath = /etc/samba/drivers\n"
+#~ "\tbrowseable = yes\n"
+#~ "\tguest ok = no\n"
+#~ "\tread only = yes\n"
+#~ "\twrite list = root\n"
+
+# type: Plain text
+#~ msgid ""
+#~ "This configuration assumes a FHS-compliant installation of SAMBA; adjust "
+#~ "the [printers] and [print$] share paths accordingly on your system as "
+#~ "needed."
+#~ msgstr ""
+#~ "Cette configuration suppose une installation de SAMBA conforme au "
+#~ "standard FHS. Modifiez les chemins des partages [I<printers>] et [I<print"
+#~ "$>] suivant votre installation."
 
 # type: SH
-#, fuzzy
-#~ msgid "DEPRECATED OPTIONS"
-#~ msgstr "DIRECTIVES OBSOLÈTES"
+#~ msgid "MICROSOFT POSTSCRIPT DRIVERS FOR WINDOWS"
+#~ msgstr "PILOTES POSTSCRIPT MICROSOFT POUR WINDOWS"
 
 # type: Plain text
-#, fuzzy
 #~ msgid ""
-#~ "The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
-#~ "normally located in the I</etc/cups> directory.  Each line in the file "
-#~ "can be a configuration directive, a blank line, or a comment.  "
-#~ "Configuration directives typically consist of a name and zero or more "
-#~ "values separated by whitespace.  The configuration directive name and "
-#~ "values are case-insensitive.  Comment lines start with the # character."
+#~ "The base driver for Windows 2000 and higher is the Microsoft PostScript "
+#~ "driver, which is available on any system running Windows 2000 or higher "
+#~ "in the %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eW32X86\\e3 folder for 32-"
+#~ "bit drivers and %WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eX64\\e3 folder "
+#~ "for 64-bit drivers."
 #~ msgstr ""
-#~ "Chaque ligne de ce fichier est soit une directive de configuration, une "
-#~ "ligne vide ou un commentaire. Les directives de configuration consistent "
-#~ "classiquement en un nom suivi de zéro ou plusieurs valeurs séparées par "
-#~ "des espaces. Les noms des directives de configuration et les valeurs ne "
-#~ "sont pas sensibles à la casse. Les lignes de commentaires débutent par le "
-#~ "caractère « # »."
+#~ "Le pilote de base de Windows 2000 et des versions ultérieures est le "
+#~ "pilote PostScript Microsoft qui est disponible sur tous les systèmes avec "
+#~ "Windows 2000 ou une version ultérieure dans le répertoire I<%WINDIR%"
+#~ "\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eW32X86\\e3> pour les pilotes 32 bits et "
+#~ "dans le répertoire I<%WINDIR%\\eSYSTEM32\\eSPOOL\\eDRIVERS\\eX64\\e3> "
+#~ "pour les pilotes 64 bits."
 
 # type: Plain text
-#, fuzzy
 #~ msgid ""
-#~ "Specifies the fully-qualified domain name for the server that is used for "
-#~ "Bonjour sharing.  The default is typically the server's \".local\" "
-#~ "hostname."
+#~ "Copy the 32-bit drivers to the I</usr/share/cups/drivers> directory and "
+#~ "the 64-bit drivers to the I</usr/share/cups/drivers/x64> directory "
+#~ "exactly as named below:"
 #~ msgstr ""
-#~ "Définir le nom d’hôte complet du serveur. Par défaut, la valeur indiquée "
-#~ "par la commande B<hostname>(1) est utilisée."
+#~ "Copier exactement les pilotes 32 bits dans le répertoire I</usr/share/"
+#~ "cups/drivers> et les pilotes 64 bits dans le répertoire I</usr/share/cups/"
+#~ "drivers/x64>, comme mentionnés ci-dessous :"
 
-#, fuzzy
+# type: Plain text
 #~ msgid ""
-#~ "The B<cups-lpd> program is deprecated and will no longer be supported in "
-#~ "a future feature release of CUPS."
+#~ "    ps5ui.dll\n"
+#~ "    pscript.hlp\n"
+#~ "    pscript.ntf\n"
+#~ "    pscript5.dll\n"
 #~ msgstr ""
-#~ "B<Ce programme est obsolète et sera supprimé dans une future version de "
-#~ "CUPS.>"
+#~ "    ps5ui.dll\n"
+#~ "    pscript.hlp\n"
+#~ "    pscript.ntf\n"
+#~ "    pscript5.dll\n"
 
-#, fuzzy
+# type: Plain text
 #~ msgid ""
-#~ "The CUPS SNMP backend is deprecated and will no longer be supported in a "
-#~ "future version of CUPS."
+#~ "B<Note:> Unlike Windows, case is significant - make sure that you use the "
+#~ "lowercase filenames shown above, otherwise B<cupsaddsmb> will fail to "
+#~ "export the drivers."
 #~ msgstr ""
-#~ "B<Ce programme est obsolète et sera supprimé dans une future version de "
-#~ "CUPS.>"
+#~ "B<Remarque :> contrairement à Windows, la casse est importante. Assurez-"
+#~ "vous d'utiliser des noms de fichier en minuscule, comme ci-dessus. Sinon, "
+#~ "B<cupsaddsmb> échouera lors de l'export des pilotes."
 
-# type: TH
-#, fuzzy
-#~ msgid "24 April 2019"
-#~ msgstr "4 avril 2014"
+# type: Plain text
+#~ msgid "B<cupsaddsmb> supports the following options:"
+#~ msgstr "B<cupsaddsmb> accepte les options suivantes :"
 
 # type: TP
-#, fuzzy
-#~ msgid "B<ippevepcl> [ I<filename> ]"
-#~ msgstr "B<PageLog> [ I<nom_fichier> ]"
+#~ msgid "B<-H >I<samba-server>"
+#~ msgstr "B<-H> I<serveur_samba>"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<ippeveps> [ I<filename> ]"
-#~ msgstr "B<PageLog> [ I<nom_fichier> ]"
+# type: Plain text
+#~ msgid "Specifies the SAMBA server which defaults to the CUPS server."
+#~ msgstr "Préciser le serveur SAMBA par défaut pour le serveur CUPS."
 
 # type: TP
-#, fuzzy
-#~ msgid "B<ippeveprinter>(8)"
-#~ msgstr "B<-p> [I<imprimante(s)>]"
+#~ msgid "B<-U >I<samba-user>[B<%>I<samba-password>]"
+#~ msgstr "B<-U> I<utilisateur_samba>[B<%>I<mot-de-passe_samba>]"
 
 # type: Plain text
-#, fuzzy
-#~ msgid "Copyright \\[co] 2019 by Apple Inc."
-#~ msgstr "Copyright 2007-2019 par Apple Inc."
+#~ msgid ""
+#~ "Specifies the SAMBA print admin username which defaults to your current "
+#~ "username.  If the username contains a percent (%) character, then the "
+#~ "text following the percent is treated as the SAMBA password to use."
+#~ msgstr ""
+#~ "Indiquer l'identifiant de l'administrateur d'impression SAMBA, qui est "
+#~ "par défaut l'utilisateur courant. Si l'identifiant contient un caractère "
+#~ "« % », ce qui suit le pour cent est considéré comme le mot de passe SAMBA "
+#~ "à utiliser."
+
+# type: Plain text
+#~ msgid ""
+#~ "Exports all known printers.  Otherwise only the named printers are "
+#~ "exported."
+#~ msgstr ""
+#~ "Exporter toutes les imprimantes connues. Sinon, seules les imprimantes "
+#~ "fournies sur la ligne de commande sont exportées."
 
 # type: TP
-#, fuzzy
-#~ msgid "ippeveprinter"
-#~ msgstr "/printers"
+#~ msgid "B<-h >I<cups-server>[B<:>I<port>]"
+#~ msgstr "B<-h> I<serveur_cups>[B<:>I<port>]"
+
+# type: Plain text
+#~ msgid "Specifies a different CUPS server to use."
+#~ msgstr "Définir un autre serveur CUPS à utiliser."
+
+# type: Plain text
+#~ msgid ""
+#~ "Specifies that verbose information should be shown.  This is useful for "
+#~ "debugging SAMBA configuration problems."
+#~ msgstr ""
+#~ "Indiquer que des informations détaillées doivent être affichées. Cela "
+#~ "peut être utile pour le débogage des configurations de SAMBA."
+
+# type: Plain text
+#~ msgid ""
+#~ "B<rpcclient>(1), B<smbclient>(1), B<smbd>(8), B<smb.conf>(5), CUPS Online "
+#~ "Help (http://localhost:631/help)"
+#~ msgstr ""
+#~ "B<rpcclient>(1), B<smbclient>(1), B<smbd>(8), B<smb.conf>(5), aide en "
+#~ "ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
 
 # type: TH
-#, fuzzy
-#~ msgid "17 May 2019"
+#~ msgid "30 May 2016"
+#~ msgstr "30 mai 2016"
+
+# type: TH
+#~ msgid "2 May 2019"
 #~ msgstr "2 mai 2019"
 
-# type: Plain text
 #, fuzzy
-#~ msgid "Show program usage."
-#~ msgstr "Afficher un message d'aide."
+#~ msgid ""
+#~ "Specifies what information is included in the Server header of HTTP "
+#~ "responses.  \"None\" disables the Server header.  \"ProductOnly\" reports "
+#~ "\"CUPS\".  \"Major\" reports \"CUPS 2\".  \"Minor\" reports \"CUPS "
+#~ "2.0\".  \"Minimal\" reports \"CUPS 2.0.0\".  \"OS\" reports \"CUPS 2.0.0 "
+#~ "(UNAME)\" where UNAME is the output of the B<uname>(1)  command.  \"Full"
+#~ "\" reports \"CUPS 2.0.0 (UNAME) IPP/2.0\".  The default is \"Minimal\"."
+#~ msgstr ""
+#~ "Indiquer l’information à inclure dans l’en-tête du serveur pour les "
+#~ "réponses HTTP. « None » désactive l’en-tête, « ProductOnly » renvoie "
+#~ "« CUPS », « Major » renvoie « CUPS 2», « Minor » renvoie « CUPS 2.0 », "
+#~ "« Minimal » renvoie « CUPS 2.0.0 », « OS » renvoie « CUPS 2.0.0 (UNAME) » "
+#~ "ou UNAME est la sortie de la commande B<uname>(1), « Full » renvoie "
+#~ "« CUPS 2.0.0 (UNAME) IPP/2.0 ». Par défaut, « Minimal »."
+
+#~ msgid ""
+#~ "Sets encryption options.  By default, CUPS only supports encryption using "
+#~ "TLS v1.0 or higher using known secure cipher suites.  Security is reduced "
+#~ "when I<Allow> options are used.  Security is enhanced when I<Deny> "
+#~ "options are used.  The I<AllowDH> option enables cipher suites using "
+#~ "plain Diffie-Hellman key negotiation (not supported on systems using GNU "
+#~ "TLS).  The I<AllowRC4> option enables the 128-bit RC4 cipher suites, "
+#~ "which are required for some older clients.  The I<AllowSSL3> option "
+#~ "enables SSL v3.0, which is required for some older clients that do not "
+#~ "support TLS v1.0.  The I<DenyCBC> option disables all CBC cipher suites.  "
+#~ "The I<DenyTLS1.0> option disables TLS v1.0 support - this sets the "
+#~ "minimum protocol version to TLS v1.1."
+#~ msgstr ""
+#~ "Définir les options de chiffrement. Par défaut, CUPS prend en charge le "
+#~ "chiffrement avec TLS versions 1.0 ou postérieures en utilisant les suites "
+#~ "de chiffrement fiables. La sécurité est diminuée lorsque des options "
+#~ "I<Allow> sont utilisées. La sécurité est améliorée lorsque des options "
+#~ "I<Deny> sont utilisées. L’option I<AllowDH> autorise les suites de "
+#~ "chiffrement utilisant la négociation de clefs stricte Diffie-Hellman (non "
+#~ "prise en charge dans les systèmes utilisant GNU TLS). L’option "
+#~ "I<AllowRC4> autorise les suites de chiffrement RC4 128 bits qui sont "
+#~ "nécessaires pour quelques clients anciens. L’option I<AllowSSL3> autorise "
+#~ "SSL version 3.0 nécessaire pour certains anciens clients qui ne prennent "
+#~ "pas en charge TLS version 1.0. L’option I<DenyTLS1.0> désactive la prise "
+#~ "en charge de TLS version 1.0 – cela oblige la version minimale du "
+#~ "protocole à TLS version 1.1."
+
+#~ msgid ""
+#~ "Allows access from the named hosts, domains, addresses, or interfaces.  "
+#~ "The Order directive controls whether Allow lines are evaluated before or "
+#~ "after Deny lines."
+#~ msgstr ""
+#~ "Autoriser l’accès à partir des hôtes nommés, domaines, adresses ou "
+#~ "interfaces.La directive Order décide si les lignes Allow sont évaluées "
+#~ "avant ou après les lignes Deny."
+
+#~ msgid ""
+#~ "Denies access from the named hosts, domains, addresses, or interfaces.  "
+#~ "The Order directive controls whether Deny lines are evaluated before or "
+#~ "after Allow lines."
+#~ msgstr ""
+#~ "Refuser l’accès à partir des hôtes nommés, domaines, adresses ou "
+#~ "interfaces.La directive Order décide si les lignes Allow sont évaluées "
+#~ "avant ou après les lignes Deny."
+
+# type: TH
+#~ msgid "8 November 2017"
+#~ msgstr "8 novembre 2017"
 
 # type: Plain text
-#, fuzzy
-#~ msgid "Show the CUPS version."
-#~ msgstr "Afficher si le serveur CUPS est actif."
+#~ msgid "Copyright \\[co] 2007-2018 by Apple Inc."
+#~ msgstr "Copyright 2007-2018 par Apple Inc."
 
-# type: TP
-#, fuzzy
-#~ msgid "B<-D >I<device-uri>"
-#~ msgstr "B<-v \">I<uri_périphérique>B<\">"
+# type: TH
+#~ msgid "12 February 2016"
+#~ msgstr "12 février 2016"
 
 # type: TH
-#, fuzzy
-#~ msgid "B<-F >I<output-type/subtype[,...]>"
-#~ msgstr "B<-f >I<type/sous-type[,...]>"
+#~ msgid "25 February 2018 "
+#~ msgstr "25 février 2018"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<-P >I<filename.ppd>"
-#~ msgstr "B<-p> I<nom_fichier.ppd>"
+# type: TH
+#~ msgid "3 June 2014"
+#~ msgstr "3 juin 2014"
 
+# type: TH
 #, fuzzy
-#~ msgid "B<-V 1.1>"
-#~ msgstr "B<VERSION 1.1>"
+#~| msgid "15 April 2014"
+#~ msgid "16 April 2014"
+#~ msgstr "15 avril 2014"
 
-#, fuzzy
-#~ msgid "B<-V 2.0>"
-#~ msgstr "B<VERSION 2.0>"
+# type: TH
+#~ msgid "cupstestdsc"
+#~ msgstr "cupstestdsc"
 
 # type: Plain text
-#, fuzzy
-#~ msgid "Specifies the maximum IPP version to report.  2.0 is the default."
-#~ msgstr "Indiquer le numéro de version d’IPP à utiliser pour ce test."
+#~ msgid "cupstestdsc - test conformance of postscript files (deprecated)"
+#~ msgstr ""
+#~ "cupstestdsc - Tester la conformité des fichiers postscript (obsolète)"
+
+# type: Plain text
+#~ msgid "B<cupstestdsc> [ B<-h> ] I<filename.ps> [ ...  I<filenameN.ps> ]"
+#~ msgstr ""
+#~ "B<cupstestdsc> [ B<-h> ] I<nom_fichier.ps> [ ... I<nom_fichierN.ps> ]"
+
+# type: Plain text
+#~ msgid "B<cupstestdsc> [ B<-h> ] B<->"
+#~ msgstr "B<cupstestdsc> [ B<-h> ] B<->"
 
 # type: Plain text
-#, fuzzy
 #~ msgid ""
-#~ "Specifies the printer icon file for the server.  The file must be a PNG "
-#~ "format image.  The default is an internally-provided PNG image."
+#~ "B<cupstestdsc> tests the conformance of PostScript files to the Adobe "
+#~ "PostScript Language Document Structuring Conventions Specification "
+#~ "version 3.0.  The results of testing and any other output are sent to the "
+#~ "standard output.  The second form of the command reads PostScript from "
+#~ "the standard input."
 #~ msgstr ""
-#~ "Indiquer le fichier d’icône de l’imprimante. Par défaut, « printer.png »."
-#~ "\"."
+#~ "B<cupstestdsc> teste la conformité de fichiers PostScript avec la "
+#~ "spécification de format de fichier édictée par Adobe, « Adobe PostScript "
+#~ "Language Document Structuring Conventions Specification » dans sa "
+#~ "version 3.0. Les résultats des tests et autres sorties sont envoyés sur "
+#~ "la sortie standard. La seconde forme de la commande lit l'entrée "
+#~ "PostScript depuis l'entrée standard."
 
-# type: SH
-#, fuzzy
-#~ msgid "COMMAND OUTPUT"
-#~ msgstr "COMMANDES"
+# type: Plain text
+#~ msgid ""
+#~ "B<cupstestdsc> only validates the DSC comments in a PostScript file and "
+#~ "does not attempt to validate the PostScript code itself.  Developers must "
+#~ "ensure that the PostScript they generate follows the rules defined by "
+#~ "Adobe.  Specifically, all pages must be independent of each other, code "
+#~ "outside page descriptions may not affect the graphics state (current "
+#~ "font, color, transform matrix, etc.), and device-specific commands such "
+#~ "as setpagedevice should not be used."
+#~ msgstr ""
+#~ "B<cupstestdsc> ne valide que les commentaires DSC du fichier PostScript "
+#~ "et ne cherche pas à valider le code PostScript lui-même. Les développeurs "
+#~ "doivent s'assurer que le PostScript qu'ils génèrent est conforme aux "
+#~ "règles définies par Adobe. En particulier, toutes les pages doivent être "
+#~ "indépendantes les unes des autres, le code, en dehors des descriptions de "
+#~ "pages, ne doit pas affecter l'état graphique (police, couleur, matrices "
+#~ "de transformations, etc.) et les commandes spécifiques à certains "
+#~ "périphériques (comme B<setpagedevice> par exemple) ne doivent pas être "
+#~ "utilisées."
 
-# type: TP
-#, fuzzy
-#~ msgid "B<ATTR: >I<attribute=value[ attribute=value]>"
-#~ msgstr "B<ATTR: >I<attribut=valeur >[ I<... attribut=valeur>]"
+# type: Plain text
+#~ msgid ""
+#~ "CUPS Online Help (http://localhost:631/help), Adobe PostScript Language "
+#~ "Document Structuring Conventions Specification, Version 3.0."
+#~ msgstr ""
+#~ "Aide en ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>, Adobe "
+#~ "PostScript Language Document Structuring Conventions Specification, "
+#~ "Version 3.0."
 
-# type: TP
-#, fuzzy
-#~ msgid "B<DEBUG: >I<Debugging message>"
-#~ msgstr "B<DEBUG: >I<message>"
+# type: TH
+#~ msgid "19 October 2015"
+#~ msgstr "19 octobre 2015"
 
-# type: TP
-#, fuzzy
-#~ msgid "B<ERROR: >I<Error message>"
-#~ msgstr "B<ERROR:>I< message>"
+# type: TH
+#~ msgid "14 February 2018"
+#~ msgstr "14 février 2018"
 
-# type: TP
+#~ msgid "ippserver"
+#~ msgstr "ippserver"
+
+#~ msgid "28 August 2014"
+#~ msgstr "28 août 2014"
+
+#~ msgid "ippserver - a simple internet printing protocol server"
+#~ msgstr "ippserver - Simple serveur IPP (Internet Printing Protocol)"
+
+#~ msgid "B<-P>"
+#~ msgstr "B<-P>"
+
+# type: Plain text
+#~ msgid "Report support for PIN printing."
+#~ msgstr "Déclarer la prise en charge d’une imprimante matricielle."
+
+#~ msgid "Run the specified command for each document that is printed."
+#~ msgstr "Exécuter la commande indiquée pour chaque document imprimé."
+
+# type: Plain text
 #, fuzzy
-#~ msgid "B<INFO: >I<Informational message>"
-#~ msgstr "B<INFO:>I< message>"
+#~| msgid ""
+#~| "Specifies the model name of the printer.  The default is \"Printer\"."
+#~ msgid ""
+#~ "Specifies the printer icon file for the server.  The default is \"printer."
+#~ "png\"."
+#~ msgstr "Définir le nom de modèle de l’imprimante. Par défaut, « Printer »."
 
 #, fuzzy
-#~ msgid "    ippeveprinter -c /usr/bin/file \"My Cool Printer\"\n"
-#~ msgstr "    ippserver -c file \"Ma Super Imprimante\"\n"
+#~ msgid "    ippserver -c file \"My Cool Printer\"\n"
+#~ msgstr "    ippserver \"Ma Super Imprimante\"\n"
+
+# type: Plain text
+#~ msgid "Copyright \\[co] 2007-2014 by Apple Inc."
+#~ msgstr "Copyright 2007-2014 par Apple Inc."
+
+#~ msgid "4 August 2017"
+#~ msgstr "4 août 2017"
+
+#~ msgid "19 August 2018"
+#~ msgstr "19 août 2018"
 
 # type: TP
-#, fuzzy
-#~ msgid "B<--ippserver >I<filename>"
-#~ msgstr "B<-p> I<nom_fichier.ppd>"
+#~ msgid "B<-i >I<ppd-file>"
+#~ msgstr "B<-i >I<fichier_ppd>"
+
+# type: Plain text
+#~ msgid ""
+#~ "Specifies a PostScript Printer Description (PPD) file to use with the "
+#~ "printer."
+#~ msgstr ""
+#~ "Indiquer le chemin complet du fichier PPD (« PostScript Printer "
+#~ "Description ») à utiliser avec cette imprimante."
 
 # type: Plain text
-#, fuzzy
 #~ msgid ""
-#~ "Specifies that the test results should be written to the named "
-#~ "B<ippserver> attributes file."
+#~ "Unlike the System V printing system, CUPS allows printer names to contain "
+#~ "any printable character except SPACE, TAB, \"/\", or \"#\".  Also, "
+#~ "printer and class names are I<not> case-sensitive.  Finally, the CUPS "
+#~ "version of B<lpadmin> may ask the user for an access password depending "
+#~ "on the printing system configuration.  This differs from the System V "
+#~ "version which requires the root user to execute this command."
 #~ msgstr ""
-#~ "Indiquer que l’actuel test sera omis quand la variable est ou n’est pas "
-#~ "définie."
+#~ "Contrairement au système d'impression System V, CUPS permet des noms "
+#~ "d'imprimantes contenant tout caractère imprimable sauf ESPACE, "
+#~ "TABULATION, « / » ou « # ». De plus, les noms d'imprimante et de classe "
+#~ "ne sont B<pas> sensibles à la casse. Enfin, la version CUPS de B<lpadmin> "
+#~ "peut demander un mot de passe, suivant la configuration du système, à la "
+#~ "différence de la version System V qui demande le mot de passe du "
+#~ "superutilisateur lors de l'exécution de cette commande."
 
 # type: TH
-#, fuzzy
-#~ msgid "13 May 2019"
-#~ msgstr "13 mai 2013"
+#~ msgid "12 June 2014"
+#~ msgstr "12 juin 2014"
+
+# type: TH
+#~ msgid "2 May 2016"
+#~ msgstr "2 mai 2016"
+
+#~ msgid "B<-o collate=true>"
+#~ msgstr "B<-o collate=true>"
 
 # type: TP
-#, fuzzy
-#~ msgid "B<$date-start>"
-#~ msgstr "B<-H> I<restart>"
+#~ msgid "Prints collated copies."
+#~ msgstr "Imprimer des copies assemblées."
+
+#~ msgid "B<-o fit-to-page>"
+#~ msgstr "B<-o> I<fit-to-page>"
+
+# type: Plain text
+#~ msgid "Scales the print file to fit on the page."
+#~ msgstr ""
+#~ "Mettre le fichier à l'échelle pour qu'il prenne la taille de la page."
 
 # type: TP
-#, fuzzy
-#~ msgid "B<-o print-quality=3>"
-#~ msgstr "B<-o printer-op-policy=>I<nom>"
+#~ msgid "B<-o job-hold-until=>I<when>"
+#~ msgstr "B<-o job-hold-until=>I<quand>"
+
+#~ msgid ""
+#~ "Holds the job until the specified local time.  \"when\" can be "
+#~ "\"indefinite\" to hold the until released, \"day-time\" to print the job "
+#~ "between 6am and 6pm local time, \"night\" to print the job between 6pm "
+#~ "and 6am local time, \"second-shift\" to print the job between 4pm and "
+#~ "12am local time, \"third-shift\" to print the job between 12am and 8am "
+#~ "local time, or \"weekend\" to print the job on Saturday or Sunday."
+#~ msgstr ""
+#~ "Mettre en attente la tâche jusqu’au moment indiqué (heure locale). "
+#~ "« quand » peut être « indefinite » pour une attente jusqu’au prochain "
+#~ "ordre, « day-time » pour une impression entre 6 h 00 et 18 h 00, "
+#~ "« night » pour une impression entre 18 h 00 et 6 h 00, « second-shift » "
+#~ "pour une impression entre 4 h 00 et 12 h 00, « third-shift » pour une "
+#~ "impression entre 12 h 00 et 8 h 00 ou « weekend » pour imprimer les "
+#~ "samedi ou dimanche."
 
 # type: TP
-#, fuzzy
-#~ msgid "B<-o print-quality=4>"
-#~ msgstr "B<-o> I<orientation-requested=4>"
+#~ msgid "B<-o job-hold-until=>I<hh:mm>"
+#~ msgstr "B<-o job-hold-until=>I<hh:mm>"
+
+#~ msgid "Holds the job until the specified time in hours and minutes UTC."
+#~ msgstr ""
+#~ "Mettre la tâche en attente jusqu’au moment indiqué en heures et minutes "
+#~ "UTC."
 
 # type: TP
-#, fuzzy
-#~ msgid "B<-o print-quality=5>"
-#~ msgstr "B<-o> I<orientation-requested=5>"
+#~ msgid "B<-o job-priority=>I<priority>"
+#~ msgstr "B<-o job-priority=>I<priorité>"
 
 # type: Plain text
-#, fuzzy
-#~ msgid "Print a presentation document 2-up to a printer called \"bar\":"
-#~ msgstr "Imprimer une double composition avec l'imprimante « toto »."
+#~ msgid ""
+#~ "Set the priority to a value from 1 (lowest) to 100 (highest), which "
+#~ "influences when a job is scheduled for printing.  The default priority is "
+#~ "typically 50."
+#~ msgstr ""
+#~ "Définir la priorité du travail d'impression, de B<1> (minimale) à B<100> "
+#~ "(maximale), qui influe sur le moment prévu. La priorité par défaut est "
+#~ "B<50>."
 
-# type: Plain text
-#, fuzzy
-#~ msgid "    lp -d bar -o number-up=2 filename\n"
-#~ msgstr "    lp -d toto -o number-up=2 nom_fichier\n"
+# type: TP
+#~ msgid "B<-o job-sheets=>I<start-name,end-name>"
+#~ msgstr "B<-o job-sheets=>I<nom-début,nom-fin>"
 
-# type: Plain text
-#, fuzzy
-#~ msgid "The following B<lpadmin> options are deprecated:"
-#~ msgstr "Les options suivantes sont reconnues :"
+#~ msgid "Prints cover pages (banners) with the document."
+#~ msgstr "Imprimer des pages de couverture (bannières) avec le document."
 
 # type: TP
-#, fuzzy
-#~ msgid "B<-i >I<filename>"
-#~ msgstr "B<-f>I<\\ nom_fichier>"
+#~ msgid "B<-o mirror>"
+#~ msgstr "B<-o mirror>"
+
+#~ msgid "Mirrors each page."
+#~ msgstr "Appliquer un effet miroir pour chaque page."
+
+# type: TP
+#~ msgid "B<-o number-up-layout=>I<layout>"
+#~ msgstr "B<-o number-up-layout=>I<mise_en_page>"
 
-# type: Plain text
-#, fuzzy
 #~ msgid ""
-#~ "Specifies a PostScript Printer Description (PPD) file to use with the "
-#~ "printer.  Note: PPD files and printer drivers are deprecated and will not "
-#~ "be supported in a future version of CUPS."
+#~ "Specifies the layout of pages with the \"number-up\" option.  The \"layout"
+#~ "\" string can be \"btlr\", \"btrl\", \"lrbt\", \"lrtb\", \"rlbt\", \"rltb"
+#~ "\", \"tblr\", or \"tbrl\" - the first two letters determine the column "
+#~ "order while the second two letters determine the row order.  \"bt\" is "
+#~ "bottom-to-top, \"lr\" is left-to-right, \"rl\" is right-to-left, and \"tb"
+#~ "\" is top-to-bottom."
 #~ msgstr ""
-#~ "Définir le fichier PPD (« Postscript Printer Description ») à utiliser "
-#~ "avec cette imprimante. Si cette option est indiquée, elle annule l'option "
-#~ "B<-i> (script d'interface)."
+#~ "Indiquer la mise en page avec l’option « mise_en_page ».  La chaîne "
+#~ "« mise_en_page » peut être « btlr », « btrl », « lrbt », « lrtb », "
+#~ "« rlbt », « rltb », « tblr » ou « tbrl ». Les deux premières lettres "
+#~ "indiquent l’ordre des colonnes tandis que les deux suivantes indiquent "
+#~ "l’ordre des lignes.  « bt » veut dire bas vers haut, « lr » gauche vers "
+#~ "droite, « rl » droite vers gauche et « tb » haut vers bas."
+
+# type: TP
+#~ msgid "B<-o outputorder=reverse>"
+#~ msgstr "B<-o> I<outputorder=reverse>"
+
+#~ msgid "Prints pages in reverse order."
+#~ msgstr "Imprimer en ordre inverse."
+
+#~ msgid "B<-o page-border=>I<border>"
+#~ msgstr "B<-o page-border=>I<bordure>"
 
-# type: Plain text
-#, fuzzy
 #~ msgid ""
-#~ "Finally, the CUPS version of B<lpadmin> may ask the user for an access "
-#~ "password depending on the printing system configuration.  This differs "
-#~ "from the System V version which requires the root user to execute this "
-#~ "command."
+#~ "Prints a border around each document page.  \"border\" is \"double\", "
+#~ "\"double-thick\", \"single\", or \"single-thick\"."
 #~ msgstr ""
-#~ "Les versions CUPS de B<disable> et B<enable> peuvent demander à "
-#~ "l'utilisateur un accès par mot de passe suivant la configuration du "
-#~ "système d'impression, à la différence des versions System V qui demandent "
-#~ "le mot de passe superutilisateur pour exécuter ces commandes."
+#~ "Imprimer un encadrement pour chaque page du document. « bordure » est "
+#~ "soit « double », « double-thick », « single » ou « single-thick »."
+
+# type: TP
+#~ msgid "B<-o page-ranges=>I<page-list>"
+#~ msgstr "B<-o page-ranges=>I<liste_pages>"
+
+# type: Plain text
+#~ msgid "    lp -d foo -o number-up=2 filename\n"
+#~ msgstr "    lp -d toto -o number-up=2 nom_fichier\n"
+
+# type: TH
+#~ msgid "26 May 2016"
+#~ msgstr "26 mai 2016"
+
+# type: TH
+#, fuzzy
+#~ msgid "10 April 2018"
+#~ msgstr "15 avril 2014"
+
+# type: TH
+#~ msgid "22 May 2014"
+#~ msgstr "22 mai 2014"
+
+# type: TH
+#~ msgid "26 May 2017"
+#~ msgstr "26 mai 2017"
+
+#~ msgid "26 August 2015"
+#~ msgstr "26 août 2015"
+
+# type: TH
+#~ msgid "5 March 2016"
+#~ msgstr "5 mars 2016"
+
+# type: TH
+#, fuzzy
+#~ msgid "13 May 2019"
+#~ msgstr "13 mai 2013"
 
 # type: TH
 #~ msgid "15 June 2017"
@@ -20072,10 +20372,6 @@ msgstr ""
 #~ msgid "I<ipptool(1)>, RFC 2911,"
 #~ msgstr "B<ipptool>(1), RFC 2911,"
 
-# type: TH
-#~ msgid "16 July 2012"
-#~ msgstr "16 juillet 2012"
-
 # type: SH
 #~ msgid "CONFIGURATION OPTIONS"
 #~ msgstr "OPTIONS DE CONFIGURATION"
-- 
cgit v1.2.3


From d1447a73280f57224ce51da77709b55663a2f6ef Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 2 Sep 2019 10:53:10 +0200
Subject: Bump S-V to 4.4.0 without changes needed

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 32d79a95c..0f237262d 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Build-Depends: debhelper-compat (= 12),
 # libgmp-dev is not GPL-2 compatible before it's 6 release, which makes it also GPL-2+
 Build-Conflicts: libgmp-dev (<< 2:6)
 Rules-Requires-Root: no
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/printing-team/cups
 Vcs-Git: https://salsa.debian.org/printing-team/cups.git
 Homepage: https://www.cups.org/
-- 
cgit v1.2.3


From ce0e6d0ad7ea78148fe40624d1e21d252e278fc3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 2 Sep 2019 10:58:22 +0200
Subject: Set upstream metadata fields: Bug-Submit.

---
 debian/upstream/metadata | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 97fe1bb18..82070cf8e 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,2 +1,3 @@
 Name: CUPS
 Contact: Michael Sweet <msweet@apple.com>
+Bug-Submit: https://github.com/apple/cups/issues
-- 
cgit v1.2.3


From 40bc3caf08ae23eb44b6147d262e26ef8448eb7b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 2 Sep 2019 10:58:23 +0200
Subject: Remove obsolete fields Name, Contact from debian/upstream/metadata.

---
 debian/upstream/metadata | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 82070cf8e..40b96cc6a 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,3 +1 @@
-Name: CUPS
-Contact: Michael Sweet <msweet@apple.com>
 Bug-Submit: https://github.com/apple/cups/issues
-- 
cgit v1.2.3


From a50ef39f953764fa59550beab1af18d03f5d3750 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 2 Sep 2019 13:19:18 +0200
Subject: cups 2.3.0-1 Debian release

---
 debian/changelog | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c189928da..6dfdcad00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-cups (2.3.0-1) UNRELEASED; urgency=medium
+cups (2.3.0-1) unstable; urgency=low
 
-  * Update to new upstream version 2.3.0.
+  * New 2.3.0 upstream release, to unstable
+    - CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows
+    - Fixed IPP buffer overflow
+    - Fixed memory disclosure and DoS issues in the scheduler
+    - CUPS is now provided under the Apache License, Version 2.0, with a
+      GPL2/LGPL2 exception
+  * Rewrite debian/copyright with the above license change, install the
+    NOTICE file
+  * Refresh manpage translations
+  * Refresh upstream metadata
+  * Bump S-V to 4.4 without changes needed
 
- -- Didier Raboud <odyx@debian.org>  Mon, 02 Sep 2019 13:12:24 +0200
+ -- Didier Raboud <odyx@debian.org>  Mon, 02 Sep 2019 13:19:18 +0200
 
 cups (2.3~rc1-2) experimental; urgency=medium
 
-- 
cgit v1.2.3


From e24870dbda03aab6098aa3ed3209136c0d100ed4 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 2 Sep 2019 13:19:56 +0200
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...0003-Install-root-backends-world-readable.patch |  65 +++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  47 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 debian/patches/airprint-support.patch              |  93 ++++
 debian/patches/confdirperms.patch                  |  28 +
 .../cups-set-default-error-policy-retry-job.patch  |  75 +++
 .../cupsd-set-default-for-SyncOnClose-to-Yes.patch |  66 +++
 debian/patches/debianize_cups-config.patch         |  50 ++
 debian/patches/default_log_settings.patch          |  27 +
 .../patches/do-not-broadcast-with-hostnames.patch  |  26 +
 ...-with-multiple-files-and-multiple-formats.patch |  28 +
 debian/patches/logfiles_adm_readable.patch         |  62 +++
 .../man-cups-lpd-drop-dangling-references.patch    |  25 +
 debian/patches/manpage-hyphen-minus.patch          | 573 +++++++++++++++++++++
 debian/patches/manpage-translations.patch          | 343 ++++++++++++
 .../patches/move-cupsd-conf-default-to-share.patch |  64 +++
 debian/patches/no-conffile-timestamp.patch         |  68 +++
 debian/patches/pwg-raster-attributes.patch         | 111 ++++
 debian/patches/reactivate_recommended_driver.patch |  41 ++
 debian/patches/removecvstag.patch                  |  31 ++
 debian/patches/rename-systemd-units.patch          |  59 +++
 debian/patches/series                              |  33 ++
 debian/patches/show-compile-command-lines.patch    |  23 +
 debian/patches/test-i18n-nonlinux.patch            |  26 +
 .../tests-fix-ppdLocalize-on-unclean-env.patch     |  32 ++
 ...-ignore-ipv6-address-family-not-supported.patch |  25 +
 .../tests-ignore-kfreebsd-amd64-not-a-pdf.patch    |  26 +
 ...d-unable-to-write-uncompressed-print-data.patch |  26 +
 debian/patches/tests-ignore-usb-crash.patch        |  33 ++
 debian/patches/tests-ignore-warnings.patch         |  30 ++
 .../tests-make-lpstat-call-reproducible.patch      |  25 +
 debian/patches/tests-no-pdftourf.patch             |  67 +++
 debian/patches/tests-use-ipv4-lo-address.patch     |  65 +++
 .../tests-wait-on-unfinished-jobs-everytime.patch  |  30 ++
 34 files changed, 2433 insertions(+)
 create mode 100644 debian/patches/0003-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/airprint-support.patch
 create mode 100644 debian/patches/confdirperms.patch
 create mode 100644 debian/patches/cups-set-default-error-policy-retry-job.patch
 create mode 100644 debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/debianize_cups-config.patch
 create mode 100644 debian/patches/default_log_settings.patch
 create mode 100644 debian/patches/do-not-broadcast-with-hostnames.patch
 create mode 100644 debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
 create mode 100644 debian/patches/logfiles_adm_readable.patch
 create mode 100644 debian/patches/man-cups-lpd-drop-dangling-references.patch
 create mode 100644 debian/patches/manpage-hyphen-minus.patch
 create mode 100644 debian/patches/manpage-translations.patch
 create mode 100644 debian/patches/move-cupsd-conf-default-to-share.patch
 create mode 100644 debian/patches/no-conffile-timestamp.patch
 create mode 100644 debian/patches/pwg-raster-attributes.patch
 create mode 100644 debian/patches/reactivate_recommended_driver.patch
 create mode 100644 debian/patches/removecvstag.patch
 create mode 100644 debian/patches/rename-systemd-units.patch
 create mode 100644 debian/patches/series
 create mode 100644 debian/patches/show-compile-command-lines.patch
 create mode 100644 debian/patches/test-i18n-nonlinux.patch
 create mode 100644 debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
 create mode 100644 debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
 create mode 100644 debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
 create mode 100644 debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
 create mode 100644 debian/patches/tests-ignore-usb-crash.patch
 create mode 100644 debian/patches/tests-ignore-warnings.patch
 create mode 100644 debian/patches/tests-make-lpstat-call-reproducible.patch
 create mode 100644 debian/patches/tests-no-pdftourf.patch
 create mode 100644 debian/patches/tests-use-ipv4-lo-address.patch
 create mode 100644 debian/patches/tests-wait-on-unfinished-jobs-everytime.patch

diff --git a/debian/patches/0003-Install-root-backends-world-readable.patch b/debian/patches/0003-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..9acfef10e
--- /dev/null
+++ b/debian/patches/0003-Install-root-backends-world-readable.patch
@@ -0,0 +1,65 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: http://www.cups.org/str.php?L2935
+Bug-Debian: http://bugs.debian.org/410171
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index 2cfb1b0..515fc8b 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..9f41361a3
--- /dev/null
+++ b/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,47 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://www.cups.org/str.php?L3552
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..07133c64e
--- /dev/null
+++ b/debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+
+Bug-Debian: https://bugs.debian.org/837936
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 7eca9e3..2dfdbb9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch
new file mode 100644
index 000000000..1405db6f6
--- /dev/null
+++ b/debian/patches/airprint-support.patch
@@ -0,0 +1,93 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: http://bugs.debian.org/700961
+Bug: https://cups.org/str.php?L4341
+Last-Update: 2015-02-10
+
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 5425237..b366bf5 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3806,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch
new file mode 100644
index 000000000..524090f2b
--- /dev/null
+++ b/debian/patches/confdirperms.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Last-Update: 2015-02-10
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/cups-set-default-error-policy-retry-job.patch b/debian/patches/cups-set-default-error-policy-retry-job.patch
new file mode 100644
index 000000000..41540cddb
--- /dev/null
+++ b/debian/patches/cups-set-default-error-policy-retry-job.patch
@@ -0,0 +1,75 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job", since it is less
+
+ confusing and a better default on most machines.
+ .
+ Amend documentation accordingly.
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Last-Update: 2016-07-03
+
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..7352732b2
--- /dev/null
+++ b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,66 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Last-Update: 2015-02-10
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch
new file mode 100644
index 000000000..05e6037ef
--- /dev/null
+++ b/debian/patches/debianize_cups-config.patch
@@ -0,0 +1,50 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Last-Update: 2014-06-11
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/default_log_settings.patch b/debian/patches/default_log_settings.patch
new file mode 100644
index 000000000..fca2bee7c
--- /dev/null
+++ b/debian/patches/default_log_settings.patch
@@ -0,0 +1,27 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Last-Update: 2015-02-10
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/do-not-broadcast-with-hostnames.patch b/debian/patches/do-not-broadcast-with-hostnames.patch
new file mode 100644
index 000000000..339a35266
--- /dev/null
+++ b/debian/patches/do-not-broadcast-with-hostnames.patch
@@ -0,0 +1,26 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
new file mode 100644
index 000000000..3b18e3345
--- /dev/null
+++ b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
@@ -0,0 +1,28 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://www.cups.org/str.php?L4348
+Last-Updated: 2015-02-10
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 8226acc..5902dd6 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1803,7 +1803,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch
new file mode 100644
index 000000000..e72ba5836
--- /dev/null
+++ b/debian/patches/logfiles_adm_readable.patch
@@ -0,0 +1,62 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+
+Last-Update: 2015-02-10
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index cdb5437..d53d140 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/man-cups-lpd-drop-dangling-references.patch b/debian/patches/man-cups-lpd-drop-dangling-references.patch
new file mode 100644
index 000000000..711f28dff
--- /dev/null
+++ b/debian/patches/man-cups-lpd-drop-dangling-references.patch
@@ -0,0 +1,25 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: http://bugs.debian.org/570157
+Last-Update: 2015-10-02
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/manpage-hyphen-minus.patch b/debian/patches/manpage-hyphen-minus.patch
new file mode 100644
index 000000000..9998a0ae8
--- /dev/null
+++ b/debian/patches/manpage-hyphen-minus.patch
@@ -0,0 +1,573 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://cups.org/str.php?L4299
+Last-Update: 2015-02-10
+
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 8805561..92f1d95 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -64,7 +64,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -114,7 +114,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index 5753c69..2fcda8b 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -129,8 +129,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -227,7 +227,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch
new file mode 100644
index 000000000..575d4c653
--- /dev/null
+++ b/debian/patches/manpage-translations.patch
@@ -0,0 +1,343 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages.
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/478597
+
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/move-cupsd-conf-default-to-share.patch b/debian/patches/move-cupsd-conf-default-to-share.patch
new file mode 100644
index 000000000..a645fc11d
--- /dev/null
+++ b/debian/patches/move-cupsd-conf-default-to-share.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://cups.org/str.php?L4342
+Bug-Debian: http://bugs.debian.org/640124
+Last-Update: 2015-02-10
+
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/no-conffile-timestamp.patch b/debian/patches/no-conffile-timestamp.patch
new file mode 100644
index 000000000..d58ae8c67
--- /dev/null
+++ b/debian/patches/no-conffile-timestamp.patch
@@ -0,0 +1,68 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 776e79a..ec6357f 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index 515fc8b..9c197ef 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index b366bf5..10ae912 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 3267a2f..2542ab1 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/pwg-raster-attributes.patch b/debian/patches/pwg-raster-attributes.patch
new file mode 100644
index 000000000..d4ec5d60a
--- /dev/null
+++ b/debian/patches/pwg-raster-attributes.patch
@@ -0,0 +1,111 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:04 +0200
+Subject: For PWG Raster, add required IPP attributes
+
+Add required by IPP Everywhere for PWG Raster when PWG Raster as input format
+is supported
+
+Bug-Upstream: https://www.cups.org/str.php?L4428
+Last-Update: 2015-02-10
+Patch-Name: pwg-raster-attributes.patch
+---
+ scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 76 insertions(+), 1 deletion(-)
+
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 75ef4c0..5425237 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
+   cupsd_location_t *auth;		/* Pointer to authentication element */
+   const char	*auth_supported;	/* Authentication supported */
+   ipp_t		*oldattrs;		/* Old printer attributes */
+-  ipp_attribute_t *attr;		/* Attribute data */
++  ipp_attribute_t *attr, *attr2;	/* Attribute data */
+   char		*name,			/* Current user/group name */
+ 		*filter;		/* Current filter */
++  mime_type_t   *type;
+ 
+ 
+  /*
+@@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
+ 
+   add_printer_formats(p);
+ 
++  /* 
++   * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input
++   * is supported
++   */
++  for (type = (mime_type_t *)cupsArrayFirst(p->filetypes);
++       type;
++       type = (mime_type_t *)cupsArrayNext(p->filetypes))
++  {
++    if (!_cups_strcasecmp(type->super, "image"))
++    {
++      if (!_cups_strcasecmp(type->type, "pwg-raster"))
++      {
++	if (p->ppd_attrs != NULL &&
++	    (attr = ippFindAttribute(p->ppd_attrs,
++				     "printer-resolution-supported",
++				     IPP_TAG_ZERO)) != NULL)
++	{
++	  attr2 = ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
++				    "pwg-raster-document-resolution-supported",
++				    attr->num_values, IPP_RES_PER_INCH,
++				    NULL, NULL);
++	  for (i = 0; i < attr->num_values; i ++)
++	  {
++	    attr2->values[i].resolution.xres =
++	      attr->values[i].resolution.xres;
++	    attr2->values[i].resolution.yres =
++	      attr->values[i].resolution.yres;
++	    attr2->values[i].resolution.units = IPP_RES_PER_INCH;
++	  }
++	}
++	else
++	{
++	  static const int	pwg_raster_document_resolution_supported[] =
++	  {
++	    300,
++	    600,
++	    1200
++	  };
++	  ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
++			    "pwg-raster-document-resolution-supported",
++			    (int)(sizeof(pwg_raster_document_resolution_supported) /
++				  sizeof(pwg_raster_document_resolution_supported[0])),
++			    IPP_RES_PER_INCH,
++			    pwg_raster_document_resolution_supported,
++			    pwg_raster_document_resolution_supported);
++	}
++	ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
++		     "pwg-raster-document-sheet-back", NULL, "normal");
++	static const char * const pwg_raster_document_type_supported[] =
++	{
++	  "adobergb-8",
++	  "adobergb-16",
++	  "black-1",
++	  "black-8",
++	  "black-16",
++	  "cmyk-8",
++	  "cmyk-16",
++	  "rgb-8",
++	  "rgb-16",
++	  "sgray-1",
++	  "sgray-8",
++	  "sgray-16",
++	  "srgb-8",
++	  "srgb-16"
++	};
++	ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
++		      "pwg-raster-document-type-supported",
++		      (int)(sizeof(pwg_raster_document_type_supported) /
++			    sizeof(pwg_raster_document_type_supported[0])), NULL,
++		      pwg_raster_document_type_supported);
++      }
++    }
++  }
++
+  /*
+   * Add name-default attributes...
+   */
diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch
new file mode 100644
index 000000000..382f384a2
--- /dev/null
+++ b/debian/patches/reactivate_recommended_driver.patch
@@ -0,0 +1,41 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Last-Update: 2015-02-10
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/removecvstag.patch b/debian/patches/removecvstag.patch
new file mode 100644
index 000000000..1925abf85
--- /dev/null
+++ b/debian/patches/removecvstag.patch
@@ -0,0 +1,31 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: http://www.cups.org/str.php?L2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Last-Update: 2014-01-16
+
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/rename-systemd-units.patch b/debian/patches/rename-systemd-units.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/rename-systemd-units.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..5ebddb187
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,33 @@
+pwg-raster-attributes.patch
+manpage-hyphen-minus.patch
+0003-Install-root-backends-world-readable.patch
+fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+tests-ignore-warnings.patch
+tests-ignore-usb-crash.patch
+tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+tests-ignore-ipv6-address-family-not-supported.patch
+tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+test-i18n-nonlinux.patch
+tests-wait-on-unfinished-jobs-everytime.patch
+tests-fix-ppdLocalize-on-unclean-env.patch
+tests-use-ipv4-lo-address.patch
+tests-make-lpstat-call-reproducible.patch
+tests-no-pdftourf.patch
+move-cupsd-conf-default-to-share.patch
+airprint-support.patch
+0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+no-conffile-timestamp.patch
+removecvstag.patch
+rename-systemd-units.patch
+do-not-broadcast-with-hostnames.patch
+reactivate_recommended_driver.patch
+logfiles_adm_readable.patch
+default_log_settings.patch
+confdirperms.patch
+show-compile-command-lines.patch
+cupsd-set-default-for-SyncOnClose-to-Yes.patch
+cups-set-default-error-policy-retry-job.patch
+man-cups-lpd-drop-dangling-references.patch
+debianize_cups-config.patch
+0035-Build-mantohtml-with-the-build-architecture-compiler.patch
+manpage-translations.patch
diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/test-i18n-nonlinux.patch b/debian/patches/test-i18n-nonlinux.patch
new file mode 100644
index 000000000..0024719b8
--- /dev/null
+++ b/debian/patches/test-i18n-nonlinux.patch
@@ -0,0 +1,26 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: http://bugs.debian.org/662996
+
+Last-Update: 2015-10-02
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
new file mode 100644
index 000000000..0c5c6e9c3
--- /dev/null
+++ b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
@@ -0,0 +1,32 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Last-Update: 2015-02-10
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
new file mode 100644
index 000000000..2d0271089
--- /dev/null
+++ b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Last-Update: 2015-02-10
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
new file mode 100644
index 000000000..eea2bfe8a
--- /dev/null
+++ b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
@@ -0,0 +1,26 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Last-Update: 2015-02-10
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
new file mode 100644
index 000000000..e6280a925
--- /dev/null
+++ b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
@@ -0,0 +1,26 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Last-Update: 2016-08-09
+
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-usb-crash.patch b/debian/patches/tests-ignore-usb-crash.patch
new file mode 100644
index 000000000..1a0f41289
--- /dev/null
+++ b/debian/patches/tests-ignore-usb-crash.patch
@@ -0,0 +1,33 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Last-Update: 2015-02-10
+
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/tests-ignore-warnings.patch b/debian/patches/tests-ignore-warnings.patch
new file mode 100644
index 000000000..25fb5ee30
--- /dev/null
+++ b/debian/patches/tests-ignore-warnings.patch
@@ -0,0 +1,30 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Last-Update: 2015-08-05
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/tests-make-lpstat-call-reproducible.patch b/debian/patches/tests-make-lpstat-call-reproducible.patch
new file mode 100644
index 000000000..a342c06a0
--- /dev/null
+++ b/debian/patches/tests-make-lpstat-call-reproducible.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Last-Update: 2016-07-11
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 3f0becd..baebdee 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/tests-no-pdftourf.patch b/debian/patches/tests-no-pdftourf.patch
new file mode 100644
index 000000000..f0da622f1
--- /dev/null
+++ b/debian/patches/tests-no-pdftourf.patch
@@ -0,0 +1,67 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index baebdee..001e2f6 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/tests-use-ipv4-lo-address.patch b/debian/patches/tests-use-ipv4-lo-address.patch
new file mode 100644
index 000000000..f6ff7165f
--- /dev/null
+++ b/debian/patches/tests-use-ipv4-lo-address.patch
@@ -0,0 +1,65 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Last-Update: 2016-08-05
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 4929820..3f0becd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
new file mode 100644
index 000000000..f29cb785b
--- /dev/null
+++ b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
@@ -0,0 +1,30 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: http://bugs.debian.org/670878
+Last-Update: 2015-02-10
+
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..4929820 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From d9a9ca181794593a83c6b2976b6d099415bbd09a Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Wed, 4 Sep 2019 18:30:52 +0200
Subject: Update German man page (2100t58f39u)

---
 debian/changelog             |   7 ++
 debian/manpage-po4a/po/de.po | 229 ++++++++++++++++++++-----------------------
 2 files changed, 113 insertions(+), 123 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6dfdcad00..9ffd97798 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.0-1.1) UNRELEASED; urgency=medium
+
+  [ Helge Kreutzmann ]
+  * Update German man page (2100t58f39u)
+
+ -- Helge Kreutzmann <debian@helgefjell.de>  Wed, 04 Sep 2019 18:26:37 +0200
+
 cups (2.3.0-1) unstable; urgency=low
 
   * New 2.3.0 upstream release, to unstable
diff --git a/debian/manpage-po4a/po/de.po b/debian/manpage-po4a/po/de.po
index 79b0d5f62..740e2396a 100644
--- a/debian/manpage-po4a/po/de.po
+++ b/debian/manpage-po4a/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cups man pages 2.2.7-5\n"
 "POT-Creation-Date: 2019-09-02 10:31+0200\n"
-"PO-Revision-Date: 2019-08-18 07:40+0200\n"
+"PO-Revision-Date: 2019-09-04 18:12+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -52,9 +52,9 @@ msgstr "CUPS"
 #: mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10
 #: ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10
 #: printers.conf.5:9 subscriptions.conf.5:10
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "26 April 2019"
-msgstr "16. April 2014"
+msgstr "26. April 2019"
 
 #. type: TH
 #: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
@@ -1193,7 +1193,7 @@ msgstr ""
 #: client.conf.5:55 cupsd.conf.5:437
 #, no-wrap
 msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>] [I<MaxTLS1.0>] [I<MaxTLS1.1>] [I<MaxTLS1.2>] [I<MaxTLS1.3>] [I<MinTLS1.0>] [I<MinTLS1.1>] [I<MinTLS1.2>] [I<MinTLS1.3>]"
-msgstr ""
+msgstr "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>] [I<MaxTLS1.0>] [I<MaxTLS1.1>] [I<MaxTLS1.2>] [I<MaxTLS1.3>] [I<MinTLS1.0>] [I<MinTLS1.1>] [I<MinTLS1.2>] [I<MinTLS1.3>]"
 
 #. type: TP
 #: client.conf.5:57 cupsd.conf.5:439
@@ -1269,45 +1269,45 @@ msgstr "Legt den für Anfragen standardmäßig zu verwendenden Benutzer fest."
 
 #. type: TP
 #: client.conf.5:81
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<UserAgentTokens None>"
-msgstr "B<ServerTokens None>"
+msgstr "B<UserAgentTokens None>"
 
 #. type: TP
 #: client.conf.5:83
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<UserAgentTokens ProductOnly>"
-msgstr "B<ServerTokens ProductOnly>"
+msgstr "B<UserAgentTokens ProductOnly>"
 
 #. type: TP
 #: client.conf.5:85
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<UserAgentTokens Major>"
-msgstr "B<ServerTokens Major>"
+msgstr "B<UserAgentTokens Major>"
 
 #. type: TP
 #: client.conf.5:87
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<UserAgentTokens Minor>"
-msgstr "B<ServerTokens Minor>"
+msgstr "B<UserAgentTokens Minor>"
 
 #. type: TP
 #: client.conf.5:89
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<UserAgentTokens Minimal>"
-msgstr "B<ServerTokens Minimal>"
+msgstr "B<UserAgentTokens Minimal>"
 
 #. type: TP
 #: client.conf.5:91
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<UserAgentTokens OS>"
-msgstr "B<ServerTokens OS>"
+msgstr "B<UserAgentTokens OS>"
 
 #. type: TP
 #: client.conf.5:93
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<UserAgentTokens Full>"
-msgstr "B<ServerTokens Full>"
+msgstr "B<UserAgentTokens Full>"
 
 #. type: Plain text
 #: client.conf.5:104
@@ -2205,9 +2205,9 @@ msgstr ""
 
 #. type: SH
 #: cups-config.1:100 lpadmin.8:186
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "DEPRECATED OPTIONS"
-msgstr "VERALTETE DIREKTIVEN"
+msgstr "VERALTETE OPTIONEN"
 
 #. type: Plain text
 #: cups-config.1:102
@@ -2215,6 +2215,8 @@ msgid ""
 "The following options are deprecated but continue to work for backwards "
 "compatibility:"
 msgstr ""
+"Die folgenden Optionen sind veraltet, funktionieren zur "
+"Rückwärtskompatibilität aber weiterhin:"
 
 #. type: TP
 #: cups-config.1:102
@@ -2643,10 +2645,9 @@ msgstr "cupsd.conf"
 
 #. type: TH
 #: cupsd.conf.5:10
-#, fuzzy, no-wrap
-#| msgid "16 July 2012"
+#, no-wrap
 msgid "16 July 2019"
-msgstr "16. Juli 2012"
+msgstr "16. Juli 2019"
 
 #. type: Plain text
 #: cupsd.conf.5:13
@@ -2748,7 +2749,7 @@ msgstr ""
 #: cupsd.conf.5:49
 #, no-wrap
 msgid "B<BrowseDNSSDSubTypes>I<_subtype[,...]>"
-msgstr ""
+msgstr "B<BrowseDNSSDSubTypes>I<_Untertyp[,…]>"
 
 #. #BrowseLocalProtocols
 #. type: Plain text
@@ -2992,7 +2993,7 @@ msgstr ""
 #: cupsd.conf.5:130
 #, no-wrap
 msgid "B<DNSSDHostName>I<hostname.example.com>"
-msgstr ""
+msgstr "B<DNSSDHostName>I<Rechnername.example.com>"
 
 #. #ErrorPolicy
 #. type: Plain text
@@ -5477,9 +5478,8 @@ msgstr "cupsd-helper"
 
 #. type: Plain text
 #: cupsd-helper.8:13
-#, fuzzy
 msgid "cupsd-helper - cupsd helper programs (deprecated)"
-msgstr "cupsd-helper - cupsd-Helferprogramme"
+msgstr "cupsd-helper - cupsd-Helferprogramme (veraltet)"
 
 #. type: Plain text
 #: cupsd-helper.8:19
@@ -7315,11 +7315,11 @@ msgstr "cupsfilter"
 
 #. type: Plain text
 #: cupsfilter.8:12
-#, fuzzy
 msgid ""
 "cupsfilter - convert a file to another format using cups filters (deprecated)"
 msgstr ""
-"cupsfilter - konvertiere eine Datei in ein anderes Format mittels CUPS-Filter"
+"cupsfilter - konvertiere mittels CUPS-Filter eine Datei in ein anderes "
+"Format (veraltet)"
 
 #. type: Plain text
 #: cupsfilter.8:54
@@ -7609,12 +7609,12 @@ msgstr "cups-lpd"
 
 #. type: Plain text
 #: cups-lpd.8:13
-#, fuzzy
 msgid ""
 "cups-lpd - receive print jobs and report printer status to lpd clients "
 "(deprecated)"
 msgstr ""
-"cups-lpd - empfängt Druckaufträge und meldet den Druckerstatus an lpd-Clients"
+"cups-lpd - empfängt Druckaufträge und meldet den Druckerstatus an lpd-"
+"Clients (veraltet)"
 
 #. type: Plain text
 #: cups-lpd.8:23
@@ -7864,9 +7864,8 @@ msgstr "cups-snmp"
 
 #. type: Plain text
 #: cups-snmp.8:12
-#, fuzzy
 msgid "snmp - cups snmp backend (deprecated)"
-msgstr "snmp - CUPS-SNMP-Backend"
+msgstr "snmp - CUPS-SNMP-Backend (veraltet)"
 
 #. type: Plain text
 #: cups-snmp.8:15
@@ -7991,9 +7990,8 @@ msgstr "snmp.conf"
 
 #. type: Plain text
 #: cups-snmp.conf.5:13
-#, fuzzy
 msgid "snmp.conf - snmp configuration file for cups (deprecated)"
-msgstr "snmp.conf - SNMP-Konfigurationsdatei für CUPS"
+msgstr "snmp.conf - SNMP-Konfigurationsdatei für CUPS (veraltet)"
 
 #. type: Plain text
 #: cups-snmp.conf.5:18
@@ -9253,30 +9251,28 @@ msgstr ""
 #: ippevepcl.7:9
 #, no-wrap
 msgid "ippevepcl/ps"
-msgstr ""
+msgstr "ippevepcl/ps"
 
 #. type: TH
 #: ippevepcl.7:9
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "24 April 2019"
-msgstr "24. April 2018"
+msgstr "24. April 2019"
 
 #. type: Plain text
 #: ippevepcl.7:12
 msgid "ippevepcl/ps - pcl and postscript print commands for ippeveprinter"
-msgstr ""
+msgstr "ippevepcl/ps - PCL- and Postscript-Druckbefehle für Ippeveprinter"
 
 #. type: Plain text
 #: ippevepcl.7:17
-#, fuzzy
 msgid "B<ippevepcl> [ I<filename> ]"
-msgstr "B<PageLog >[ I<Dateiname> ]"
+msgstr "B<ippevepcl> [ I<Dateiname> ]"
 
 #. type: Plain text
 #: ippevepcl.7:22
-#, fuzzy
 msgid "B<ippeveps> [ I<filename> ]"
-msgstr "B<PageLog >[ I<Dateiname> ]"
+msgstr "B<ippeveps> [ I<Dateiname> ]"
 
 #. type: Plain text
 #: ippevepcl.7:31
@@ -9322,27 +9318,25 @@ msgstr ""
 
 #. type: Plain text
 #: ippevepcl.7:47
-#, fuzzy
 msgid "B<ippeveprinter>(8)"
-msgstr "B<-p >[I<Drucker>]"
+msgstr "B<ippeveprinter>(8)"
 
 #. type: Plain text
 #: ippevepcl.7:48
-#, fuzzy
 msgid "Copyright \\[co] 2019 by Apple Inc."
-msgstr "Copyright \\[co] 2007-2019 by Apple Inc."
+msgstr "Copyright \\[co] 2019 by Apple Inc."
 
 #. type: TH
 #: ippeveprinter.1:9
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "ippeveprinter"
-msgstr "/printers"
+msgstr "ippeveprinter"
 
 #. type: TH
 #: ippeveprinter.1:9
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "17 May 2019"
-msgstr "2. Mai 2019"
+msgstr "17. Mai 2019"
 
 #. type: Plain text
 #: ippeveprinter.1:12
@@ -9384,13 +9378,11 @@ msgstr ""
 
 #. type: Plain text
 #: ippeveprinter.1:85
-#, fuzzy
 msgid "The following options are recognized by B<ippeveprinter:>"
-msgstr "Die folgenden Optionen werden von I<ippserver> erkannt:"
+msgstr "Die folgenden Optionen werden von I<ippeveprinter> erkannt:"
 
 #. type: Plain text
 #: ippeveprinter.1:88
-#, fuzzy
 msgid "Show program usage."
 msgstr "Zeigt die Programm-Verwendung."
 
@@ -9398,7 +9390,7 @@ msgstr "Zeigt die Programm-Verwendung."
 #: ippeveprinter.1:88
 #, no-wrap
 msgid "B<--no-web-forms>"
-msgstr ""
+msgstr "B<--no-web-forms>"
 
 #. type: Plain text
 #: ippeveprinter.1:91
@@ -9425,9 +9417,9 @@ msgstr "Meldet die Unterstützung für zweiseitigen (Duplex-)Druck."
 
 #. type: TP
 #: ippeveprinter.1:97
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<-D >I<device-uri>"
-msgstr "B<-v \">I<Geräte-URI>B<\">"
+msgstr "B<-D >I<Geräte-URI>"
 
 #. type: Plain text
 #: ippeveprinter.1:104
@@ -9440,9 +9432,9 @@ msgstr ""
 
 #. type: TP
 #: ippeveprinter.1:104
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<-F >I<output-type/subtype[,...]>"
-msgstr "B<-f >I<Typ/Untertyp[,…]>"
+msgstr "B<-F >I<Ausgabetyp/Untertyp[,…]>"
 
 #. type: Plain text
 #: ippeveprinter.1:108
@@ -9465,9 +9457,9 @@ msgstr "Setzt den Hersteller des Druckers. Die Vorgabe ist »Test«."
 
 #. type: TP
 #: ippeveprinter.1:112
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<-P >I<filename.ppd>"
-msgstr "B<-p >I<Dateiname.ppd>"
+msgstr "B<-P >I<Dateiname.ppd>"
 
 #. type: Plain text
 #: ippeveprinter.1:118
@@ -9479,15 +9471,15 @@ msgstr ""
 
 #. type: TP
 #: ippeveprinter.1:118
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<-V 1.1>"
-msgstr "B<VERSION 1.1>"
+msgstr "B<-V 1.1>"
 
 #. type: TP
 #: ippeveprinter.1:120
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<-V 2.0>"
-msgstr "B<VERSION 2.0>"
+msgstr "B<-V 2.0>"
 
 #. type: Plain text
 #: ippeveprinter.1:124
@@ -9632,9 +9624,9 @@ msgstr ""
 
 #. type: TP
 #: ippeveprinter.1:170
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<-r >I<subtype[,subtype]>"
-msgstr "B<-r >I<Untertyp>"
+msgstr "B<-r >I<Untertyp[,Untertyp]>"
 
 #. type: Plain text
 #: ippeveprinter.1:175
@@ -9753,9 +9745,9 @@ msgstr ""
 
 #. type: SH
 #: ippeveprinter.1:207
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "COMMAND OUTPUT"
-msgstr "BEFEHLE"
+msgstr "BEFEHLSAUSGABE"
 
 #. type: Plain text
 #: ippeveprinter.1:209
@@ -9773,9 +9765,9 @@ msgstr ""
 
 #. type: TP
 #: ippeveprinter.1:213
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<ATTR: >I<attribute=value[ attribute=value]>"
-msgstr "B<ATTR: >I<Attribut=Wert >[ I<… Attribut=Wert>]"
+msgstr "B<ATTR: >I<Attribut=Wert[ Attribut=Wert]>"
 
 #. type: Plain text
 #: ippeveprinter.1:217
@@ -9800,9 +9792,9 @@ msgstr ""
 
 #. type: TP
 #: ippeveprinter.1:220
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<ERROR: >I<Error message>"
-msgstr "B<ERROR:>I< Nachricht>"
+msgstr "B<ERROR: >I<Fehlernachricht>"
 
 #. type: Plain text
 #: ippeveprinter.1:223
@@ -9813,9 +9805,9 @@ msgstr ""
 
 #. type: TP
 #: ippeveprinter.1:223
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<INFO: >I<Informational message>"
-msgstr "B<INFO:>I< Nachricht>"
+msgstr "B<INFO: >I<informative Nachricht>"
 
 #. type: Plain text
 #: ippeveprinter.1:226
@@ -9829,7 +9821,7 @@ msgstr ""
 #: ippeveprinter.1:226
 #, no-wrap
 msgid "B<STATE: >I<keyword[,keyword,...]>"
-msgstr ""
+msgstr "B<STATE: >I<Schlüsselwort[,Schlüsselwort,…]>"
 
 #. type: Plain text
 #: ippeveprinter.1:229
@@ -9842,7 +9834,7 @@ msgstr ""
 #: ippeveprinter.1:229
 #, no-wrap
 msgid "B<STATE: ->I<keyword[,keyword,...]>"
-msgstr ""
+msgstr "B<STATE: ->I<Schlüsselwort[,Schlüsselwort,…]>"
 
 #. type: Plain text
 #: ippeveprinter.1:232
@@ -9855,7 +9847,7 @@ msgstr ""
 #: ippeveprinter.1:232
 #, no-wrap
 msgid "B<STATE: +>I<keyword[,keyword,...]>"
-msgstr ""
+msgstr "B<STATE: +>I<Schlüsselwort[,Schlüsselwort,…]>"
 
 #. type: Plain text
 #: ippeveprinter.1:235
@@ -9872,9 +9864,9 @@ msgstr "B<ippserver> mit dem Dienstnamen »Mein Toller Drucker« ausführen:"
 
 #. type: Plain text
 #: ippeveprinter.1:242
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "    ippeveprinter \"My Cool Printer\"\n"
-msgstr "    ippserver \"Mein Toller Drucker\"\n"
+msgstr "    ippeveprinter \"Mein Toller Drucker\"\n"
 
 #. type: Plain text
 #: ippeveprinter.1:247
@@ -9885,9 +9877,9 @@ msgstr ""
 
 #. type: Plain text
 #: ippeveprinter.1:250
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "    ippeveprinter -c /usr/bin/file \"My Cool Printer\"\n"
-msgstr "    ippserver -c file \"Mein Toller Drucker\"\n"
+msgstr "    ippeveprinter -c /usr/bin/file \"Mein Toller Drucker\"\n"
 
 #. type: Plain text
 #: ippeveprinter.1:255
@@ -9907,7 +9899,7 @@ msgstr "ippfind"
 #: ippfind.1:9
 #, no-wrap
 msgid "ippsample"
-msgstr ""
+msgstr "ippsample"
 
 #. type: Plain text
 #: ippfind.1:12
@@ -10689,9 +10681,8 @@ msgstr "B<ipptool>(1)"
 
 #. type: Plain text
 #: ippfind.1:258
-#, fuzzy
 msgid "Copyright \\[co] 2013-2019 by Apple Inc."
-msgstr "Copyright \\[co] 2013-2018 by Apple Inc."
+msgstr "Copyright \\[co] 2013-2019 by Apple Inc."
 
 #. type: TH
 #: ipptool.1:9
@@ -10754,9 +10745,9 @@ msgstr "Zeigt die Programmhilfe."
 
 #. type: TP
 #: ipptool.1:94
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<--ippserver >I<filename>"
-msgstr "B<-p >I<Dateiname.ppd>"
+msgstr "B<--ippserver >I<Dateiname>"
 
 #. type: Plain text
 #: ipptool.1:99
@@ -11173,10 +11164,9 @@ msgstr "ipptoolfile"
 
 #. type: TH
 #: ipptoolfile.5:9
-#, fuzzy, no-wrap
-#| msgid "5 August 2019"
+#, no-wrap
 msgid "15 August 2019"
-msgstr "5. August 2019"
+msgstr "15. August 2019"
 
 #. type: Plain text
 #: ipptoolfile.5:12
@@ -12152,7 +12142,7 @@ msgstr ""
 
 #. type: TP
 #: ipptoolfile.5:296
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<OF-TYPE >I<tag[|tag,...]>"
 msgstr "B<OF-TYPE >I<Markierung[|Markierung,…]>"
 
@@ -13026,9 +13016,9 @@ msgstr ""
 
 #. type: TP
 #: ipptoolfile.5:596
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<$date-current>"
-msgstr "B<-H restart>"
+msgstr "B<$date-current>"
 
 #. type: Plain text
 #: ipptoolfile.5:599
@@ -13039,9 +13029,9 @@ msgstr ""
 
 #. type: TP
 #: ipptoolfile.5:599
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<$date-start>"
-msgstr "B<-H restart>"
+msgstr "B<$date-start>"
 
 #. type: Plain text
 #: ipptoolfile.5:602
@@ -13565,21 +13555,21 @@ msgstr "Druckt den Druckauftrag im inversen Hochformat (gedreht um 180 Grad)."
 
 #. type: TP
 #: lp.1:180 lpr.1:135
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<-o print-quality=3>"
-msgstr "B<-o printer-op-policy=>I<Name>"
+msgstr "B<-o print-quality=3>"
 
 #. type: TP
 #: lp.1:182 lpr.1:137
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<-o print-quality=4>"
-msgstr "B<-o orientation-requested=4>"
+msgstr "B<-o print-quality=4>"
 
 #. type: TP
 #: lp.1:184 lpr.1:139
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<-o print-quality=5>"
-msgstr "B<-o orientation-requested=5>"
+msgstr "B<-o print-quality=5>"
 
 #. type: Plain text
 #: lp.1:187 lpr.1:142
@@ -13665,9 +13655,9 @@ msgstr ""
 
 #. type: Plain text
 #: lp.1:218
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "    lp -d bar -o number-up=2 filename\n"
-msgstr "    lp -d foo -o number-up=2 Dateiname\n"
+msgstr "    lp -d bar -o number-up=2 Dateiname\n"
 
 #. type: Plain text
 #: lp.1:228
@@ -14152,9 +14142,9 @@ msgstr "Die folgenden Optionen werden erkannt:"
 
 #. type: TP
 #: lpadmin.8:188
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<-i >I<filename>"
-msgstr "B<-f>I<\\ Dateiname>"
+msgstr "B<-i >I<filename>"
 
 #. type: Plain text
 #: lpadmin.8:193
@@ -14260,9 +14250,8 @@ msgstr "lpc"
 
 #. type: Plain text
 #: lpc.8:13
-#, fuzzy
 msgid "lpc - line printer control program (deprecated)"
-msgstr "lpc - Zeilendrucker-Steuerprogramm (line printer control program)"
+msgstr "lpc - Zeilendrucker-Steuerprogramm (veraltet)"
 
 #. type: Plain text
 #: lpc.8:20
@@ -14393,9 +14382,8 @@ msgstr "lpinfo"
 
 #. type: Plain text
 #: lpinfo.8:13
-#, fuzzy
 msgid "lpinfo - show available devices or drivers (deprecated)"
-msgstr "lpinfo - zeige verfügbare Geräte oder Drucker"
+msgstr "lpinfo - zeige verfügbare Geräte oder Drucker (veraltet)"
 
 #. type: Plain text
 #: lpinfo.8:41
@@ -15615,9 +15603,8 @@ msgstr "mime.convs"
 
 #. type: Plain text
 #: mime.convs.5:13
-#, fuzzy
 msgid "mime.convs - mime type conversion file for cups (deprecated)"
-msgstr "mime.convs - MIME-Typ-Konvertierungsdatei für CUPS"
+msgstr "mime.convs - MIME-Typ-Konvertierungsdatei für CUPS (veraltet)"
 
 #. type: Plain text
 #: mime.convs.5:16
@@ -16342,9 +16329,8 @@ msgstr "ppdcfile"
 
 #. type: Plain text
 #: ppdcfile.5:13
-#, fuzzy
 msgid "ppdcfile - cups ppd compiler source file format (deprecated)"
-msgstr "ppdcfile - CUPS-PPD-Compiler-Quelldateiformat"
+msgstr "ppdcfile - CUPS-PPD-Compiler-Quelldateiformat (veraltet)"
 
 #. type: Plain text
 #: ppdcfile.5:17
@@ -17058,15 +17044,14 @@ msgstr ""
 
 #. type: Plain text
 #: printers.conf.5:27
-#, fuzzy
 msgid ""
 "B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), "
 "B<mime.convs>(5), B<mime.types>(5), B<subscriptions.conf>(5), CUPS Online "
 "Help (http://localhost:631/help)"
 msgstr ""
-"B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime."
-"types>(5), B<subscriptions.conf>(5), CUPS Online Help (http://localhost:631/"
-"help)"
+"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), "
+"B<mime.convs>(5), B<mime.types>(5), B<subscriptions.conf>(5), CUPS-Online-"
+"Hilfe (http://localhost:631/help)"
 
 #. type: TH
 #: subscriptions.conf.5:10
@@ -17095,14 +17080,14 @@ msgstr ""
 
 #. type: Plain text
 #: subscriptions.conf.5:30
-#, fuzzy
 msgid ""
 "B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), "
 "B<mime.convs>(5), B<mime.types>(5), B<printers.conf>(5), CUPS Online Help "
 "(http://localhost:631/help)"
 msgstr ""
-"B<classes.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), B<mime.convs>(5), B<mime."
-"types>(5), B<printers.conf>(5), CUPS Online Help (http://localhost:631/help)"
+"B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<cupsd.conf>(5), "
+"B<mime.convs>(5), B<mime.types>(5), B<printers.conf>(5), CUPS-Online-Hilfe "
+"(http://localhost:631/help)"
 
 #~ msgid "4 April 2014"
 #~ msgstr "4. April 2014"
@@ -17116,10 +17101,8 @@ msgstr ""
 #~ msgid "19 October 2017"
 #~ msgstr "19. Oktober 2017"
 
-#, fuzzy
-#~| msgid "classes.conf - class configuration file for cups"
 #~ msgid "client.conf - client configuration file for cups"
-#~ msgstr "classes.conf - Klassenkonfigurationsdatei für CUPS"
+#~ msgstr "classes.conf - Client-konfigurationsdatei für CUPS"
 
 #~ msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
 #~ msgstr "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
-- 
cgit v1.2.3


From 0cae8378481fd58be23ccc1e5f2799f1f95daf98 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 4 Sep 2019 08:33:47 +0200
Subject: Fix autopkgtest by filtering away known stderr messages

---
 debian/tests/utils/test-drivers | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/tests/utils/test-drivers b/debian/tests/utils/test-drivers
index c75800dce..9ee3a50c3 100755
--- a/debian/tests/utils/test-drivers
+++ b/debian/tests/utils/test-drivers
@@ -40,7 +40,20 @@ for driver in $DRIVERS_LIST; do
 
     echo -n " - Create test printer:"
     # Create dummy printer
-    /usr/sbin/lpadmin -p $DUMMY_PRINTER_NAME -E -m $driver -v file:///dev/null
+    # Filter out the deprecation messages
+    # So put &1 into 3, (stdout to 3)
+    #        &2 into 1  (stderr to stdout)
+    #        &3 into 2  (3=stdout to stderr)
+    # Now stdout goes to stderr
+    #     stderr goes to stdout
+    # Both messages from systemv/lpadmin.c
+    ( \
+        /usr/sbin/lpadmin -p $DUMMY_PRINTER_NAME -E -m $driver -v file:///dev/null \
+        3>&1 1>&2 2>&3 | \
+        grep -v "lpadmin: Raw queues are deprecated and will stop working in a future version of CUPS." | \
+        grep -v "lpadmin: Printer drivers are deprecated and will stop working in a future version of CUPS." \
+        # Then swap the outputs back
+    ) 3>&1 1>&2 2>&3
     echo " done."
     
     for file in $(find $PDFS_PATH -name '*.pdf') ; do
-- 
cgit v1.2.3


From af200ef16e0cc844a54ec71b81c69e05dd05d2b7 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 5 Sep 2019 09:33:20 +0200
Subject: cups 2.3.0-2 Debian release

---
 debian/changelog | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ffd97798..fb2254d84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-cups (2.3.0-1.1) UNRELEASED; urgency=medium
+cups (2.3.0-2) unstable; urgency=low
 
   [ Helge Kreutzmann ]
   * Update German man page (2100t58f39u)
 
- -- Helge Kreutzmann <debian@helgefjell.de>  Wed, 04 Sep 2019 18:26:37 +0200
+  [ Didier Raboud ]
+  * Fix autopkgtest by filtering away known stderr messages
+
+ -- Didier Raboud <odyx@debian.org>  Thu, 05 Sep 2019 09:33:20 +0200
 
 cups (2.3.0-1) unstable; urgency=low
 
-- 
cgit v1.2.3


From 2d45d292a8f28f135340d776560b21314079e86f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 5 Sep 2019 16:08:14 +0200
Subject: Fix test-drivers output swapping comment in the wrong place

---
 debian/tests/utils/test-drivers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/utils/test-drivers b/debian/tests/utils/test-drivers
index 9ee3a50c3..0731c73d7 100755
--- a/debian/tests/utils/test-drivers
+++ b/debian/tests/utils/test-drivers
@@ -52,8 +52,8 @@ for driver in $DRIVERS_LIST; do
         3>&1 1>&2 2>&3 | \
         grep -v "lpadmin: Raw queues are deprecated and will stop working in a future version of CUPS." | \
         grep -v "lpadmin: Printer drivers are deprecated and will stop working in a future version of CUPS." \
-        # Then swap the outputs back
     ) 3>&1 1>&2 2>&3
+    # ^ Then swap the outputs back
     echo " done."
     
     for file in $(find $PDFS_PATH -name '*.pdf') ; do
-- 
cgit v1.2.3


From 5a20a515f17e2c801ba5cea5c23304bd84172c99 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 5 Sep 2019 17:44:17 +0200
Subject: Refactor lpadmin stderr filtering

---
 debian/tests/utils/test-drivers | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/debian/tests/utils/test-drivers b/debian/tests/utils/test-drivers
index 0731c73d7..e8ee26d51 100755
--- a/debian/tests/utils/test-drivers
+++ b/debian/tests/utils/test-drivers
@@ -27,34 +27,31 @@ fi
 
 cleanup() {
     # Delete it
-    echo -n "Interrupted, delete test printer:"
-    /usr/sbin/lpadmin -x $DUMMY_PRINTER_NAME 2>/dev/null || :
+    echo -n " - Interrupted (or finished), delete test printer:"
+    rm -f ${DUMMY_PRINTER_STDERR_FILE}
+    /usr/sbin/lpadmin -x $DUMMY_PRINTER_NAME 2>/dev/null
     echo " done."
 }
 
 trap cleanup EXIT INT
 
+DUMMY_PRINTER_STDERR_FILE=`mktemp`
+
 for driver in $DRIVERS_LIST; do
 
     echo "* Driver $driver"
 
     echo -n " - Create test printer:"
     # Create dummy printer
+    /usr/sbin/lpadmin -p $DUMMY_PRINTER_NAME -E -m $driver -v file:///dev/null 2> $DUMMY_PRINTER_STDERR_FILE
+    echo " done."
+    # Tell stderr whether some unknown lines have been seen
     # Filter out the deprecation messages
-    # So put &1 into 3, (stdout to 3)
-    #        &2 into 1  (stderr to stdout)
-    #        &3 into 2  (3=stdout to stderr)
-    # Now stdout goes to stderr
-    #     stderr goes to stdout
     # Both messages from systemv/lpadmin.c
-    ( \
-        /usr/sbin/lpadmin -p $DUMMY_PRINTER_NAME -E -m $driver -v file:///dev/null \
-        3>&1 1>&2 2>&3 | \
-        grep -v "lpadmin: Raw queues are deprecated and will stop working in a future version of CUPS." | \
-        grep -v "lpadmin: Printer drivers are deprecated and will stop working in a future version of CUPS." \
-    ) 3>&1 1>&2 2>&3
-    # ^ Then swap the outputs back
-    echo " done."
+    cat "${DUMMY_PRINTER_STDERR_FILE}" | \
+        grep -v -E "lpadmin: (Raw queues|Printer drivers) are deprecated and will stop working in a future version of CUPS." \
+        || true \
+        1>&2
     
     for file in $(find $PDFS_PATH -name '*.pdf') ; do
         echo -n " - Print test job with $file: "
-- 
cgit v1.2.3


From bc714a35493e3d4cf887ace834483f48d0666cb9 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 6 Sep 2019 09:32:07 +0200
Subject: cups 2.3.0-3 Debian release

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fb2254d84..581c11b7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cups (2.3.0-3) unstable; urgency=low
+
+  * Fix autopkgtests for real; refactor lpadmin stderr filtering
+
+ -- Didier Raboud <odyx@debian.org>  Fri, 06 Sep 2019 09:32:07 +0200
+
 cups (2.3.0-2) unstable; urgency=low
 
   [ Helge Kreutzmann ]
-- 
cgit v1.2.3


From 316974c4795afc090f8067644b8381452af6284a Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Thu, 12 Sep 2019 22:23:31 +0200
Subject: Update German man page (2178t2f17u)

---
 debian/changelog             |   7 +
 debian/manpage-po4a/po/de.po | 404 ++++++++++++++++++++-----------------------
 2 files changed, 198 insertions(+), 213 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 581c11b7d..4bf2a9000 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.0-3.1) UNRELEASED; urgency=medium
+
+  [ Helge Kreutzmann ]
+  * Update German man page (2178t2f17u)
+
+ -- Helge Kreutzmann <debian@helgefjell.de>  Thu, 12 Sep 2019 22:22:14 +0200
+
 cups (2.3.0-3) unstable; urgency=low
 
   * Fix autopkgtests for real; refactor lpadmin stderr filtering
diff --git a/debian/manpage-po4a/po/de.po b/debian/manpage-po4a/po/de.po
index 740e2396a..537a2654d 100644
--- a/debian/manpage-po4a/po/de.po
+++ b/debian/manpage-po4a/po/de.po
@@ -7,12 +7,13 @@
 #  banner == banner page -> Deckblatt
 #
 # FIXME: Schlüssel als Subjekt, d.h. B<> legt die zu verwendende?
+# FIXME: Whitespace → Leerraum
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: cups man pages 2.2.7-5\n"
 "POT-Creation-Date: 2019-09-02 10:31+0200\n"
-"PO-Revision-Date: 2019-09-04 18:12+0200\n"
+"PO-Revision-Date: 2019-09-12 22:21+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -219,7 +220,6 @@ msgstr ""
 
 #. type: Plain text
 #: backend.7:64
-#, fuzzy
 msgid ""
 "The command name (I<argv[0]>) is set to the device URI of the destination "
 "printer.  Authentication information in I<argv[0]> is removed, so backend "
@@ -265,7 +265,6 @@ msgstr "GERÄTE-ERMITTLUNG"
 
 #. type: Plain text
 #: backend.7:77
-#, fuzzy
 msgid ""
 "When run with no arguments, the backend should list the devices and schemes "
 "it supports or is advertising to the standard output.  The output consists "
@@ -354,7 +353,6 @@ msgstr "B<serial>"
 
 #. type: Plain text
 #: backend.7:106
-#, fuzzy
 msgid ""
 "The device-uri refers to a serial device with configurable baud rate and "
 "other options.  If the device-uri contains a baud value, it represents the "
@@ -367,7 +365,6 @@ msgstr ""
 
 #. type: Plain text
 #: backend.7:114
-#, fuzzy
 msgid ""
 "The I<scheme> field provides the URI scheme that is supported by the "
 "backend.  Backends should use this form only when the backend supports any "
@@ -375,13 +372,12 @@ msgid ""
 "use when communicating with the device."
 msgstr ""
 "Das Feld I<scheme> stellt das vom Backend unterstützte URI-Schema bereit. "
-"Backends sollten diese Form nur verwenden, wenn das Backend jede dem Schema "
+"Backends sollten diese Form nur verwenden, wenn das Backend irgendeine dem Schema "
 "folgende URI unterstützt. Das Feld I<device-uri> legt die komplette URI, die "
 "bei der Kommunikation mit dem Gerät verwandt werden soll, fest."
 
 #. type: Plain text
 #: backend.7:119
-#, fuzzy
 msgid ""
 "The I<device-make-and-model> field specifies the make and model of the "
 "device, e.g. \"Example Foojet 2000\".  If the make and model is not known, "
@@ -393,7 +389,6 @@ msgstr ""
 
 #. type: Plain text
 #: backend.7:124
-#, fuzzy
 msgid ""
 "The I<device-info> field specifies additional information about the device.  "
 "Typically this includes the make and model along with the port number or "
@@ -431,7 +426,6 @@ msgstr "RECHTE"
 
 #. type: Plain text
 #: backend.7:135
-#, fuzzy
 msgid ""
 "Backends without world read and execute permissions are run as the root "
 "user.  Otherwise, the backend is run using an unprivileged user account, "
@@ -464,7 +458,7 @@ msgstr "B<CUPS_BACKEND_OK>"
 msgid ""
 "The print file was successfully transmitted to the device or remote server."
 msgstr ""
-"Die Druckdatei wurde erfolgreich an das Gerät oder den entfernten Server "
+"Die Druckdatei wurde erfolgreich an das Gerät oder den fernen Server "
 "übertragen."
 
 #. type: TP
@@ -475,14 +469,13 @@ msgstr "B<CUPS_BACKEND_FAILED>"
 
 #. type: Plain text
 #: backend.7:147
-#, fuzzy
 msgid ""
 "The print file was not successfully transmitted to the device or remote "
 "server.  The scheduler will respond to this by canceling the job, retrying "
 "the job, or stopping the queue depending on the state of the I<printer-error-"
 "policy> attribute."
 msgstr ""
-"Die Druckdatei wurde nicht erfolgreich zum Gerät oder entfernten Server "
+"Die Druckdatei wurde nicht erfolgreich zum Gerät oder fernen Server "
 "übertragen. Der Auftragsplaner (Scheduler) wird daraufhin den Auftrag "
 "abbrechen, den Auftrag erneut versuchen oder die Warteschlange anhalten, "
 "abhängig vom Zustand des Attributs I<printer-error-policy>."
@@ -495,7 +488,6 @@ msgstr "B<CUPS_BACKEND_AUTH_REQUIRED>"
 
 #. type: Plain text
 #: backend.7:151
-#, fuzzy
 msgid ""
 "The print file was not successfully transmitted because valid authentication "
 "information is required.  The scheduler will respond to this by holding the "
@@ -516,7 +508,6 @@ msgstr "B<CUPS_BACKEND_HOLD>"
 
 #. type: Plain text
 #: backend.7:155
-#, fuzzy
 msgid ""
 "The print file was not successfully transmitted because it cannot be printed "
 "at this time.  The scheduler will respond to this by holding the job."
@@ -533,7 +524,6 @@ msgstr "B<CUPS_BACKEND_STOP>"
 
 #. type: Plain text
 #: backend.7:159
-#, fuzzy
 msgid ""
 "The print file was not successfully transmitted because it cannot be printed "
 "at this time.  The scheduler will respond to this by stopping the queue."
@@ -550,7 +540,6 @@ msgstr "B<CUPS_BACKEND_CANCEL>"
 
 #. type: Plain text
 #: backend.7:163
-#, fuzzy
 msgid ""
 "The print file was not successfully transmitted because one or more "
 "attributes are not supported or the job was canceled at the printer.  The "
@@ -568,7 +557,6 @@ msgstr "B<CUPS_BACKEND_RETRY>"
 
 #. type: Plain text
 #: backend.7:167
-#, fuzzy
 msgid ""
 "The print file was not successfully transmitted because of a temporary "
 "issue.  The scheduler will retry the job at a future time - other jobs may "
@@ -587,7 +575,6 @@ msgstr "B<CUPS_BACKEND_RETRY_CURRENT>"
 
 #. type: Plain text
 #: backend.7:171
-#, fuzzy
 msgid ""
 "The print file was not successfully transmitted because of a temporary "
 "issue.  The scheduler will retry the job immediately without allowing "
@@ -656,7 +643,6 @@ msgstr "HINWEISE"
 
 #. type: Plain text
 #: backend.7:192
-#, fuzzy
 msgid ""
 "CUPS backends are not generally designed to be run directly by the user.  "
 "Aside from the device URI issue ( I<argv[0]> and B<DEVICE_URI> environment "
@@ -679,7 +665,6 @@ msgstr ""
 
 #. type: Plain text
 #: backend.7:204
-#, fuzzy
 msgid ""
 "Unless you are a developer and know what you are doing, please do not run "
 "backends directly.  Instead, use the B<lp>(1)  or B<lpr>(1)  programs to "
@@ -701,6 +686,10 @@ msgid ""
 "supported in a future feature release of CUPS.  Printers that do not support "
 "IPP can be supported using applications such as B<ippeveprinter>(1)."
 msgstr ""
+"CUPS-Druckertreiber und -Backends sind veraltet und werden in einer "
+"zukünftigen Funktionsveröffentlichung von CUPS nicht mehr unterstützt. "
+"Drucker, die IPP nicht unterstützen, können mittels Anwendungen wie "
+"B<ippeveprinter>(1) unterstützt werden."
 
 #. type: SH
 #: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:122 cups.1:126
@@ -978,7 +967,6 @@ msgstr "classes.conf - Klassenkonfigurationsdatei für CUPS"
 
 #. type: Plain text
 #: classes.conf.5:19
-#, fuzzy
 msgid ""
 "The B<classes.conf> file defines the local printer classes that are "
 "available.  It is normally located in the I</etc/cups> directory and is "
@@ -987,7 +975,7 @@ msgid ""
 msgstr ""
 "Die Datei B<classes.conf> definiert lokal verfügbare Druckerklassen. Sie "
 "befindet sich normalerweise im Verzeichnis I</etc/cups> und wird vom "
-"Programm I<cupsd(8)> verwaltet. Diese Datei ist nicht dazu gedacht, per Hand "
+"Programm I<cupsd>(8) verwaltet. Diese Datei ist nicht dazu gedacht, per Hand "
 "bearbeitet oder verwaltet zu werden."
 
 #. type: Plain text
@@ -1019,9 +1007,8 @@ msgstr "client.conf"
 
 #. type: Plain text
 #: client.conf.5:13
-#, fuzzy
 msgid "client.conf - client configuration file for cups (deprecated on macos)"
-msgstr "client.conf - Client-Konfigurationsdatei für CUPS"
+msgstr "client.conf - Client-Konfigurationsdatei für CUPS (auf MacOS veraltet)"
 
 #. type: Plain text
 #: client.conf.5:16
@@ -1204,7 +1191,6 @@ msgstr "B<SSLOptions None>"
 #. #SSLPort
 #. type: Plain text
 #: client.conf.5:71 cupsd.conf.5:454
-#, fuzzy
 msgid ""
 "Sets encryption options (only in /etc/cups/client.conf).  By default, CUPS "
 "only supports encryption using TLS v1.0 or higher using known secure cipher "
@@ -1227,12 +1213,14 @@ msgstr ""
 "die Sicherheit verbessert. Die Option I<AllowDH> aktiviert Algorithmen, die "
 "den einfachen Diffie-Hellman-Schlüsselaustausch verwenden (für Systeme, die "
 "GNU TLS verwenden, wird dies nicht unterstützt). Die Option I<AllowRC4> "
-"aktiviert die 128-bit-RC4-Algorithmen, die für einige älteren Clients "
+"aktiviert die 128-Bit-RC4-Algorithmen, die für einige ältere Clients "
 "benötigt werden. Die Option I<AllowSSL3> aktiviert SSL v3.0, das für einige "
 "ältere Clients benötigt wird, die TLS v1.0 nicht unterstützen. Die Option "
 "I<DenyCBC> deaktiviert alle CBC-Algorithmen. Die Option I<DenyTLS1.0> "
 "deaktiviert die TLS-v1.0-Unterstützung - damit wird die minimale "
-"Protokollversion auf TLS v1.1 gesetzt."
+"Protokollversion auf TLS v1.1 gesetzt. Die Option I<MinTLS> setzt die "
+"minimal zu unterstützende TLS-Version. Derzeit unterstützen nicht alle "
+"Betriebssysteme TLS 1.3."
 
 #. type: TP
 #: client.conf.5:71
@@ -1311,7 +1299,6 @@ msgstr "B<UserAgentTokens Full>"
 
 #. type: Plain text
 #: client.conf.5:104
-#, fuzzy
 msgid ""
 "Specifies what information is included in the User-Agent header of HTTP "
 "requests.  \"None\" disables the User-Agent header.  \"ProductOnly\" reports "
@@ -1321,11 +1308,13 @@ msgid ""
 "IPP/2.1\".  \"Full\" reports \"CUPS/major.minor.path (osname osversion; "
 "architecture) IPP/2.1\".  The default is \"Minimal\"."
 msgstr ""
-"Legt fest, welche Informationen in die Server-Kopfzeilen von HTTP-Antworten "
-"aufgenommen werden. »None« deaktiviert die Server-Kopfzeilen. »ProductOnly« "
-"meldet »CUPS«. »Major« berichtet »CUPS 2.0«. »Minimal« berichtet »CUPS "
-"2.0.0«. »OS« berichtet »CUPS 2.0.0 (UNAME)«, wobei UNAME die Ausgabe des "
-"Befehls B<uname>(1) ist. »Full« berichtet »CUPS 2.0.0 (UNAME) IPP/2.0«. Die "
+"Legt fest, welche Informationen in die Kopfzeilen »User-Agent« von HTTP-Anfragen "
+"aufgenommen werden. »None« deaktiviert die »User-Agent«-Kopfzeilen. »ProductOnly« "
+"meldet »CUPS«. »Major« berichtet »CUPS/major IPP/2«. »Minor« berichtet »CUPS/"
+"major.minor IPP/2.1«. »Minimal« berichtet »CUPS/major.minor.patch "
+"IPP/2.1«. »OS« berichtet »CUPS/major.minor.path (osname osversion) IPP/2.1«. "
+"»Full« berichtet »CUPS/major.minor.path (osname osversion; "
+"architecture) IPP/2.1«. Die "
 "Vorgabe ist »Minimal«."
 
 #. type: TP
@@ -1828,6 +1817,10 @@ msgid ""
 "not support IPP can be supported using applications such as "
 "B<ippeveprinter>(1)."
 msgstr ""
+"CUPS-Druckertreiber, -Backends und -PPD-Dateien sind veraltet und werden in "
+"einer zukünftigen Funktionalitätsveröffentlichung von CUPS nicht mehr "
+"unterstützt werden. Drucker, die IPP nicht unterstützen, können mit "
+"Anwendungen wie B<ippeveprinter>(1) unterstützt werden."
 
 #. type: Plain text
 #: cups.1:142
@@ -2226,11 +2219,10 @@ msgstr "B<--image>"
 
 #. type: Plain text
 #: cups-config.1:105
-#, fuzzy
 msgid "Formerly used to add the CUPS imaging library to the list of libraries."
 msgstr ""
-"Wird dies mit I<--libs> verwandt, wird die CUPS Imaging-Bibliothek zu der "
-"Liste der Bibliotheken hinzugefügt."
+"Früher zum Hinzufügen der CUPS-Imaging-Bibliothek zu der Liste der "
+"Bibliotheken verwandt."
 
 #. type: Plain text
 #: cups-config.1:108
@@ -2656,7 +2648,6 @@ msgstr "cupsd.conf - Server-Konfigurationsdatei für CUPS"
 
 #. type: Plain text
 #: cupsd.conf.5:25
-#, fuzzy
 msgid ""
 "The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
 "normally located in the I</etc/cups> directory.  Each line in the file can "
@@ -2665,6 +2656,8 @@ msgid ""
 "whitespace.  The configuration directive name and values are case-"
 "insensitive.  Comment lines start with the # character."
 msgstr ""
+"Die Datei I<cupsd.conf> konfiguriert den CUPS-Auftragsplaner B<cupsd>(8). "
+"Sie befindet sich normalerweise im Verzeichnis I</etc/cups>. "
 "Jede Zeile in der Datei kann eine Konfigurationsdirektive, eine leere Zeile "
 "oder ein Kommentar sein. Konfigurationsdirektiven bestehen typischerweise "
 "aus einem Namen und keinem oder mehren, durch Leerzeichen getrennten Werten. "
@@ -2761,6 +2754,12 @@ msgid ""
 "\"_cups\" which is necessary for printer sharing to work between systems "
 "using CUPS."
 msgstr ""
+"Legt eine Liste von Bonjour-Untertypen fest, die für jeden gemeinsam "
+"benutzten Drucker bekanntgemacht werden soll. Beispielsweise informiert "
+"»BrowseDNSSDSubTypes _cups,_print« die Netzwerk-Clients, dass sowohl das "
+"gemeinsame Benutzen mit CUPS als auch »IPP Everywhere« unterstützt werden. "
+"Die Vorgabe ist »_cups«, was für das gemeinsame Benutzen von Druckern unter "
+"Systemen notwendig ist."
 
 #. type: TP
 #: cupsd.conf.5:55
@@ -2998,13 +2997,13 @@ msgstr "B<DNSSDHostName>I<Rechnername.example.com>"
 #. #ErrorPolicy
 #. type: Plain text
 #: cupsd.conf.5:135
-#, fuzzy
 msgid ""
 "Specifies the fully-qualified domain name for the server that is used for "
 "Bonjour sharing.  The default is typically the server's \".local\" hostname."
 msgstr ""
-"Legt den vollqualifizierten Rechnernamen des Servers fest. Die Vorgabe ist "
-"der Wert, der von dem Befehl B<hostname>(1) berichtet wird."
+"Legt den vollqualifizierten Rechnernamen des Servers fest, der für die "
+"gemeinsame Benutzung mit Bonjour verwandt wird. Die Vorgabe ist "
+"typischerweise der ».local«-Rechnername des Servers."
 
 #. type: TP
 #: cupsd.conf.5:135
@@ -3917,7 +3916,6 @@ msgstr "B<ServerTokens Full>"
 #. #SSLListen
 #. type: Plain text
 #: cupsd.conf.5:428
-#, fuzzy
 msgid ""
 "Specifies what information is included in the Server header of HTTP "
 "responses.  \"None\" disables the Server header.  \"ProductOnly\" reports "
@@ -3929,9 +3927,12 @@ msgid ""
 msgstr ""
 "Legt fest, welche Informationen in die Server-Kopfzeilen von HTTP-Antworten "
 "aufgenommen werden. »None« deaktiviert die Server-Kopfzeilen. »ProductOnly« "
-"meldet »CUPS«. »Major« berichtet »CUPS 2.0«. »Minimal« berichtet »CUPS "
-"2.0.0«. »OS« berichtet »CUPS 2.0.0 (UNAME)«, wobei UNAME die Ausgabe des "
-"Befehls B<uname>(1) ist. »Full« berichtet »CUPS 2.0.0 (UNAME) IPP/2.0«. Die "
+"meldet »CUPS«. »Major« berichtet »CUPS/major IPP/2«. »Minor« berichtet »CUPS/"
+"major.minor IPP/2.1«. »Minimal« berichtet »CUPS/"
+"CUPS/major.minor.patch "
+"IPP/2.1«. »OS« berichtet »CUPS/major.minor.path (osname osversion) "
+"IPP/2.1«. »Full« berichtet »CUPS/major.minor.path (osname osversion; "
+"architecture) IPP/2.1«. Die "
 "Vorgabe ist »Minimal«."
 
 #. type: TP
@@ -4848,6 +4849,13 @@ msgid ""
 "but DSL and VPN interfaces are not.  The Order directive controls whether "
 "Allow lines are evaluated before or after Deny lines."
 msgstr ""
+"Erlaubt Zugriff von benannten Rechnern, Domains, Adressen oder "
+"Schnittstellen. Die Form @IF(name) verwendet die für die benannte "
+"Schnittstelle derzeit konfigurierten Unternetze. Die Form @LOCAL verwendet "
+"für alle Schnittstellen, die nicht Punkt-zu-Punkt sind, die derzeit "
+"konfigurierten Unternetze, beispielsweise werden die Schnittstellen Ethernet "
+"und Wi-Fi verwandt, aber DSL und VPN nicht. Die »Order«-Direktive steuert, "
+"ob »Allow«-Zeilen vor oder nach »Deny«-Zeilen ausgewertet werden."
 
 #. type: TP
 #: cupsd.conf.5:696
@@ -4958,6 +4966,13 @@ msgid ""
 "but DSL and VPN interfaces are not.  The Order directive controls whether "
 "Deny lines are evaluated before or after Allow lines."
 msgstr ""
+"Verbietet Zugriff von benannten Rechnern, Domains, Adressen oder "
+"Schnittstellen. Die Form @IF(name) verwendet die für die benannte "
+"Schnittstelle derzeit konfigurierten Unternetze. Die Form @LOCAL verwendet "
+"für alle Schnittstellen, die nicht Punkt-zu-Punkt sind, die derzeit "
+"konfigurierten Unternetze, beispielsweise werden die Schnittstellen Ethernet "
+"und Wi-Fi verwandt, aber DSL und VPN nicht. Die »Order«-Direktive steuert, "
+"ob »Allow«-Zeilen vor oder nach »Deny«-Zeilen ausgewertet werden."
 
 #. type: Plain text
 #: cupsd.conf.5:740
@@ -5346,7 +5361,6 @@ msgstr ""
 #. #RIPCache
 #. type: Plain text
 #: cupsd.conf.5:854
-#, fuzzy
 msgid ""
 "The default is the empty string, which disables page logging.  The string "
 "\"%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} "
@@ -5358,7 +5372,9 @@ msgstr ""
 "Die Vorgabe ist die leere Zeichenkette, womit das Protokollieren der Seiten "
 "deaktiviert wird. Die Zeichenkette »%p %u %j %T %P %C %{job-billing} %{job-"
 "originating-host-name} %{job-name} %{media} %{sides}« erstellt ein "
-"Seitenprotokoll mit den Standardeinträgen."
+"Seitenprotokoll mit den Standardeinträgen. Verwenden Sie »%{job-impressions-"
+"completed}«, um die Anzahl der gedruckten Seiten (Blattseiten) oder »%{job-"
+"media-sheets-completed}«, um die Anzahl der gedruckten Blätter einzufügen."
 
 #. type: TP
 #: cupsd.conf.5:854
@@ -5377,15 +5393,12 @@ msgstr ""
 
 #. type: Plain text
 #: cupsd.conf.5:862
-#, fuzzy
 msgid ""
 "File, directory, and user configuration directives that used to be allowed "
 "in the B<cupsd.conf> file are now stored in the B<cups-files.conf>(5)  file "
 "instead in order to prevent certain types of privilege escalation attacks."
 msgstr ""
-"Die Datei I<cupsd.conf> konfiguriert den CUPS-Auftragsplaner (Scheduler), "
-"B<cupsd>(8). Sie befindet sich normalerweise in dem Verzeichnis I</etc/"
-"cups>. B<Hinweis:> Datei-, Verzeichnis- und "
+"Datei-, Verzeichnis- und "
 "Benutzerkonfigurationsdirektiven, die früher in der Datei B<cupsd.conf> "
 "erlaubt wurden, werden jetzt stattdessen in der Datei B<cups-files.conf>(5) "
 "gespeichert, um bestimmte Arten von Angriffen zur Rechteerweiterung zu "
@@ -5398,6 +5411,10 @@ msgid ""
 "conf> file.  On Linux this is typically done using the B<systemctl>(8)  "
 "command, while on macOS the B<launchctl>(8)  command is used instead."
 msgstr ""
+"Nachdem Änderungen an der Datei B<cupsd.conf> vorgenommen wurden, MUSS der "
+"Auftragsplaner manuell neu gestartet werden. Unter Linux erfolgt dies "
+"typischerweise mit dem Befehl B<systemctl>(8), während unter MacOS der "
+"Befehl B<launchctl>(8) verwandt wird."
 
 #. type: Plain text
 #: cupsd.conf.5:873
@@ -5405,6 +5422,9 @@ msgid ""
 "The @LOCAL macro name can be confusing since the system running B<cupsd> "
 "often belongs to a different set of subnets from its clients."
 msgstr ""
+"Der Makro-Name @LOCAL kann verwirrend sein, da ein System, das B<cupsd> "
+"ausführt, oft zu einer anderen Gruppe von Unternetzen gehört als seine "
+"Clients."
 
 #. type: Plain text
 #: cupsd.conf.5:875
@@ -7295,6 +7315,10 @@ msgid ""
 "B<systemctl>(8)  command, while on macOS the B<launchctl>(8)  command is "
 "used instead."
 msgstr ""
+"Nachdem Änderungen an der Datei B<cups-files.conf> vorgenommen wurden, MUSS "
+"der Auftragsplaner manuell neu gestartet werden. Unter Linux erfolgt dies "
+"typischerweise mit dem Befehl B<systemctl>(8), während unter MacOS der "
+"Befehl B<launchctl>(8) verwandt wird."
 
 #. type: Plain text
 #: cups-files.conf.5:290
@@ -7558,6 +7582,10 @@ msgid ""
 "not support IPP can be supported using applications such as "
 "B<ippeveprinter>(1)."
 msgstr ""
+"CUPS-Druckertreiber, -filter und -Backends sind veraltet und werden in einer "
+"zukünftigen Funktionsveröffentlichung von CUPS nicht weiter unterstützt. "
+"Drucker, die IPP nicht unterstützen, können mit Anwendungen wie "
+"B<ippeveprinter>(1) unterstützt werden."
 
 #. type: Plain text
 #: cupsfilter.8:125
@@ -7733,13 +7761,12 @@ msgstr ""
 
 #. type: Plain text
 #: cups-lpd.8:64
-#, fuzzy
 msgid ""
 "The B<cups-lpd> program is deprecated and will no longer be supported in a "
 "future feature release of CUPS."
 msgstr ""
-"I<Dieses Programm ist veraltet und wird in einer zukünftigen "
-"Veröffentlichung von CUPS entfernt werden.>"
+"Das Programm Programm B<cups-lpd> ist veraltet und wird in einer zukünftigen "
+"Veröffentlichung von CUPS nicht mehr unterstützt werden."
 
 #. type: SS
 #: cups-lpd.8:64
@@ -7884,7 +7911,6 @@ msgstr "B<lpinfo> B<-v> B<--include-schemes> snmp"
 
 #. type: Plain text
 #: cups-snmp.8:27
-#, fuzzy
 msgid ""
 "The B<DEPRECATED> CUPS SNMP backend provides legacy discovery and "
 "identification of network printers using SNMPv1.  When used for discovery "
@@ -7894,7 +7920,7 @@ msgid ""
 "correct device URI, make and model, and other information needed for "
 "printing."
 msgstr ""
-"Das CUPS-SNMP-Backend stellt eine alte Erkennungs- und "
+"Das B<VERALTETE> CUPS-SNMP-Backend stellt eine alte Erkennungs- und "
 "Identifikationsmethode für Netzdrucker mittels SNMPv1 bereit. Wenn dies zur "
 "Erkennung durch den Auftragsplaner genutzt wird, wird das Backend alle "
 "Drucker, die sich auf eine verteilte SNMPv1-Abfrage mit dem "
@@ -7953,13 +7979,12 @@ msgstr ""
 
 #. type: Plain text
 #: cups-snmp.8:47
-#, fuzzy
 msgid ""
 "The CUPS SNMP backend is deprecated and will no longer be supported in a "
 "future version of CUPS."
 msgstr ""
-"I<Dieses Programm ist veraltet und wird in einer zukünftigen "
-"Veröffentlichung von CUPS entfernt werden.>"
+"Das CUPS-SNMP-Backend ist veraltet und wird in einer zukünftigen "
+"Veröffentlichung von CUPS nicht mehr unterstützt werden."
 
 #. type: Plain text
 #: cups-snmp.8:49
@@ -8059,14 +8084,14 @@ msgstr "B<Community >I<Name>"
 
 #. type: Plain text
 #: cups-snmp.conf.5:37
-#, fuzzy
 msgid ""
 "Specifies the community name to use.  Only a single community name may be "
 "specified.  The default community name is \"public\".  If no name is "
 "specified, all SNMP functions are disabled."
 msgstr ""
 "Legt den zu verwendenden Gemeinschaftsnamen fest. Es darf nur ein einziger "
-"Gemeinschaftsname angegeben werden. Die Vorgabegemeinschaft ist »public«."
+"Gemeinschaftsname angegeben werden. Die Vorgabegemeinschaft ist »public«. "
+"Falls kein Name festgelegt ist, werden sämtliche SNMP-Funktionen deaktiviert."
 
 #. type: TP
 #: cups-snmp.conf.5:37
@@ -8149,6 +8174,10 @@ msgid ""
 "feature release of CUPS.  Printers that do not support IPP can be supported "
 "using applications such as B<ippeveprinter>(1)."
 msgstr ""
+"CUPS-Backends sind veraltet und werden in einer zukünftigen "
+"Funktionsveröffentlichung von CUPS nicht mehr unterstützt. Drucker, die IPP "
+"nicht unterstützen, können mittels Anwendungen wie B<ippeveprinter>(1) "
+"unterstützt werden."
 
 #. type: Plain text
 #: cups-snmp.conf.5:65
@@ -8517,6 +8546,10 @@ msgid ""
 "release of CUPS.  Printers that do not support IPP can be supported using "
 "applications such as B<ippeveprinter>(1)."
 msgstr ""
+"PPD-Dateien sind veraltet und werden in einer zukuünftigen "
+"Funktionsveröffentlichung von CUPS nicht mehr unterstützt. Drucker, die IPP "
+"nicht unterstützen, können mittels Anwendungen wie B<ippeveprinter>(1) "
+"unterstützt werden."
 
 #. type: Plain text
 #: cupstestppd.1:146
@@ -9283,6 +9316,11 @@ msgid ""
 "standard output.  Status and progress messages are sent to the standard "
 "error."
 msgstr ""
+"B<ippevepcl> und B<ippeveps> sind Druckbefehle für B<ippeveprinter>(1). Wie "
+"bei allen Druckbefehlen lesen diese Befehle entweder den auf der "
+"Befehlszeile festgelegten Dateinamen oder aus der Standardeingabe. Die "
+"Ausgabe wird in die Standardausgabe gesandt. Status- und "
+"Fortschrittsnachrichten werden in die Standardfehlerausgabe gesandt."
 
 #. type: Plain text
 #: ippevepcl.7:34
@@ -9291,6 +9329,9 @@ msgid ""
 "PCL (application/vnd.hp-pcl), PWG Raster (image/pwg-raster), and Apple "
 "Raster (image/urf) print files."
 msgstr ""
+"B<ippevepcl> druckt auf S&W-HP-PCL-Laserdruckern und unterstützt das Drucken "
+"von HP-PCL- (application/vnd.hp-pcl), PWG-Raster- (image/pwg-raster) und "
+"Apple-Raster- (image/urf) Druckdateien."
 
 #. type: Plain text
 #: ippevepcl.7:39
@@ -9303,18 +9344,29 @@ msgid ""
 "PostScript printer are used instead to specify duplex printing and media "
 "size."
 msgstr ""
+"B<ippeveps> druckt auf Adobe-PostScript-Druckern und unterstützt das Drucken "
+"von PDF- (application/pdf), PostScript- (application/postscript), JPEG- "
+"(image/jpeg), PWG-Raster- (image/pwg-raster) und Apple-Raster- (image/urf) "
+"Druckdateien. Druckerspezifische Befehle werden aus der übergebenen PPD-"
+"Datei gelesen. Falls keine PPD-Datei festgelegt ist, werden allgemeine "
+"Befehle, die für alle PostScript-Drucker der Stufe 2 oder Stufe 3 geeignet "
+"sind, stattdessen verwandt, um doppelseitiges Drucken und Mediengröße "
+"festzulegen."
 
 #. type: Plain text
 #: ippevepcl.7:41
 msgid "These programs return 1 on error and 0 on success."
-msgstr ""
+msgstr "Diese Programme liefern im Fehlerfall 1 und 0 bei Erfolg zurück."
 
+# FIXME program → programms
 #. type: Plain text
 #: ippevepcl.7:45
 msgid ""
 "These program inherit the environment provided by the B<ippeveprinter> "
 "program."
 msgstr ""
+"Diese Programme erben die durch das Programm B<ippeveprinter> "
+"bereitgestellte Umgebung."
 
 #. type: Plain text
 #: ippevepcl.7:47
@@ -9341,11 +9393,10 @@ msgstr "17. Mai 2019"
 #. type: Plain text
 #: ippeveprinter.1:12
 msgid "ippeveprinter - an ipp everywhere printer application for cups"
-msgstr ""
+msgstr "ippeveprinter - eine IPP-Everywhere-Druckeranwendung für CUPS"
 
 #. type: Plain text
 #: ippeveprinter.1:79
-#, fuzzy
 msgid ""
 "B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] "
 "[ B<-2> ] [ B<-D> I<device-uri> ] [ B<-F> I<output-type/subtype> ] [ B<-K> "
@@ -9356,22 +9407,24 @@ msgid ""
 "I<hostname> ] [ B<-p> I<port> ] [ B<-r> I<subtype[,subtype]> ] [ B<-s> "
 "I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
 msgstr ""
-"B<ippserver> [ B<-2> ] [ B<-M> I<Hersteller> ] [ B<-P> ] [ B<-c> I<Befehl> ] "
-"[ B<-d> I<Spool-Verzeichnis> ] [ B<-f> I<Typ/Untertyp[,… ]> [ B<-h> ] [ B<-"
-"i> I<icondatei.png> ] [ B<-k> ] [ B<-l> I<Ort> ] [ B<-m> I<Modell> ] [ B<-n> "
-"I<Rechnername> ] [ B<-p> I<Port> ] [ B<-r> I<Untertyp> ] [ B<-s> "
+"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] "
+"[ B<-2> ] [ B<-D> I<Geräte-URI> ] [ B<-F> I<Ausgabetyp/-untertyp> ] [ B<-K> "
+"I<Schlüsselpfad> ] [ B<-M> I<Hersteller> ] [ B<-P> I<Dateiname.ppd> ] [ B<-V> "
+"I<IPP-Version> ] [ B<-a> I<Dateiname.conf> ] [ B<-c> I<Befehl> ] [ B<-d> "
+"I<Spool-Verzeichnis> ] [ B<-f> I<Typ/Untertyp[,…]> ] [ B<-i> I<Icon-Datei."
+"png> ] [ B<-k> ] [ B<-l> I<Ort> ] [ B<-m> I<Modell> ] [ B<-n> "
+"I<Rechnername> ] [ B<-p> I<Port> ] [ B<-r> I<Untertyp[,Untertyp]> ] [ B<-s> "
 "I<Geschwindigkeit[,Farbgeschwindigkeit]> ] [ B<-v[vvv]> ] I<Dienstename>"
 
 #. type: Plain text
 #: ippeveprinter.1:82
-#, fuzzy
 msgid ""
 "B<ippeveprinter> is a simple Internet Printing Protocol (IPP) server "
 "conforming to the IPP Everywhere (PWG 5100.14) specification. It can be used "
 "to test client software or act as a very basic print server that runs a "
 "command for every job that is printed."
 msgstr ""
-"B<ippserver> ist ein einfacher Internet Printing Protocol (IPP)-Server, der "
+"B<ippeveprinter> ist ein einfacher Internet Printing Protocol (IPP)-Server, der "
 "der Spezifikation »IPP Everywhere (PWG 5100.14)« folgt. Er kann zum Testen "
 "von Client-Software dienen oder als sehr rudimentärer Server, der für jeden "
 "Druckauftrag einen Befehl ausführt, verwandt werden."
@@ -9397,12 +9450,13 @@ msgstr "B<--no-web-forms>"
 msgid ""
 "Disable the web interface forms used to update the media and supply levels."
 msgstr ""
+"Deaktiviert die zur Aktualisierung der Medien- und Bereitstellungsstufen "
+"verwandte Webschnittstellenformulare."
 
 #. type: Plain text
 #: ippeveprinter.1:94
-#, fuzzy
 msgid "Show the CUPS version."
-msgstr "Zeigt, ob der CUPS-Server läuft."
+msgstr "Zeigt die CUPS-Version an."
 
 #. type: TP
 #: ippeveprinter.1:94
@@ -9429,6 +9483,11 @@ msgid ""
 "default port number is 9100).  When specifying a directory, B<ippeveprinter> "
 "will create an output file using the job ID and name."
 msgstr ""
+"Setzt die Geräte-URI für Druckausgabe. Die URI kann ein Dateiname, ein "
+"Verzeichnis oder eine Netzwerk-Socket-URI der Form »Socket://ADRESSE[:PORT]« "
+"sein (wobei die Vorgabe-Portnummer 9100 ist). Wird ein Verzeichnis "
+"angegeben, wird B<ippeveprinter> eine Ausgabedatei mittels der "
+"Auftragskennung und dem Namen erzeugen."
 
 #. type: TP
 #: ippeveprinter.1:104
@@ -9442,6 +9501,8 @@ msgid ""
 "Specifies the output MIME media type.  The default is \"application/"
 "postscript\" when the B<-P> option is specified."
 msgstr ""
+"Legt den Ausgabe-MIME-Medientyp fest. Die Vorgabe ist »application/"
+"postscript«, wenn die Option B<-P> festgelegt ist."
 
 #. type: TP
 #: ippeveprinter.1:108
@@ -9451,9 +9512,8 @@ msgstr "B<-M >I<Hersteller>"
 
 #. type: Plain text
 #: ippeveprinter.1:112
-#, fuzzy
 msgid "Set the manufacturer of the printer.  The default is \"Example\"."
-msgstr "Setzt den Hersteller des Druckers. Die Vorgabe ist »Test«."
+msgstr "Setzt den Hersteller des Druckers. Die Vorgabe ist »Example«."
 
 #. type: TP
 #: ippeveprinter.1:112
@@ -9468,6 +9528,9 @@ msgid ""
 "typically used in conjunction with the B<ippeveps>(7)  printer command (\"-c "
 "ippeveps\")."
 msgstr ""
+"Druckerattribute aus der festgelegten PPD-Datei laden. Diese Option wird "
+"typischerweise in Zusammenhang mit dem Druckerbefehl B<ippeveps>(7)(\"-c "
+"ippeveps\") verwandt."
 
 #. type: TP
 #: ippeveprinter.1:118
@@ -9483,9 +9546,8 @@ msgstr "B<-V 2.0>"
 
 #. type: Plain text
 #: ippeveprinter.1:124
-#, fuzzy
 msgid "Specifies the maximum IPP version to report.  2.0 is the default."
-msgstr "Legt die für diesen Test zu verwendende IPP-Versionsnummer fest."
+msgstr "Legt die maximal zu berichtende IPP-Version fest. 2.0 ist die Vorgabe."
 
 #. type: TP
 #: ippeveprinter.1:124
@@ -9505,6 +9567,15 @@ msgid ""
 "variable can be used to override the default location of this directory - "
 "see the B<cups>(1)  man page for more details."
 msgstr ""
+"Führt den festgelegten Befehl für jedes ausgedruckte Dokument aus. Falls "
+"»Befehl« kein absoluter Pfad ist (»/Pfad/zu/Befehl«), sucht B<ippeveprinter> "
+"nach dem Befehl im Unterverzeichnis »Befehl« des CUPS-"
+"Programmverzeichnisses, typischerweise /usr/lib/cups/Befehl oder /usr/"
+"libexec/cups/Befehl. Der Befehl B<cups-config>(1) kann zum Erkennen des "
+"korrekten Programmpfades verwandt werden (»cups-config --serverbin«). "
+"Zusätzlich kann die Umgebungsvariable CUPS_SERVERBIN zum Außerkraftsetzen "
+"des Standardortes dieses Verzeichnisses verwandt werden - siehe die "
+"Handbuchseite B<cups>(1) für weitere Details."
 
 #. type: TP
 #: ippeveprinter.1:136
@@ -9530,29 +9601,27 @@ msgstr "B<-f >I<Typ/Untertyp[,…]>"
 
 #. type: Plain text
 #: ippeveprinter.1:144
-#, fuzzy
 msgid ""
 "Specifies a list of MIME media types that the server will accept.  The "
 "default depends on the type of printer created."
 msgstr ""
 "Legt eine Liste von MIME-Medientypen fest, die der Server akzeptiert. Die "
-"Vorgabe ist »application/pdf,image/jpeg,image/pwg-raster«."
+"Vorgabe hängt vom Typ des erstellten Druckers ab."
 
 #. type: TP
 #: ippeveprinter.1:144
 #, no-wrap
 msgid "B<-i >I<iconfile.png>"
-msgstr "B<-i >I<icondatei.png>"
+msgstr "B<-i >I<Icon-Datei.png>"
 
 #. type: Plain text
 #: ippeveprinter.1:149
-#, fuzzy
 msgid ""
 "Specifies the printer icon file for the server.  The file must be a PNG "
 "format image.  The default is an internally-provided PNG image."
 msgstr ""
-"Legt die Drucker-Icon-Datei für den Server fest. Die Vorgabe ist »printer."
-"png«."
+"Legt die Drucker-Icon-Datei für den Server fest. Die Datei muss ein Bild im "
+"Format PNG sein. Die Vorgabe ist ein intern bereitgestelltes PNG-Bild."
 
 #. type: TP
 #: ippeveprinter.1:149
@@ -9630,12 +9699,11 @@ msgstr "B<-r >I<Untertyp[,Untertyp]>"
 
 #. type: Plain text
 #: ippeveprinter.1:175
-#, fuzzy
 msgid ""
 "Specifies the DNS-SD subtype(s) to advertise.  Separate multiple subtypes "
 "with a comma.  The default is \"_print\"."
 msgstr ""
-"Legt den/die Bonjour-Untertyp(en) fest, die bekanntgegeben werden sollen. "
+"Legt den/die DNS-SD-Untertyp(en) fest, die bekanntgegeben werden sollen. "
 "Mehrere Untertypen werden mit Kommata getrennt. Die Vorgabe ist »_print«."
 
 #. type: TP
@@ -9663,37 +9731,33 @@ msgstr "B<-v[vvv]>"
 
 #. type: Plain text
 #: ippeveprinter.1:183
-#, fuzzy
 msgid "Be (very) verbose when logging activity to standard error."
 msgstr ""
-"Das Protokollieren der Aktivitäten auf die Standardausgabe erfolgt (sehr) "
+"Das Protokollieren der Aktivitäten auf die Standardfehlerausgabe erfolgt (sehr) "
 "ausführlich."
 
 #. type: Plain text
 #: ippeveprinter.1:190
-#, fuzzy
 msgid ""
 "The B<ippeveprinter> program returns 1 if it is unable to process the "
 "command-line arguments or register the IPP service.  Otherwise "
 "B<ippeveprinter> will run continuously until terminated."
 msgstr ""
-"Das Programm B<ippserver> liefert 1 zurück, falls es nicht in der Lage ist, "
+"Das Programm B<ippeveprinter> liefert 1 zurück, falls es nicht in der Lage ist, "
 "die Befehlszeilenargumente zu verarbeiten oder den IPP-Dienst zu "
-"registrieren. Andernfalls läuft B<ippserver> dauerhaft, bis er beendet wird."
+"registrieren. Andernfalls läuft B<ippeveprinter> dauerhaft, bis er beendet wird."
 
 #. type: Plain text
 #: ippeveprinter.1:194
-#, fuzzy
 msgid ""
 "The B<ippeveprinter> program is unique to CUPS and conforms to the IPP "
 "Everywhere (PWG 5100.14) specification."
 msgstr ""
-"Das Programm B<ippserver> ist eine Besonderheit von CUPS und konform zu der "
+"Das Programm B<ippeveprinter> ist eine Besonderheit von CUPS und konform zu der "
 "Spezifikation »IPP Everywhere (PWG 5100.14)«."
 
 #. type: Plain text
 #: ippeveprinter.1:198
-#, fuzzy
 msgid ""
 "B<ippeveprinter> adds environment variables starting with \"IPP_\" for all "
 "IPP Job attributes in the print request.  For example, when executing a "
@@ -9701,7 +9765,7 @@ msgid ""
 "\"IPP_MEDIA\" environment variable will be set to the value of that "
 "attribute."
 msgstr ""
-"B<ippserver> fügt für alle IPP-Auftragsattribute in der Druckwarteschlange "
+"B<ippeveprinter> fügt für alle IPP-Auftragsattribute in der Druckanfrage "
 "Umgebungsvariablen hinzu, die mit »IPP_« beginnen. Wird beispielsweise ein "
 "Befehl für einen IPP-Auftrag ausgeführt, der das Attribut »media« des »Job "
 "Template« enthält, wird die Umgebungsvariable »IPP_MEDIA« auf den Wert des "
@@ -9715,10 +9779,13 @@ msgid ""
 "\"IPP_MEDIA_DEFAULT\" environment variable will be set to the default value "
 "for the \"media\" Job Template attribute."
 msgstr ""
+"Zusätzlich werden alle IPP-»xxx-default« und »pwg-xxx«-"
+"Druckerbeschreibungsattribute zu der Umgebung hinzugefügt. Beispielsweise "
+"wird die Umgebungsvariable »IPP_MEDIA_DEFAULT« auf den Vorgabewert für das "
+"Auftragsvorlagenattribut »media« gesetzt."
 
 #. type: Plain text
 #: ippeveprinter.1:205
-#, fuzzy
 msgid ""
 "Enumerated values are converted to their keyword equivalents.  For example, "
 "a \"print-quality\" Job Template attribute with a enum value of 3 will "
@@ -9730,7 +9797,9 @@ msgstr ""
 "Aufgezählte Werte werden in ihre Schlüsselwort-Äquivalente umgewandelt. "
 "Beispielsweise wird ein Auftrags-Attribut »print-quality« mit dem "
 "aufgezählten Wert 3 die Umgebungsvariablen »IPP_PRINT_QUALITY« mit dem Wert "
-"»draft« werden."
+"»draft« werden. Die Zeichenkettenumwandlung erfolgt nur für standardmäßige "
+"»Job Template«-Attribute, derzeit »finishings«, »orientation-requested« und "
+"»print-quality«."
 
 #. type: Plain text
 #: ippeveprinter.1:207
@@ -9858,9 +9927,8 @@ msgstr ""
 
 #. type: Plain text
 #: ippeveprinter.1:239
-#, fuzzy
 msgid "Run B<ippeveprinter> with a service name of My Cool Printer:"
-msgstr "B<ippserver> mit dem Dienstnamen »Mein Toller Drucker« ausführen:"
+msgstr "B<ippeveprinter> mit dem Dienstnamen »Mein Toller Drucker« ausführen:"
 
 #. type: Plain text
 #: ippeveprinter.1:242
@@ -9883,11 +9951,12 @@ msgstr "    ippeveprinter -c /usr/bin/file \"Mein Toller Drucker\"\n"
 
 #. type: Plain text
 #: ippeveprinter.1:255
-#, fuzzy
 msgid ""
 "B<ippevepcl>(7), B<ippeveps>(7), PWG Internet Printing Protocol Workgroup "
 "(http://www.pwg.org/ipp)"
-msgstr "PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)"
+msgstr ""
+"B<ippevepcl>(7), B<ippeveps>(7), PWG Internet Printing Protocol Workgroup "
+"(http://www.pwg.org/ipp)"
 
 #. type: TH
 #: ippfind.1:9
@@ -10697,7 +10766,6 @@ msgstr "ipptool - Internet-Printing-Protocol-Abfragen durchführen"
 
 #. type: Plain text
 #: ipptool.1:75
-#, fuzzy
 msgid ""
 "B<ipptool> [ B<--help> ] [ B<--ippserver> I<filename> ] [ B<--stop-after-"
 "include-error> ] [ B<--version> ] [ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] "
@@ -10707,12 +10775,13 @@ msgid ""
 "I<repeat-count> ] [ B<-q> ] [ B<-t> ] [ B<-v ]> I<printer-uri> I<testfile> "
 "[ ...  I<testfile> ]"
 msgstr ""
-"B<ipptool> [ B<--help> ] [ B<--stop-after-include-error> ] [ B<--version> ] "
-"[ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] [ B<-I> ] [ B<-L> ] [ B<-P> "
-"I<Dateiname.plist> ] [ B<-S> ] [ B<-T> I<Sekunden> ] [ B<-V> I<Version> ] "
-"[ B<-X> ] [ B<-c> ] [ B<-d> I<Name=Wert> ] [ B<-f> I<Dateiname> ] [ B<-h> ] "
-"[ B<-i> I<Sekunden> ] [ B<-n> I<Anzahl-Wiederholungen> ] [ B<-q> ] [ B<-t> ] "
-"[ B<-v ]> I<Drucker-URI> I<Testdatei> [ …  I<Testdatei> ]"
+"B<ipptool> [ B<--help> ] [ B<--ippserver> I<Dateiname> ] [ B<--stop-after-"
+"include-error> ] [ B<--version> ] [ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] "
+"[ B<-I> ] [ B<-L> ] [ B<-P> I<Dateiname.plist> ] [ B<-S> ] [ B<-T> "
+"I<Sekunden> ] [ B<-V> I<Version> ] [ B<-X> ] [ B<-c> ] [ B<-d> "
+"I<Name=Wert> ] [ B<-f> I<Dateiname> ] [ B<-h> ] [ B<-i> I<Sekunden> ] [ B<-n> "
+"I<Wiederholungszähler> ] [ B<-q> ] [ B<-t> ] [ B<-v ]> I<Drucker-URI> I<Testdatei> "
+"[ …  I<Testdatei> ]"
 
 #. type: Plain text
 #: ipptool.1:88
@@ -10751,13 +10820,10 @@ msgstr "B<--ippserver >I<Dateiname>"
 
 #. type: Plain text
 #: ipptool.1:99
-#, fuzzy
 msgid ""
 "Specifies that the test results should be written to the named B<ippserver> "
 "attributes file."
 msgstr ""
-"Legt fest, dass der aktuelle Test übersprungen werden soll, wenn die "
-"Variable (nicht) definiert ist."
 
 #. type: TP
 #: ipptool.1:99
@@ -11660,16 +11726,8 @@ msgstr "B<ATTR >I<Außerbandmarkierung Attributname>"
 msgid "B<ATTR >I<tag attribute-name value(s)>"
 msgstr "B<ATTR >I<Markierung Attributname Wert(e)>"
 
-# FIXME: Broken string
 #. type: Plain text
 #: ipptoolfile.5:171
-#, fuzzy
-#| msgid ""
-#| "Adds an attribute to the test request.  Out-of-band tags (admin-define, "
-#| "delete-attribute, no-value, not-settable, unknown, unsupported) have no "
-#| "value.  Values for other tags are separated by the comma (\",\") "
-#| "character - escape commas using the \" Common attributes and values are "
-#| "listed in the IANA IPP registry - see references below."
 msgid ""
 "Adds an attribute to the test request.  Out-of-band tags (admin-define, "
 "delete-attribute, no-value, not-settable, unknown, unsupported) have no "
@@ -11681,7 +11739,7 @@ msgstr ""
 "define, delete-attribute, no-value, not-settable, unknown, unsupported) "
 "haben keinen Wert. Werte für die anderen Markierungen werden durch Kommata "
 "(»,«) getrennt -- schützen Sie Kommata mittels des Anführungszeichens "
-"(»\"«). Gemeinsame Attribute und Werte sind in der »IANA IPP registry« "
+"(»\"«). Häufige Attribute und Werte sind in der »IANA IPP registry« "
 "aufgeführt, siehe Referenz unten."
 
 #. type: TP
@@ -13647,11 +13705,10 @@ msgstr "    lp -d foo -o media=legal -o sides=two-sided-long-edge Dateiname\n"
 
 #. type: Plain text
 #: lp.1:215
-#, fuzzy
 msgid "Print a presentation document 2-up to a printer called \"bar\":"
 msgstr ""
 "Druckt ein Präsentations-Dokument zweifach pro Seite auf dem Drucker mit "
-"Namen »foo«:"
+"Namen »bar«:"
 
 #. type: Plain text
 #: lp.1:218
@@ -13782,7 +13839,6 @@ msgstr ""
 
 #. type: Plain text
 #: lpadmin.8:87
-#, fuzzy
 msgid ""
 "Sets a standard PPD file for the printer from the I<model> directory or "
 "using one of the driver interfaces.  Use the I<-m> option with the "
@@ -13792,12 +13848,12 @@ msgid ""
 "than \"everywhere\" are deprecated and will not be supported in a future "
 "version of CUPS."
 msgstr ""
-"Setzt eine Standard-PPD-Datei für den Drucker aus dem Verzeichnis I<Model> "
-"oder verwendet eine der Druckerschnittstellen. Verwenden Sie die Option I<-"
+"Legt eine Standard-PPD-Datei für den Drucker aus dem Verzeichnis I<Model> "
+"oder mittels einer der Druckerschnittstellen fest. Verwenden Sie die Option I<-"
 "m> mit dem Befehl B<lpinfo>(8), um eine Liste der unterstützten Modelle zu "
 "erhalten. Das Modell »raw« bereinigt jede PPD-Datei und das Modell "
-"»everywhere« fragt die von der angegebenen IPP-I<Geräte-URI> referenzierten "
-"Drucker ab. Hinweis: Das Model »raw« ist veraltet und wird in einer "
+"»everywhere« fragt den von der angegebenen IPP-I<Geräte-URI> referenzierten "
+"Drucker ab. Hinweis: Alle Modelle außer »everywhere« sind veraltet und werden in einer "
 "zukünftigen Version von CUPS nicht mehr unterstützt."
 
 #. type: TP
@@ -14136,9 +14192,8 @@ msgstr "Stellt den Ort des Ziels textuell bereit."
 
 #. type: Plain text
 #: lpadmin.8:188
-#, fuzzy
 msgid "The following B<lpadmin> options are deprecated:"
-msgstr "Die folgenden Optionen werden erkannt:"
+msgstr "Die folgenden B<lpadmin>-Optionen sind veraltet:"
 
 #. type: TP
 #: lpadmin.8:188
@@ -14148,16 +14203,12 @@ msgstr "B<-i >I<filename>"
 
 #. type: Plain text
 #: lpadmin.8:193
-#, fuzzy
 msgid ""
 "This option historically has been used to provide either a System V "
 "interface script or (as an implementation side-effect) a PPD file.  Note: "
 "Interface scripts are not supported by CUPS.  PPD files and printer drivers "
 "are deprecated and will not be supported in a future version of CUPS."
 msgstr ""
-"Legt eine PostScript-Printer-Description-Datei für die Verwendung mit dem "
-"Drucker fest. Falls angegeben überschreibt diese Option die Option I<-i> "
-"(Schnittstellenskript)."
 
 #. type: TP
 #: lpadmin.8:193
@@ -14167,25 +14218,23 @@ msgstr "B<-P >I<PPD-Datei>"
 
 #. type: Plain text
 #: lpadmin.8:197
-#, fuzzy
 msgid ""
 "Specifies a PostScript Printer Description (PPD) file to use with the "
 "printer.  Note: PPD files and printer drivers are deprecated and will not be "
 "supported in a future version of CUPS."
 msgstr ""
-"Legt eine PostScript-Printer-Description-Datei für die Verwendung mit dem "
-"Drucker fest. Falls angegeben überschreibt diese Option die Option I<-i> "
-"(Schnittstellenskript)."
+"Legt eine PostScript-Printer-Description-Datei (PPD) für die Verwendung mit dem "
+"Drucker fest. Hinweis: PPD-Dateien und Druckertreiber sind veraltet und "
+"werden in einer zukünftigen Version von CUPS nicht mehr unterstützt."
 
 #. type: Plain text
 #: lpadmin.8:203
-#, fuzzy
 msgid ""
 "Finally, the CUPS version of B<lpadmin> may ask the user for an access "
 "password depending on the printing system configuration.  This differs from "
 "the System V version which requires the root user to execute this command."
 msgstr ""
-"Die CUPS-Versionen von B<disable> und B<enable> könnten den Benutzer, "
+"Die CUPS-Versionen von B<lpadmin> könnten den Benutzer schließlich, "
 "abhängig von der Konfiguration des Drucksystems, nach einem Zugriffspasswort "
 "fragen. Dies unterscheidet sich von der System-V-Version, die verlangt, dass "
 "der Benutzer »root« diese Befehle ausführt."
@@ -14341,13 +14390,12 @@ msgstr ""
 
 #. type: Plain text
 #: lpc.8:42
-#, fuzzy
 msgid ""
 "This program is deprecated and will be removed in a future feature release "
 "of CUPS."
 msgstr ""
-"I<Dieses Programm ist veraltet und wird in einer zukünftigen "
-"Veröffentlichung von CUPS entfernt werden.>"
+"Dieses Programm ist veraltet und wird in einer zukünftigen "
+"Funktionalitäts-Veröffentlichung von CUPS entfernt werden."
 
 #. type: Plain text
 #: lpc.8:47
@@ -15720,6 +15768,10 @@ msgid ""
 "feature release of CUPS.  Printers that do not support IPP can be supported "
 "using applications such as B<ippeveprinter>(1)."
 msgstr ""
+"CUPS-Filter sind veraltet und werden in einer zukünftigen "
+"Funktionsveröffentlichung von CUPS nicht mehr unterstützt. Drucker, die IPP "
+"nicht unterstützen, können mittels Anwendungen wie B<ippeveprinter>(1) "
+"unterstützt werden."
 
 #. type: Plain text
 #: mime.convs.5:61
@@ -17066,7 +17118,6 @@ msgstr "subscriptions.conf - Abonnement-Konfigurationsdatei für CUPS"
 
 #. type: Plain text
 #: subscriptions.conf.5:19
-#, fuzzy
 msgid ""
 "The B<subscriptions.conf> file defines the local event notification "
 "subscriptions that are active.  It is normally located in the I</etc/cups> "
@@ -17089,18 +17140,6 @@ msgstr ""
 "B<mime.convs>(5), B<mime.types>(5), B<printers.conf>(5), CUPS-Online-Hilfe "
 "(http://localhost:631/help)"
 
-#~ msgid "4 April 2014"
-#~ msgstr "4. April 2014"
-
-#~ msgid "Copyright \\[co] 2007-2017 by Apple Inc."
-#~ msgstr "Copyright \\[co] 2007-2017 by Apple Inc."
-
-#~ msgid "15 April 2014"
-#~ msgstr "15. April 2014"
-
-#~ msgid "19 October 2017"
-#~ msgstr "19. Oktober 2017"
-
 #~ msgid "client.conf - client configuration file for cups"
 #~ msgstr "classes.conf - Client-konfigurationsdatei für CUPS"
 
@@ -17135,15 +17174,6 @@ msgstr ""
 #~ "Unterstützung - damit wird die minimale Protokollversion auf TLS v1.1 "
 #~ "gesetzt."
 
-#~ msgid "10 June 2014"
-#~ msgstr "10. Juni 2014"
-
-#~ msgid "cupsaddsmb"
-#~ msgstr "cupsaddsmb"
-
-#~ msgid "11 June 2014"
-#~ msgstr "11. Juni 2014"
-
 #~ msgid "cupsaddsmb - export printers to samba for windows clients"
 #~ msgstr "cupsaddsmb - exportiere Drucker an Samba für Windows-Clients"
 
@@ -17857,9 +17887,6 @@ msgstr ""
 #~ msgid "Uses the named configuration file."
 #~ msgstr "Verwende die benannte Konfigurationsdatei."
 
-#~ msgid "20 October 2014"
-#~ msgstr "20. Oktober 2014"
-
 #~ msgid "B<Sandboxing off>"
 #~ msgstr "B<Sandboxing off>"
 
@@ -17870,9 +17897,6 @@ msgstr ""
 #~ msgid "COMPATIBILITY"
 #~ msgstr "KOMPATIBILITÄT"
 
-#~ msgid "WARNING"
-#~ msgstr "WARNING"
-
 #~ msgid "EXIT CODES"
 #~ msgstr "EXIT-CODES"
 
@@ -17895,15 +17919,9 @@ msgstr ""
 #~ "I<cancel> bricht alle existierenden Druckaufträge ab. Die Option I<-a> "
 #~ "entfernt alle Druckaufträge von dem angegebenen Ziel."
 
-#~ msgid "-a"
-#~ msgstr "-a"
-
 #~ msgid "-u username"
 #~ msgstr "-u Benutzername"
 
-#~ msgid "-x"
-#~ msgstr "-x"
-
 #~ msgid "I<lp(1)>, I<lpmove(8)>, I<lpstat(1)>,"
 #~ msgstr "I<lp(1)>, I<lpmove(8)>, I<lpstat(1)>,"
 
@@ -19611,14 +19629,6 @@ msgstr ""
 #~ "Legt fest, dass Druckerinformationspakete von einem Rechner oder Netz zu "
 #~ "einem anderen weitergeleitet werden sollen."
 
-# type: TP
-#~ msgid "BrowseShortNames Yes"
-#~ msgstr "BrowseShortNames Yes"
-
-# type: TP
-#~ msgid "BrowseShortNames No"
-#~ msgstr "BrowseShortNames No"
-
 # type: Plain text
 #~ msgid ""
 #~ "Specifies whether remote printers will use short names (\"printer\") or "
@@ -19642,26 +19652,10 @@ msgstr ""
 #~ "bevor Drucker in der Ferne aus der Liste der verfügbaren Drucker entfernt "
 #~ "werden, fest."
 
-# type: TP
-#~ msgid "HideImplicitMembers Yes"
-#~ msgstr "HideImplicitMembers Yes"
-
-# type: TP
-#~ msgid "HideImplicitMembers No"
-#~ msgstr "HideImplicitMembers No"
-
 # type: Plain text
 #~ msgid "Specifies whether to hide members of implicit classes."
 #~ msgstr "Legt fest, ob Mitglieder impliziter Klassen versteckt werden."
 
-# type: TP
-#~ msgid "ImplicitAnyClasses Yes"
-#~ msgstr "ImplicitAnyClasses Yes"
-
-# type: TP
-#~ msgid "ImplicitAnyClasses No"
-#~ msgstr "ImplicitAnyClasses No"
-
 # type: Plain text
 #~ msgid ""
 #~ "Specifies whether or not to create implicit classes for local and remote "
@@ -19672,14 +19666,6 @@ msgstr ""
 #~ "erstellt werden sollen oder nicht, z.B. »AnyPrinter« aus »Printer«, "
 #~ "»Printer@server1 und »Printer@server2«."
 
-# type: TP
-#~ msgid "ImplicitClasses Yes"
-#~ msgstr "ImplicitClasses Yes"
-
-# type: TP
-#~ msgid "ImplicitClasses No"
-#~ msgstr "ImplicitClasses No"
-
 # type: Plain text
 #~ msgid ""
 #~ "Specifies whether or not to create implicit classes from identical remote "
@@ -19697,14 +19683,6 @@ msgstr ""
 #~ "nicht. Dies wird in zukünftigen Veröffentlichungen von CUPS "
 #~ "berücksichtigt."
 
-# type: Plain text
-#~ msgid "Copyright 2007-2010 by Apple Inc."
-#~ msgstr "Copyright 2007-2010 by Apple Inc."
-
-# type: TH
-#~ msgid "cups-polld"
-#~ msgstr "cups-polld"
-
 # type: Plain text
 #~ msgid "cups-polld - cups printer polling daemon"
 #~ msgstr "cups-polld - CUPS-Druckerabfrage-Daemon"
-- 
cgit v1.2.3


From d233060e7197f5e4e88001da4ea5d05f23343ccf Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Fri, 13 Sep 2019 21:46:09 +0200
Subject: Update German man page (2197t)

---
 debian/changelog             |  2 +-
 debian/manpage-po4a/po/de.po | 76 ++++++++++++++++++++++++++++++++++++--------
 2 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4bf2a9000..22e176b7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 cups (2.3.0-3.1) UNRELEASED; urgency=medium
 
   [ Helge Kreutzmann ]
-  * Update German man page (2178t2f17u)
+  * Update German man page (2197t)
 
  -- Helge Kreutzmann <debian@helgefjell.de>  Thu, 12 Sep 2019 22:22:14 +0200
 
diff --git a/debian/manpage-po4a/po/de.po b/debian/manpage-po4a/po/de.po
index 537a2654d..81b496c15 100644
--- a/debian/manpage-po4a/po/de.po
+++ b/debian/manpage-po4a/po/de.po
@@ -7,13 +7,12 @@
 #  banner == banner page -> Deckblatt
 #
 # FIXME: Schlüssel als Subjekt, d.h. B<> legt die zu verwendende?
-# FIXME: Whitespace → Leerraum
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: cups man pages 2.2.7-5\n"
 "POT-Creation-Date: 2019-09-02 10:31+0200\n"
-"PO-Revision-Date: 2019-09-12 22:21+0200\n"
+"PO-Revision-Date: 2019-09-13 21:42+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -2660,7 +2659,7 @@ msgstr ""
 "Sie befindet sich normalerweise im Verzeichnis I</etc/cups>. "
 "Jede Zeile in der Datei kann eine Konfigurationsdirektive, eine leere Zeile "
 "oder ein Kommentar sein. Konfigurationsdirektiven bestehen typischerweise "
-"aus einem Namen und keinem oder mehren, durch Leerzeichen getrennten Werten. "
+"aus einem Namen und keinem oder mehren, durch Leerraum getrennten Werten. "
 "Die Groß- und Kleinschreibung der Namen und Werte der "
 "Konfigurationsdirektiven ist nicht relevant. Kommentarzeilen beginnen mit "
 "dem Zeichen »#«. "
@@ -6514,7 +6513,7 @@ msgid ""
 msgstr ""
 "Jede Zeile in der Datei kann eine Konfigurationsdirektive, eine leere Zeile "
 "oder ein Kommentar sein. Konfigurationsdirektiven bestehen typischerweise "
-"aus einem Namen und keinem oder mehren, durch Leerzeichen getrennten Werten. "
+"aus einem Namen und keinem oder mehren, durch Leerraum getrennten Werten. "
 "Die Groß- und Kleinschreibung der Namen und Werte der "
 "Konfigurationsdirektiven ist nicht relevant. Kommentarzeilen beginnen mit "
 "dem Zeichen »#«. "
@@ -8407,7 +8406,7 @@ msgid ""
 "Relaxes the PPD conformance requirements so that common whitespace, control "
 "character, and formatting problems are not treated as hard errors."
 msgstr ""
-"Weicht die PPD-Konformitätsanforderungen auf, so dass typische Leerzeichen-, "
+"Weicht die PPD-Konformitätsanforderungen auf, so dass typische Leerraumzeichen-, "
 "Steuerzeichen und Formatierungsprobleme nicht als schwere Fehler behandelt "
 "werden."
 
@@ -9811,6 +9810,11 @@ msgid ""
 "and the \"PPD\" environment variable contains the PPD filename as specified "
 "with the \"-P\" option."
 msgstr ""
+"Schließlich enthält die Umgebungsvariable »CONTENT_TYPE« den MIME-Medientyp "
+"des auszudruckenden Dokuments, die Umgebungsvariable »DEVICE_URI« enthält "
+"die Geräte-URI, wie mit der Option »-D« angegeben, die Umgebungsvariable "
+"»OUTPUT_FORMAT« enhält den Ausgabe-MIME-Medientyp und die Umgebungsvariable "
+"»PPD« enthält den PPD-Dateinamen, wie mit der Option »-P« angegeben."
 
 #. type: SH
 #: ippeveprinter.1:207
@@ -9824,6 +9828,8 @@ msgid ""
 "Unless they communicate directly with a printer, print commands send printer-"
 "ready data to the standard output."
 msgstr ""
+"Druckbefehle schicken druckbereite Daten in die Standardausgabe, außer sie "
+"kommunizieren direkt mit einem Drucker."
 
 #. type: Plain text
 #: ippeveprinter.1:213
@@ -9831,6 +9837,8 @@ msgid ""
 "Print commands can send messages back to B<ippeveprinter> on the standard "
 "error with one of the following prefixes:"
 msgstr ""
+"Druckbefehle können auf der Standardfehlerausgabe Nachrichten an "
+"B<ippeveprinter> mit den folgenden Präfixen zurückschicken:"
 
 #. type: TP
 #: ippeveprinter.1:213
@@ -9847,17 +9855,24 @@ msgid ""
 "\"printer-supply\", and \"printer-supply-description\" Printer Status "
 "attributes can be set."
 msgstr ""
+"Setzt das/die benannten Attribut(e) auf den gegebenen Wert. Derzeit können "
+"die Auftragsattribute »job-impressions« und »job-impressions-completed« und "
+"die Druckerstatusattribute »marker-xxx«, »printer-alert«, »printer-alert-"
+"description«, »printer-supply« und »printer-supply-description« gesetzt "
+"werden."
 
 #. type: TP
 #: ippeveprinter.1:217
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<DEBUG: >I<Debugging message>"
-msgstr "B<DEBUG: >I<Nachricht>"
+msgstr "B<DEBUG: >I<Fehlersuchnachricht>"
 
 #. type: Plain text
 #: ippeveprinter.1:220
 msgid "Logs a debugging message if at least two -v's have been specified."
 msgstr ""
+"Protokolliert eine Fehlersuchnachricht, falls mindestens zwei »-v« angegeben "
+"wurden."
 
 #. type: TP
 #: ippeveprinter.1:220
@@ -9871,6 +9886,8 @@ msgid ""
 "Logs an error message and copies the message to the \"job-state-message\" "
 "attribute."
 msgstr ""
+"Protokolliert eine Fehlernachricht und kopiert die Nachricht in das Attribut "
+"»job-state-message«."
 
 #. type: TP
 #: ippeveprinter.1:223
@@ -9885,6 +9902,9 @@ msgid ""
 "the message to the \"job-state-message\" attribute unless an error has been "
 "reported."
 msgstr ""
+"Protokolliert eine informative/Fortschrittsnachricht, falls ein »-v« "
+"angegeben wurde und kopiert die Nachricht in das Attribut »job-state-"
+"message«, falls kein Fehler berichtet wurde."
 
 #. type: TP
 #: ippeveprinter.1:226
@@ -9898,6 +9918,8 @@ msgid ""
 "Sets the printer's \"printer-state-reasons\" attribute to the listed "
 "keywords."
 msgstr ""
+"Setzt das Attribut »printer-state-reasons« des Druckers auf die aufgeführten "
+"Schlüsselwörter."
 
 #. type: TP
 #: ippeveprinter.1:229
@@ -9911,6 +9933,8 @@ msgid ""
 "Removes the listed keywords from the printer's \"printer-state-reasons\" "
 "attribute."
 msgstr ""
+"Entfernt die aufgeführten Schlüsselwörter aus dem Attribut »printer-state-"
+"reasons« des Druckers."
 
 #. type: TP
 #: ippeveprinter.1:232
@@ -9924,6 +9948,8 @@ msgid ""
 "Adds the listed keywords to the printer's \"printer-state-reasons\" "
 "attribute."
 msgstr ""
+"Fügt das aufgeführte Schlüsselwort zu dem Attribut »printer-state-reasons« "
+"des Druckers hinzu."
 
 #. type: Plain text
 #: ippeveprinter.1:239
@@ -10824,6 +10850,8 @@ msgid ""
 "Specifies that the test results should be written to the named B<ippserver> "
 "attributes file."
 msgstr ""
+"Legt fest, dass die Testergebnisse in die benannte Attributedatei von "
+"B<ippserver> geschrieben werden sollen."
 
 #. type: TP
 #: ipptool.1:99
@@ -13084,6 +13112,8 @@ msgid ""
 "Inserts the current date and time using the ISO-8601 format (\"yyyy-mm-ddThh:"
 "mm:ssZ\")."
 msgstr ""
+"Fügt das aktuelle Datum und die aktuelle Zeit im ISO-8601-Format (»yyyy-mm-"
+"ddThh:mm:ssZ«) ein."
 
 #. type: TP
 #: ipptoolfile.5:599
@@ -13097,6 +13127,8 @@ msgid ""
 "Inserts the starting date and time using the ISO-8601 format (\"yyyy-mm-"
 "ddThh:mm:ssZ\")."
 msgstr ""
+"Fügt das Startdatum und die Startzeit im ISO-8601-Format (»yyyy-mm-ddThh:mm:"
+"ssZ«) ein."
 
 #. type: TP
 #: ipptoolfile.5:602
@@ -13633,6 +13665,7 @@ msgstr "B<-o print-quality=5>"
 #: lp.1:187 lpr.1:142
 msgid "Specifies the output quality - draft (3), normal (4), or best (5)."
 msgstr ""
+"Legt die Ausgabequalität fest - Entwurf (3), normal (4) oder beste (5)."
 
 #. type: TP
 #: lp.1:187 lpr.1:142
@@ -14012,7 +14045,6 @@ msgstr "B<-o printer-error-policy=>I<Name>"
 
 #. type: Plain text
 #: lpadmin.8:135
-#, fuzzy
 msgid ""
 "Sets the policy for errors such as printers that cannot be found or "
 "accessed, don't support the format being printed, fail during submission of "
@@ -14022,9 +14054,14 @@ msgid ""
 "\"stop-printer\" (stop the printer on error).  The default error policy is "
 "\"stop-printer\" for printers and \"retry-current-job\" for classes."
 msgstr ""
-"Setzt die Fehlerrichtlinie, die benutzt wird, wenn das Drucker-Backend den "
-"Druckauftrag nicht an den Drucker senden kann. Der Name muss entweder »abort-"
-"job«, »retry-job«, »retry-current-job« oder »stop-printer« sein. Die "
+"Setzt die Richtlinie für Fehler, wie Drucker, die nicht gefunden oder auf "
+"die nicht zugegriffen werden können, die das zu druckende Format nicht "
+"drucken können, während der Übergabe der Druckdaten fehlschlagen oder zum "
+"Absturz von einem oder mehreren Filtern führen. Der Name muss entweder "
+"»abort-job« (den aktuellen Auftrag bei Fehlern abbrechen), »retry-job« (den "
+"Auftrag in der Zukunft erneut versuchen), »retry-current-job« (den Auftrag "
+"sofort erneut versuchen) oder »stop-printer« (den Drucker bei Fehlern "
+"anhalten) sein. Die "
 "Standardfehlerrichtlinie ist »stop-printer« für Drucker und »retry-current-"
 "job« für Klassen."
 
@@ -14209,6 +14246,11 @@ msgid ""
 "Interface scripts are not supported by CUPS.  PPD files and printer drivers "
 "are deprecated and will not be supported in a future version of CUPS."
 msgstr ""
+"Diese Option wurde historisch zur Bereitstellung entweder eines System-V-"
+"Schnittstellenskriptes oder (als ein Seiteneffekt der Implementierung) einer "
+"PPD-Datei verwandt. Beachten Sie: Schnittstellenskripte werden von CUPS "
+"nicht unterstützt. PPD-Dateien und Druckertreiber sind veraltet und werden "
+"in einer zukünftigen Version von CUPS nicht unterstützt."
 
 #. type: TP
 #: lpadmin.8:193
@@ -14251,7 +14293,7 @@ msgstr ""
 #. type: Plain text
 #: lpadmin.8:211
 msgid "Interface scripts are not supported for security reasons."
-msgstr ""
+msgstr "Aus Sicherheitsgründen werden Schnittstellenskripte nicht unterstützt."
 
 #. type: Plain text
 #: lpadmin.8:213
@@ -14270,6 +14312,12 @@ msgid ""
 "I<classes.conf>.  These files should not be edited directly and are an "
 "implementation detail of CUPS that is subject to change at any time."
 msgstr ""
+"Der Befehl B<lpadmin> kommuniziert mit dem Auftragsplaner (B<cupsd>), um "
+"Änderungen an der Drucksystemkonfiguration vorzunehmen. Die "
+"Konfigurationsinformationen werden in verschiedenen Dateien, einschließlich "
+"I<printers.conf> und I<classes.conf>, gespeichert. Diese Dateien sollten "
+"nicht direkt bearbeitet werden und sind ein Implementierungsdetail von CUPS, "
+"das sich jederzeit ändern kann."
 
 #. type: Plain text
 #: lpadmin.8:219
@@ -15866,7 +15914,7 @@ msgid ""
 "\"."
 msgstr ""
 "Die Regeln könnten durch Benutzung von Klammern gruppiert werden, zum "
-"Aneinanderhängen wird »+« für ein logisches UND und »,« oder Leerzeichen für "
+"Aneinanderhängen wird »+« für ein logisches UND und »,« oder Leerraumzeichen für "
 "ein logisches ODER und »!« für Negation benutzt."
 
 #. type: SS
@@ -16051,7 +16099,7 @@ msgid ""
 "containing whitespace and angle brackets (E<lt>E<gt>) for hexadecimal "
 "strings."
 msgstr ""
-"Zeichenkettenkonstanten können für Zeichenketten, die Leerzeichen und spitze "
+"Zeichenkettenkonstanten können für Zeichenketten, die Leerraumzeichen und spitze "
 "Klammern (E<lt>E<gt>) für hexadezimale Zeichenketten enthalten, innerhalb "
 "von Anführungszeichen (\"\") angegeben werden."
 
-- 
cgit v1.2.3


From c34cac060edd6769da3afbbd98272971189b92c1 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 20 Sep 2019 15:03:47 +0200
Subject: cups 2.3.0-4 Debian release

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22e176b7d..5be8e3a23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-cups (2.3.0-3.1) UNRELEASED; urgency=medium
+cups (2.3.0-4) unstable; urgency=medium
 
   [ Helge Kreutzmann ]
   * Update German man page (2197t)
 
- -- Helge Kreutzmann <debian@helgefjell.de>  Thu, 12 Sep 2019 22:22:14 +0200
+ -- Didier Raboud <odyx@debian.org>  Fri, 20 Sep 2019 15:03:47 +0200
 
 cups (2.3.0-3) unstable; urgency=low
 
-- 
cgit v1.2.3


From ea056636107f0f43b8cf46623d1ed478ac840c0d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 21 Sep 2019 08:59:31 +0200
Subject: Let the test-drivers script stop waiting when a filter is allegedly
 failed, and give context

---
 debian/tests/utils/test-drivers | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/tests/utils/test-drivers b/debian/tests/utils/test-drivers
index e8ee26d51..97c24ada6 100755
--- a/debian/tests/utils/test-drivers
+++ b/debian/tests/utils/test-drivers
@@ -59,9 +59,21 @@ for driver in $DRIVERS_LIST; do
         rid=$(/usr/bin/lp -d $DUMMY_PRINTER_NAME $file | sed -e 's/^.*request id is \(.*\) (.*)$/\1/g')
     
         # Wait for the print to finish
-        while /usr/bin/lpstat | grep -q "^$rid "; do
+        while LPSTAT=`LANG=C /usr/bin/lpstat -l` && echo $LPSTAT | grep -q "^$rid "; do
             /bin/sleep 1s
             echo -n "."
+            # If the filter is failed; stop the waiting and give as much context as possible
+            if echo $LPSTAT | grep -A3 "^$rid" | grep -q "Filter failed"; then
+                echo " Filter failed, aborting!"
+                >&2 echo "$ lpstat -l"
+                >&2 echo "$LPSTAT"
+                # Get job-id from request-id; assume it's ${printer_name}-${job_id}
+                jobid=$(echo $rid | sed -e "s/^${DUMMY_PRINTER_NAME}-//g")
+                >&2 echo "$ grep "\[Job $jobid\]" /var/log/cups/error_log"
+                >&2 grep "\[Job $jobid\]" /var/log/cups/error_log
+            break
+            fi
+            echo -n "."
         done
         echo " done."
     done
-- 
cgit v1.2.3


From cc2600bbc458ab05129eb37ca020dc67d4d7f750 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 21 Sep 2019 09:41:44 +0200
Subject: cups 2.3.0-5 Debian release

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5be8e3a23..1a9774c4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.0-5) unstable; urgency=medium
+
+  * Let the test-drivers script stop waiting when a filter is allegedly
+    failed, and give context
+
+ -- Didier Raboud <odyx@debian.org>  Sat, 21 Sep 2019 09:41:44 +0200
+
 cups (2.3.0-4) unstable; urgency=medium
 
   [ Helge Kreutzmann ]
-- 
cgit v1.2.3


From f85a42b071cee3346c07e9d54d0c8a0241a3410d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 21 Sep 2019 18:13:18 +0200
Subject: Tests: Avoid double-dot, and sleep after check

---
 debian/tests/utils/test-drivers | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/tests/utils/test-drivers b/debian/tests/utils/test-drivers
index 97c24ada6..0325f5e5c 100755
--- a/debian/tests/utils/test-drivers
+++ b/debian/tests/utils/test-drivers
@@ -60,8 +60,6 @@ for driver in $DRIVERS_LIST; do
     
         # Wait for the print to finish
         while LPSTAT=`LANG=C /usr/bin/lpstat -l` && echo $LPSTAT | grep -q "^$rid "; do
-            /bin/sleep 1s
-            echo -n "."
             # If the filter is failed; stop the waiting and give as much context as possible
             if echo $LPSTAT | grep -A3 "^$rid" | grep -q "Filter failed"; then
                 echo " Filter failed, aborting!"
@@ -71,8 +69,9 @@ for driver in $DRIVERS_LIST; do
                 jobid=$(echo $rid | sed -e "s/^${DUMMY_PRINTER_NAME}-//g")
                 >&2 echo "$ grep "\[Job $jobid\]" /var/log/cups/error_log"
                 >&2 grep "\[Job $jobid\]" /var/log/cups/error_log
-            break
+                break
             fi
+            /bin/sleep 1s
             echo -n "."
         done
         echo " done."
-- 
cgit v1.2.3


From 26dd3290d711565dd65951ffea151b70333d2636 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@debian.org>
Date: Wed, 30 Oct 2019 08:50:54 +0000
Subject: AppArmor: support cups-pdf "Out" directory pointing to almost
 anywhere below $HOME (Closes: #940578)

---
 debian/local/apparmor-profile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/local/apparmor-profile b/debian/local/apparmor-profile
index 460455ed5..9b8d0668d 100644
--- a/debian/local/apparmor-profile
+++ b/debian/local/apparmor-profile
@@ -200,8 +200,6 @@
   /etc/papersize r,
   /etc/cups/cups-pdf.conf r,
   /etc/cups/ppd/*.ppd r,
-  @{HOME}/PDF/ rw,
-  @{HOME}/PDF/* rw,
   /usr/bin/gs ixr,
   /usr/lib/cups/backend/cups-pdf mr,
   /usr/lib/ghostscript/** mr,
@@ -209,4 +207,11 @@
   /var/log/cups/cups-pdf*_log w,
   /var/spool/cups/** r,
   /var/spool/cups-pdf/** rw,
+
+  # allow read and write on almost anything in @{HOME} (lenient, but
+  # private-files-strict is in effect), to support customized "Out"
+  # setting in cups-pdf.conf (Debian#940578)
+  #include <abstractions/private-files-strict>
+  @{HOME}/[^.]*/{,**/} rw,
+  @{HOME}/[^.]*/**     rw,
 }
-- 
cgit v1.2.3


From 68fb1127394bc523f5fc4a14f498cf51eadb29f5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sun, 22 Sep 2019 13:43:17 +0200
Subject: Don't skip the last echo done

---
 debian/tests/utils/test-drivers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/utils/test-drivers b/debian/tests/utils/test-drivers
index 0325f5e5c..1185a263d 100755
--- a/debian/tests/utils/test-drivers
+++ b/debian/tests/utils/test-drivers
@@ -29,7 +29,7 @@ cleanup() {
     # Delete it
     echo -n " - Interrupted (or finished), delete test printer:"
     rm -f ${DUMMY_PRINTER_STDERR_FILE}
-    /usr/sbin/lpadmin -x $DUMMY_PRINTER_NAME 2>/dev/null
+    /usr/sbin/lpadmin -x $DUMMY_PRINTER_NAME 2>/dev/null || :
     echo " done."
 }
 
-- 
cgit v1.2.3


From 7c97fa3f904d3fc113ce14c9b75f470f96c77d01 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 31 Oct 2019 08:44:29 +0100
Subject: cups 2.3.0-6 Debian release

---
 debian/changelog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1a9774c4b..fb7dadf08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cups (2.3.0-6) unstable; urgency=medium
+
+  [ Didier Raboud ]
+  * Tests-drivers: Cleanup output
+
+  [ intrigeri ]
+  * AppArmor: support cups-pdf "Out" directory pointing to almost anywhere
+    below $HOME (Closes: #940578)
+
+ -- Didier Raboud <odyx@debian.org>  Thu, 31 Oct 2019 08:44:29 +0100
+
 cups (2.3.0-5) unstable; urgency=medium
 
   * Let the test-drivers script stop waiting when a filter is allegedly
-- 
cgit v1.2.3


From d3490179e79939452fc28697930068ca86cc1d26 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 6 Nov 2019 08:43:26 +0100
Subject: Set upstream metadata fields: Repository.

---
 debian/upstream/metadata | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 40b96cc6a..d81ac7b77 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1 +1,2 @@
 Bug-Submit: https://github.com/apple/cups/issues
+Repository: https://github.com/apple/cups
-- 
cgit v1.2.3


From 791aac00292d6c1b4c60149ee5a8c6f5e40169d4 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 6 Nov 2019 08:43:27 +0100
Subject: Rely on pre-initialized dpkg-architecture variables.

Fixes lintian: debian-rules-sets-dpkg-architecture-variable
See https://lintian.debian.org/tags/debian-rules-sets-dpkg-architecture-variable.html for more details.
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index a0183ba3b..2a7cee2d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 # Add LDFLAGS to enable (hardening) build flags.
 export DSOFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+include /usr/share/dpkg/architecture.mk
 
 %:
 	dh $@ --without autoreconf
-- 
cgit v1.2.3


From c6fadef5e9ec01ced561ebc6fc8830e4868484ce Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 6 Nov 2019 08:43:28 +0100
Subject: Fix day-of-week for changelog entries 1.0.1-1.

Fixes lintian: debian-changelog-has-wrong-day-of-week
See https://lintian.debian.org/tags/debian-changelog-has-wrong-day-of-week.html for more details.
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fb7dadf08..a58408e52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8428,4 +8428,4 @@ cupsys (1.0.1-1) unstable; urgency=low
 
   * Initial Release.
 
- -- Jeff Licquia <licquia@debian.org>  Sun,  6 Nov 1999 20:58:02 -0500
+ -- Jeff Licquia <licquia@debian.org>  Sat, 06 Nov 1999 20:58:02 -0500
-- 
cgit v1.2.3


From ce202dee24493afc5b6d4125d25593a41167bd8b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 6 Nov 2019 08:44:22 +0100
Subject: Bump Standards-Version to 4.4.1 without changes needed

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 0f237262d..21f607152 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Build-Depends: debhelper-compat (= 12),
 # libgmp-dev is not GPL-2 compatible before it's 6 release, which makes it also GPL-2+
 Build-Conflicts: libgmp-dev (<< 2:6)
 Rules-Requires-Root: no
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/printing-team/cups
 Vcs-Git: https://salsa.debian.org/printing-team/cups.git
 Homepage: https://www.cups.org/
-- 
cgit v1.2.3


From a54164eda7d9ea8d98b7ad3f59cac327e76d8d61 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 6 Nov 2019 08:52:21 +0100
Subject: Replace dh-exec usage with manual renaming in debian/rules

---
 debian/control             | 1 -
 debian/cups-daemon.install | 7 +++----
 debian/rules               | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 debian/cups-daemon.install

diff --git a/debian/control b/debian/control
index 21f607152..854b27304 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Section: net
 Priority: optional
 Build-Depends: debhelper-compat (= 12),
                dh-apparmor,
-               dh-exec,
                patch,
                autoconf,
                automake,
diff --git a/debian/cups-daemon.install b/debian/cups-daemon.install
old mode 100755
new mode 100644
index 3597dc3c8..5405a21b4
--- a/debian/cups-daemon.install
+++ b/debian/cups-daemon.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec --with=install
 var/
 etc/cups/cups-files.conf
 usr/lib/cups/backend/ipp
@@ -12,6 +11,6 @@ usr/share/cups/cupsd.conf.default
 usr/share/cups/cups-files.conf.default
 usr/share/cups/snmp.conf.default
 usr/sbin/cupsd
-lib/systemd/system/org.cups.cupsd.socket  => lib/systemd/system/cups.socket
-lib/systemd/system/org.cups.cupsd.path    => lib/systemd/system/cups.path
-lib/systemd/system/org.cups.cupsd.service => lib/systemd/system/cups.service
+lib/systemd/system/cups.socket
+lib/systemd/system/cups.path
+lib/systemd/system/cups.service
diff --git a/debian/rules b/debian/rules
index 2a7cee2d8..19a8da87e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -158,6 +158,10 @@ endif
 
 
 override_dh_install:
+	# Rename the systemd service units to cups.* instead of org.cups.cupsd.*
+	set -e; for type in socket path service; do \
+	    mv debian/tmp/lib/systemd/system/org.cups.cupsd.$$type debian/tmp/lib/systemd/system/cups.$$type ;\
+	done
 	dh_install
 
 ifneq (,$(filter cups-server-common,$(shell dh_listpackages)))
-- 
cgit v1.2.3


From 80194b757cc571b18dc75dc88349bb28db8aa6eb Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 6 Nov 2019 08:57:40 +0100
Subject: cups 2.3.0-7 Debian release

---
 debian/changelog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a58408e52..a40d3ae4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cups (2.3.0-7) unstable; urgency=medium
+
+  * Packaging cleanup:
+    - Set upstream metadata fields: Repository
+    - Rely on pre-initialized dpkg-architecture variables
+    - Fix day-of-week for changelog entries 1.0.1-1
+    - Bump Standards-Version to 4.4.1 without changes needed
+    - Replace dh-exec usage with manual renaming in debian/rules
+
+ -- Didier Raboud <odyx@debian.org>  Wed, 06 Nov 2019 08:57:40 +0100
+
 cups (2.3.0-6) unstable; urgency=medium
 
   [ Didier Raboud ]
-- 
cgit v1.2.3


From 93e241fb4dfb011889884b1e7ff1a7cfa3a4a3f7 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:04 +0200
Subject: For PWG Raster, add required IPP attributes

Add required by IPP Everywhere for PWG Raster when PWG Raster as input format
is supported

Bug-Upstream: https://www.cups.org/str.php?L4428
Last-Update: 2015-02-10
Patch-Name: pwg-raster-attributes.patch

Gbp-Pq: Name pwg-raster-attributes.patch
---
 scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 80690397d..440aac196 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
   cupsd_location_t *auth;		/* Pointer to authentication element */
   const char	*auth_supported;	/* Authentication supported */
   ipp_t		*oldattrs;		/* Old printer attributes */
-  ipp_attribute_t *attr;		/* Attribute data */
+  ipp_attribute_t *attr, *attr2;	/* Attribute data */
   char		*name,			/* Current user/group name */
 		*filter;		/* Current filter */
+  mime_type_t   *type;
 
 
  /*
@@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
 
   add_printer_formats(p);
 
+  /* 
+   * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input
+   * is supported
+   */
+  for (type = (mime_type_t *)cupsArrayFirst(p->filetypes);
+       type;
+       type = (mime_type_t *)cupsArrayNext(p->filetypes))
+  {
+    if (!_cups_strcasecmp(type->super, "image"))
+    {
+      if (!_cups_strcasecmp(type->type, "pwg-raster"))
+      {
+	if (p->ppd_attrs != NULL &&
+	    (attr = ippFindAttribute(p->ppd_attrs,
+				     "printer-resolution-supported",
+				     IPP_TAG_ZERO)) != NULL)
+	{
+	  attr2 = ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
+				    "pwg-raster-document-resolution-supported",
+				    attr->num_values, IPP_RES_PER_INCH,
+				    NULL, NULL);
+	  for (i = 0; i < attr->num_values; i ++)
+	  {
+	    attr2->values[i].resolution.xres =
+	      attr->values[i].resolution.xres;
+	    attr2->values[i].resolution.yres =
+	      attr->values[i].resolution.yres;
+	    attr2->values[i].resolution.units = IPP_RES_PER_INCH;
+	  }
+	}
+	else
+	{
+	  static const int	pwg_raster_document_resolution_supported[] =
+	  {
+	    300,
+	    600,
+	    1200
+	  };
+	  ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
+			    "pwg-raster-document-resolution-supported",
+			    (int)(sizeof(pwg_raster_document_resolution_supported) /
+				  sizeof(pwg_raster_document_resolution_supported[0])),
+			    IPP_RES_PER_INCH,
+			    pwg_raster_document_resolution_supported,
+			    pwg_raster_document_resolution_supported);
+	}
+	ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
+		     "pwg-raster-document-sheet-back", NULL, "normal");
+	static const char * const pwg_raster_document_type_supported[] =
+	{
+	  "adobergb-8",
+	  "adobergb-16",
+	  "black-1",
+	  "black-8",
+	  "black-16",
+	  "cmyk-8",
+	  "cmyk-16",
+	  "rgb-8",
+	  "rgb-16",
+	  "sgray-1",
+	  "sgray-8",
+	  "sgray-16",
+	  "srgb-8",
+	  "srgb-16"
+	};
+	ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
+		      "pwg-raster-document-type-supported",
+		      (int)(sizeof(pwg_raster_document_type_supported) /
+			    sizeof(pwg_raster_document_type_supported[0])), NULL,
+		      pwg_raster_document_type_supported);
+      }
+    }
+  }
+
  /*
   * Add name-default attributes...
   */
-- 
cgit v1.2.3


From 5546653f1109a4dcaff51c71e4cabba9443e5e3d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://cups.org/str.php?L4299
Last-Update: 2015-02-10

Patch-Name: manpage-hyphen-minus.patch

Gbp-Pq: Name manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From f80de490577797bfe1c9f15554023d42b38dfa8a Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: http://www.cups.org/str.php?L2935
Bug-Debian: http://bugs.debian.org/410171

Gbp-Pq: Name 0003-Install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From 03f2fb2718c016cf5de678e66609cf89324209fb Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://www.cups.org/str.php?L4348
Last-Updated: 2015-02-10
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch

Gbp-Pq: Name fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From c68b2c6a4ddb570a84a031e18df8aaf25e4c9d5e Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Last-Update: 2015-08-05

Patch-Name: tests-ignore-warnings.patch

Gbp-Pq: Name tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From e092c1575ebb1d918c7c89c88848a4ebdf78c704 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Last-Update: 2015-02-10

Patch-Name: tests-ignore-usb-crash.patch

Gbp-Pq: Name tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From a8899f3fd430b901ab33bacff60d3a6e2b51c782 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch

Gbp-Pq: Name tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 3ce341b0cc4bc58b015c22a1bee94bee2dfd8233 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch

Gbp-Pq: Name tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 409221712326f80db8f4d273f87dbf0b743a7d11 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Last-Update: 2016-08-09

Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch

Gbp-Pq: Name tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 581ba5f764ff81be161eb62dea5b2e89ca1a42b3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: http://bugs.debian.org/662996

Last-Update: 2015-10-02
Patch-Name: test-i18n-nonlinux.patch

Gbp-Pq: Name test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 2f14aadf663f8b3a8c8f17068c65ba4285f146ac Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: http://bugs.debian.org/670878
Last-Update: 2015-02-10

Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch

Gbp-Pq: Name tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..492982005 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From 19462e8dd2b1efd4133c1410b0b529cfae9f129f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch

Gbp-Pq: Name tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From e259d026d2dbad2c65028750230027ae79ae3e03 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Last-Update: 2016-08-05
Patch-Name: tests-use-ipv4-lo-address.patch

Gbp-Pq: Name tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 492982005..3f0becde9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From abd6c36a3bcca60aee7aee3dc20fe01064375db4 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Last-Update: 2016-07-11
Patch-Name: tests-make-lpstat-call-reproducible.patch

Gbp-Pq: Name tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 3f0becde9..baebdeec9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From d164e918237fdac5c402927ea93c383caaf7908b Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream

Patch-Name: tests-no-pdftourf.patch

Gbp-Pq: Name tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index baebdeec9..001e2f61f 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From 85872a9fe41b5820c5384c62c75f4c12ca764216 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://cups.org/str.php?L4342
Bug-Debian: http://bugs.debian.org/640124
Last-Update: 2015-02-10

Patch-Name: move-cupsd-conf-default-to-share.patch

Gbp-Pq: Name move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 4c694e2f900cb2b32bb2d67a6f1f7fa1909b2ca1 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: http://bugs.debian.org/700961
Bug: https://cups.org/str.php?L4341
Last-Update: 2015-02-10

Patch-Name: airprint-support.patch

Gbp-Pq: Name airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 440aac196..6223ef7ea 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3806,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From c7ef0be7839035f5707a16b11792af2f3ba66467 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://www.cups.org/str.php?L3552

Gbp-Pq: Name 0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 54cfd1be6d9e3bbc81083018bde67b8dfe7f4252 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673

Patch-Name: no-conffile-timestamp.patch

Gbp-Pq: Name no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 6223ef7ea..53bc62a79 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 0170609835373c0a336554d7c78e007ef749b4de Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: http://www.cups.org/str.php?L2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Last-Update: 2014-01-16

Patch-Name: removecvstag.patch

Gbp-Pq: Name removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From e82802bb3f77d3db2c3bc4ee4e5f56f02708aefd Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch

Gbp-Pq: Name rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From f3c8d4c26d1ff5d55ffe1fbb7abd6d5c1febffd3 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586

Patch-Name: do-not-broadcast-with-hostnames.patch

Gbp-Pq: Name do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 8a9afbc84c8e3ed843b756954a96d46491f92b57 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Last-Update: 2015-02-10

Patch-Name: reactivate_recommended_driver.patch

Gbp-Pq: Name reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 7b577a7f676e83d2fee6cce7f9c14789d2aecf1e Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953

Last-Update: 2015-02-10
Patch-Name: logfiles_adm_readable.patch

Gbp-Pq: Name logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From c2e740fd95984349bb8c5c3ca239e7a412be2290 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Last-Update: 2015-02-10

Patch-Name: default_log_settings.patch

Gbp-Pq: Name default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From 9ee12f2cd40c2bf70f566d469fb11e97635f0a50 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Last-Update: 2015-02-10

Patch-Name: confdirperms.patch

Gbp-Pq: Name confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From fffa325268e974a277ce64bcf96c384991d058eb Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch

Gbp-Pq: Name show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From 032e24421dc86c4688ba7e28b51594d0d075ba20 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Last-Update: 2015-02-10

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch

Gbp-Pq: Name cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 211e2073ab7f968c3a6e4be56a5b328e07de5e21 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job", since it is less

 confusing and a better default on most machines.
 .
 Amend documentation accordingly.
Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Last-Update: 2016-07-03

Patch-Name: cups-set-default-error-policy-retry-job.patch

Gbp-Pq: Name cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From f0ad802a3102c7be57acd3c223e0dc68eb722c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: http://bugs.debian.org/570157
Last-Update: 2015-10-02
Patch-Name: man-cups-lpd-drop-dangling-references.patch

Gbp-Pq: Name man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 8a5b71ad3dabffccf18a356e3f7af2e92b49549f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Last-Update: 2014-06-11
Patch-Name: debianize_cups-config.patch

Gbp-Pq: Name debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 3da43e35c5c36d500d21d8646cb7e0e046fac224 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936

Gbp-Pq: Name 0035-Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 23abe870e..04ac4ff50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From dc25127fee43ebb2acbb19b0e9d13481f2d2d85e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: http://bugs.debian.org/478597

Patch-Name: manpage-translations.patch

Gbp-Pq: Name manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From c97befbf5a943ec1ed81b7139734a51af9a768ce Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 13 Dec 2019 17:30:47 +0100
Subject: Update manpage translations for 2.3.1

---
 debian/manpage-po4a/po/cups.pot | 344 +++++++++++++++----------
 debian/manpage-po4a/po/de.po    | 545 +++++++++++++++++++++++-----------------
 debian/manpage-po4a/po/fr.po    | 404 +++++++++++++++++------------
 3 files changed, 765 insertions(+), 528 deletions(-)

diff --git a/debian/manpage-po4a/po/cups.pot b/debian/manpage-po4a/po/cups.pot
index 8a1ad0ac8..6620a7f8a 100644
--- a/debian/manpage-po4a/po/cups.pot
+++ b/debian/manpage-po4a/po/cups.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-09-02 10:31+0200\n"
+"POT-Creation-Date: 2019-12-13 17:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgid "CUPS"
 msgstr ""
 
 #. type: TH
-#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10 cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10 cupsfilter.8:9 cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10 cupstestppd.1:10 filter.7:10 ippfind.1:9 ipptool.1:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10 lpmove.8:10 lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9 mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10 ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10 printers.conf.5:9 subscriptions.conf.5:10
+#: backend.7:10 cancel.1:10 classes.conf.5:10 cups.1:10 cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10 cupsfilter.8:9 cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10 cupstestppd.1:10 filter.7:10 ippfind.1:9 ipptool.1:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10 lpmove.8:10 lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9 mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10 ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10 printers.conf.5:9 subscriptions.conf.5:10
 #, no-wrap
 msgid "26 April 2019"
 msgstr ""
@@ -119,7 +119,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: backend.7:49 cancel.1:37 classes.conf.5:13 client.conf.5:13 cups.1:13 cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:13 cupsd-helper.8:46 cupsd-logs.5:13 cupsenable.8:46 cups-files.conf.5:13 cupsfilter.8:54 cups-lpd.8:23 cups-snmp.8:23 cups-snmp.conf.5:13 cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:79 ippfind.1:32 ipptool.1:75 ipptoolfile.5:12 lp.1:84 lpadmin.8:54 lpc.8:20 lpinfo.8:60 lpmove.8:37 lpoptions.1:53 lpq.1:31 lpr.1:53 lprm.1:31 lpstat.1:65 mailto.conf.5:13 mime.convs.5:13 mime.types.5:13 notifier.7:19 ppdc.1:45 ppdcfile.5:13 ppdhtml.1:22 ppdi.1:26 ppdmerge.1:24 ppdpo.1:25 printers.conf.5:12 subscriptions.conf.5:13
+#: backend.7:49 cancel.1:37 classes.conf.5:13 client.conf.5:13 cups.1:13 cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:13 cupsd-helper.8:46 cupsd-logs.5:13 cupsenable.8:46 cups-files.conf.5:13 cupsfilter.8:54 cups-lpd.8:23 cups-snmp.8:23 cups-snmp.conf.5:13 cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:84 ippfind.1:32 ipptool.1:75 ipptoolfile.5:12 lp.1:84 lpadmin.8:54 lpc.8:20 lpinfo.8:60 lpmove.8:37 lpoptions.1:53 lpq.1:31 lpr.1:53 lprm.1:31 lpstat.1:65 mailto.conf.5:13 mime.convs.5:13 mime.types.5:13 notifier.7:19 ppdc.1:45 ppdcfile.5:13 ppdhtml.1:22 ppdi.1:26 ppdmerge.1:24 ppdpo.1:25 printers.conf.5:12 subscriptions.conf.5:13
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
@@ -309,7 +309,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: backend.7:135 cupsfilter.8:102 cupstestppd.1:110 ippevepcl.7:39 ippeveprinter.1:183 ippfind.1:214 ipptool.1:191
+#: backend.7:135 cupsfilter.8:102 cupstestppd.1:110 ippevepcl.7:39 ippeveprinter.1:200 ippfind.1:214 ipptool.1:191
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr ""
@@ -434,7 +434,7 @@ msgid "All other exit code values are reserved."
 msgstr ""
 
 #. type: SH
-#: backend.7:173 cups.1:60 cupsfilter.8:105 cups-snmp.8:37 ippevepcl.7:41 ippeveprinter.1:194 ippfind.1:216
+#: backend.7:173 cups.1:60 cupsfilter.8:105 cups-snmp.8:37 ippevepcl.7:41 ippeveprinter.1:211 ippfind.1:216
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
@@ -469,7 +469,7 @@ msgid "I</etc/cups/cups-files.conf>"
 msgstr ""
 
 #. type: SH
-#: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:110 cups.1:122 cupsd.conf.5:858 cupsd-helper.8:77 cups-files.conf.5:273 cupsfilter.8:117 cups-lpd.8:60 cups-snmp.8:44 cups-snmp.conf.5:58 cupstestppd.1:138 filter.7:201 lpadmin.8:203 lpc.8:40 lpinfo.8:117 lpr.1:151 mime.convs.5:50 ppdc.1:90 ppdcfile.5:149 ppdhtml.1:35 ppdi.1:42 ppdmerge.1:35 ppdpo.1:42 printers.conf.5:16 subscriptions.conf.5:19
+#: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:126 cups.1:122 cupsd.conf.5:858 cupsd-helper.8:77 cups-files.conf.5:273 cupsfilter.8:117 cups-lpd.8:60 cups-snmp.8:44 cups-snmp.conf.5:58 cupstestppd.1:138 filter.7:201 lpadmin.8:203 lpc.8:40 lpinfo.8:117 lpr.1:151 mime.convs.5:50 ppdc.1:90 ppdcfile.5:149 ppdhtml.1:35 ppdi.1:42 ppdmerge.1:35 ppdpo.1:42 printers.conf.5:16 subscriptions.conf.5:19
 #, no-wrap
 msgid "NOTES"
 msgstr ""
@@ -506,7 +506,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:122 cups.1:126 cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:895 cupsd-helper.8:81 cupsd-logs.5:216 cupsenable.8:88 cups-files.conf.5:280 cupsfilter.8:131 cups-lpd.8:111 cups-snmp.8:49 cups-snmp.conf.5:62 cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:251 ippfind.1:255 ipptool.1:246 ipptoolfile.5:649 lp.1:219 lpadmin.8:224 lpc.8:47 lpinfo.8:121 lpmove.8:66 lpoptions.1:110 lpq.1:56 lpr.1:171 lprm.1:74 lpstat.1:140 mailto.conf.5:40 mime.convs.5:54 mime.types.5:100 notifier.7:31 ppdc.1:94 ppdcfile.5:153 ppdhtml.1:39 ppdi.1:46 ppdmerge.1:42 ppdpo.1:46 printers.conf.5:18 subscriptions.conf.5:21
+#: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:138 cups.1:126 cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:895 cupsd-helper.8:81 cupsd-logs.5:216 cupsenable.8:88 cups-files.conf.5:280 cupsfilter.8:131 cups-lpd.8:111 cups-snmp.8:49 cups-snmp.conf.5:62 cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:268 ippfind.1:255 ipptool.1:246 ipptoolfile.5:649 lp.1:219 lpadmin.8:224 lpc.8:47 lpinfo.8:121 lpmove.8:66 lpoptions.1:110 lpq.1:56 lpr.1:171 lprm.1:74 lpstat.1:140 mailto.conf.5:40 mime.convs.5:54 mime.types.5:100 notifier.7:31 ppdc.1:94 ppdcfile.5:153 ppdhtml.1:39 ppdi.1:46 ppdmerge.1:42 ppdpo.1:46 printers.conf.5:18 subscriptions.conf.5:21
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -524,13 +524,13 @@ msgid "CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
 #. type: SH
-#: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:126 cups.1:142 cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:904 cupsd-helper.8:89 cupsd-logs.5:221 cupsenable.8:96 cups-files.conf.5:290 cupsfilter.8:138 cups-lpd.8:118 cups-snmp.8:55 cups-snmp.conf.5:65 cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:255 ippfind.1:257 ipptool.1:251 ipptoolfile.5:654 lp.1:228 lpadmin.8:230 lpc.8:57 lpinfo.8:124 lpmove.8:73 lpoptions.1:117 lpq.1:63 lpr.1:180 lprm.1:81 lpstat.1:147 mailto.conf.5:43 mime.convs.5:61 mime.types.5:107 notifier.7:35 ppdc.1:101 ppdcfile.5:160 ppdhtml.1:46 ppdi.1:53 ppdmerge.1:49 ppdpo.1:53 printers.conf.5:27 subscriptions.conf.5:30
+#: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:142 cups.1:142 cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:904 cupsd-helper.8:89 cupsd-logs.5:221 cupsenable.8:96 cups-files.conf.5:290 cupsfilter.8:138 cups-lpd.8:118 cups-snmp.8:55 cups-snmp.conf.5:65 cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:272 ippfind.1:257 ipptool.1:251 ipptoolfile.5:654 lp.1:228 lpadmin.8:230 lpc.8:57 lpinfo.8:124 lpmove.8:73 lpoptions.1:117 lpq.1:63 lpr.1:180 lprm.1:81 lpstat.1:147 mailto.conf.5:43 mime.convs.5:61 mime.types.5:107 notifier.7:35 ppdc.1:101 ppdcfile.5:160 ppdhtml.1:46 ppdi.1:53 ppdmerge.1:49 ppdpo.1:53 printers.conf.5:27 subscriptions.conf.5:30
 #, no-wrap
 msgid "COPYRIGHT"
 msgstr ""
 
 #. type: Plain text
-#: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:127 cups.1:143 cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:905 cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cups-files.conf.5:291 cupsfilter.8:139 cups-lpd.8:119 cups-snmp.8:56 cups-snmp.conf.5:66 cupstestppd.1:147 filter.7:221 ippeveprinter.1:256 ipptool.1:252 ipptoolfile.5:655 lp.1:229 lpadmin.8:231 lpc.8:58 lpinfo.8:125 lpmove.8:74 lpoptions.1:118 lpq.1:64 lpr.1:181 lprm.1:82 lpstat.1:148 mailto.conf.5:44 mime.convs.5:62 mime.types.5:108 notifier.7:36 ppdc.1:102 ppdcfile.5:161 ppdhtml.1:47 ppdi.1:54 ppdmerge.1:50 ppdpo.1:54 printers.conf.5:28 subscriptions.conf.5:31
+#: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:143 cups.1:143 cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:905 cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cups-files.conf.5:291 cupsfilter.8:139 cups-lpd.8:119 cups-snmp.8:56 cups-snmp.conf.5:66 cupstestppd.1:147 filter.7:221 ippeveprinter.1:273 ipptool.1:252 ipptoolfile.5:655 lp.1:229 lpadmin.8:231 lpc.8:58 lpinfo.8:125 lpmove.8:74 lpoptions.1:118 lpq.1:64 lpr.1:181 lprm.1:82 lpstat.1:148 mailto.conf.5:44 mime.convs.5:62 mime.types.5:108 notifier.7:36 ppdc.1:102 ppdcfile.5:161 ppdhtml.1:47 ppdi.1:54 ppdmerge.1:50 ppdpo.1:54 printers.conf.5:28 subscriptions.conf.5:31
 msgid "Copyright \\[co] 2007-2019 by Apple Inc."
 msgstr ""
 
@@ -562,7 +562,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: cancel.1:40 cupsaccept.8:50 cups-config.1:52 cupsctl.8:40 cupsd.8:37 cupsd.conf.5:485 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:32 cupstestppd.1:58 filter.7:60 ippeveprinter.1:82 ippfind.1:191 ipptool.1:88 lp.1:94 lpadmin.8:73 lpinfo.8:63 lpmove.8:39 lpoptions.1:68 lpq.1:36 lpr.1:64 lprm.1:36 lpstat.1:68 ppdc.1:48 ppdhtml.1:25 ppdi.1:30 ppdmerge.1:28 ppdpo.1:28
+#: cancel.1:40 cupsaccept.8:50 cups-config.1:52 cupsctl.8:40 cupsd.8:37 cupsd.conf.5:485 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:32 cupstestppd.1:58 filter.7:60 ippeveprinter.1:87 ippfind.1:191 ipptool.1:88 lp.1:94 lpadmin.8:73 lpinfo.8:63 lpmove.8:39 lpoptions.1:68 lpq.1:36 lpr.1:64 lprm.1:36 lpstat.1:68 ppdc.1:48 ppdhtml.1:25 ppdi.1:30 ppdmerge.1:28 ppdpo.1:28
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
@@ -641,7 +641,7 @@ msgid "Deletes job data files in addition to canceling."
 msgstr ""
 
 #. type: SH
-#: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:873 cupsenable.8:77 cups-lpd.8:46 cups-snmp.8:47 filter.7:199 ippeveprinter.1:190 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97 lpoptions.1:108 lprm.1:52 lpstat.1:133
+#: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:873 cupsenable.8:77 cups-lpd.8:46 cups-snmp.8:47 filter.7:199 ippeveprinter.1:207 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97 lpoptions.1:108 lprm.1:52 lpstat.1:133
 #, no-wrap
 msgid "CONFORMING TO"
 msgstr ""
@@ -655,7 +655,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:875 cupstestppd.1:125 ippeveprinter.1:235 ippfind.1:242 ipptool.1:233 lp.1:201 lpinfo.8:99 lpmove.8:50 lpr.1:153 lprm.1:56 mime.convs.5:43 mime.types.5:89
+#: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:875 cupstestppd.1:125 ippeveprinter.1:252 ippfind.1:242 ipptool.1:233 lp.1:201 lpinfo.8:99 lpmove.8:50 lpr.1:153 lprm.1:56 mime.convs.5:43 mime.types.5:89
 #, no-wrap
 msgid "EXAMPLES"
 msgstr ""
@@ -749,6 +749,12 @@ msgstr ""
 msgid "client.conf"
 msgstr ""
 
+#. type: TH
+#: client.conf.5:10
+#, no-wrap
+msgid "15 October 2019"
+msgstr ""
+
 #. type: Plain text
 #: client.conf.5:13
 msgid "client.conf - client configuration file for cups (deprecated on macos)"
@@ -780,82 +786,107 @@ msgstr ""
 msgid "DIRECTIVES"
 msgstr ""
 
+#. #AllowAnyRoot
 #. type: Plain text
-#: client.conf.5:23
+#: client.conf.5:24
 msgid ""
 "The following directives are understood by the client. Consult the online "
 "help for detailed descriptions:"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:23
+#: client.conf.5:24
 #, no-wrap
 msgid "B<AllowAnyRoot Yes>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:25
+#: client.conf.5:26
 #, no-wrap
 msgid "B<AllowAnyRoot No>"
 msgstr ""
 
+#. #AllowExpiredCerts
 #. type: Plain text
-#: client.conf.5:29
+#: client.conf.5:31
 msgid ""
 "Specifies whether to allow TLS with certificates that have not been signed "
 "by a trusted Certificate Authority.  The default is \"Yes\"."
 msgstr ""
 
 #. type: TP
-#: client.conf.5:29
+#: client.conf.5:31
 #, no-wrap
 msgid "B<AllowExpiredCerts Yes>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:31
+#: client.conf.5:33
 #, no-wrap
 msgid "B<AllowExpiredCerts No>"
 msgstr ""
 
+#. #DigestOptions
 #. type: Plain text
-#: client.conf.5:35
+#: client.conf.5:38
 msgid ""
 "Specifies whether to allow TLS with expired certificates.  The default is "
 "\"No\"."
 msgstr ""
 
 #. type: TP
-#: client.conf.5:35 cupsd.conf.5:732
+#: client.conf.5:38
+#, no-wrap
+msgid "B<DigestOptions DenyMD5>"
+msgstr ""
+
+#. type: TP
+#: client.conf.5:40
+#, no-wrap
+msgid "B<DigestOptions None>"
+msgstr ""
+
+#. #Encryption
+#. type: Plain text
+#: client.conf.5:45
+msgid ""
+"Specifies HTTP Digest authentication options.  B<DenyMD5> disables support "
+"for the original MD5 hash algorithm."
+msgstr ""
+
+#. type: TP
+#: client.conf.5:45 cupsd.conf.5:732
 #, no-wrap
 msgid "B<Encryption IfRequested>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:37 cupsd.conf.5:734
+#: client.conf.5:47 cupsd.conf.5:734
 #, no-wrap
 msgid "B<Encryption Never>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:39 cupsd.conf.5:736
+#: client.conf.5:49 cupsd.conf.5:736
 #, no-wrap
 msgid "B<Encryption Required>"
 msgstr ""
 
+#. #GSSServiceName
 #. type: Plain text
-#: client.conf.5:42
+#: client.conf.5:53
 msgid "Specifies the level of encryption that should be used."
 msgstr ""
 
 #. type: TP
-#: client.conf.5:42 cupsd.conf.5:165
+#: client.conf.5:53 cupsd.conf.5:165
 #, no-wrap
 msgid "B<GSSServiceName >I<name>"
 msgstr ""
 
+#. #ServerName
 #. type: Plain text
-#: client.conf.5:46
+#: client.conf.5:58
 msgid ""
 "Specifies the Kerberos service name that is used for authentication, "
 "typically \"host\", \"http\", or \"ipp\".  CUPS adds the remote hostname "
@@ -863,39 +894,40 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: client.conf.5:46
+#: client.conf.5:58
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:48
+#: client.conf.5:60
 #, no-wrap
 msgid "B<ServerName >I</domain/socket>"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.5:52
+#: client.conf.5:64
 msgid ""
 "Specifies the address and optionally the port to use when connecting to the "
 "server.  B<Note: This directive is not supported on macOS 10.7 or later.>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:52
+#: client.conf.5:64
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]B</version=1.1>"
 msgstr ""
 
+#. #SSLOptions
 #. type: Plain text
-#: client.conf.5:55
+#: client.conf.5:68
 msgid ""
 "Specifies the address and optionally the port to use when connecting to a "
 "server running CUPS 1.3.12 and earlier."
 msgstr ""
 
 #. type: TP
-#: client.conf.5:55 cupsd.conf.5:437
+#: client.conf.5:68 cupsd.conf.5:437
 #, no-wrap
 msgid ""
 "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] "
@@ -904,14 +936,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: client.conf.5:57 cupsd.conf.5:439
+#: client.conf.5:70 cupsd.conf.5:439
 #, no-wrap
 msgid "B<SSLOptions None>"
 msgstr ""
 
 #. #SSLPort
 #. type: Plain text
-#: client.conf.5:71 cupsd.conf.5:454
+#: client.conf.5:85 cupsd.conf.5:454
 msgid ""
 "Sets encryption options (only in /etc/cups/client.conf).  By default, CUPS "
 "only supports encryption using TLS v1.0 or higher using known secure cipher "
@@ -929,80 +961,82 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: client.conf.5:71
+#: client.conf.5:85
 #, no-wrap
 msgid "B<TrustOnFirstUse Yes>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:73
+#: client.conf.5:87
 #, no-wrap
 msgid "B<TrustOnFirstUse No>"
 msgstr ""
 
+#. #User
 #. type: Plain text
-#: client.conf.5:77
+#: client.conf.5:92
 msgid ""
 "Specifies whether to trust new TLS certificates by default.  The default is "
 "\"Yes\"."
 msgstr ""
 
 #. type: TP
-#: client.conf.5:77
+#: client.conf.5:92
 #, no-wrap
 msgid "B<User >I<name>"
 msgstr ""
 
 #. #UserAgentTokens
 #. type: Plain text
-#: client.conf.5:81
+#: client.conf.5:96
 msgid "Specifies the default user name to use for requests."
 msgstr ""
 
 #. type: TP
-#: client.conf.5:81
+#: client.conf.5:96
 #, no-wrap
 msgid "B<UserAgentTokens None>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:83
+#: client.conf.5:98
 #, no-wrap
 msgid "B<UserAgentTokens ProductOnly>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:85
+#: client.conf.5:100
 #, no-wrap
 msgid "B<UserAgentTokens Major>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:87
+#: client.conf.5:102
 #, no-wrap
 msgid "B<UserAgentTokens Minor>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:89
+#: client.conf.5:104
 #, no-wrap
 msgid "B<UserAgentTokens Minimal>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:91
+#: client.conf.5:106
 #, no-wrap
 msgid "B<UserAgentTokens OS>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:93
+#: client.conf.5:108
 #, no-wrap
 msgid "B<UserAgentTokens Full>"
 msgstr ""
 
+#. #ValidateCerts
 #. type: Plain text
-#: client.conf.5:104
+#: client.conf.5:120
 msgid ""
 "Specifies what information is included in the User-Agent header of HTTP "
 "requests.  \"None\" disables the User-Agent header.  \"ProductOnly\" reports "
@@ -1014,26 +1048,26 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: client.conf.5:104
+#: client.conf.5:120
 #, no-wrap
 msgid "B<ValidateCerts Yes>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:106
+#: client.conf.5:122
 #, no-wrap
 msgid "B<ValidateCerts No>"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.5:110
+#: client.conf.5:126
 msgid ""
 "Specifies whether to only allow TLS with certificates whose common name "
 "matches the hostname.  The default is \"No\"."
 msgstr ""
 
 #. type: Plain text
-#: client.conf.5:115
+#: client.conf.5:131
 msgid ""
 "The B<client.conf> file is deprecated on macOS and will no longer be "
 "supported in a future version of CUPS.  Configuration settings can instead "
@@ -1041,7 +1075,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: client.conf.5:118
+#: client.conf.5:134
 #, no-wrap
 msgid ""
 "defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption "
@@ -1051,13 +1085,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: client.conf.5:120
+#: client.conf.5:136
 #, no-wrap
 msgid "defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption\n"
 msgstr ""
 
 #. type: Plain text
-#: client.conf.5:122
+#: client.conf.5:138
 msgid ""
 "On Linux and other systems using GNU TLS, the I</etc/cups/ssl/site.crl> "
 "file, if present, provides a list of revoked X.509 certificates and is used "
@@ -1065,7 +1099,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: client.conf.5:126
+#: client.conf.5:142
 msgid "B<cups>(1), B<default>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
@@ -1654,7 +1688,7 @@ msgid "Reports the default CUPS data directory."
 msgstr ""
 
 #. type: TP
-#: cups-config.1:66 ippeveprinter.1:85 ippfind.1:193 ipptool.1:91
+#: cups-config.1:66 ippeveprinter.1:90 ippfind.1:193 ipptool.1:91
 #, no-wrap
 msgid "B<--help>"
 msgstr ""
@@ -1724,7 +1758,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cups-config.1:84 ippeveprinter.1:91 ippfind.1:196 ipptool.1:106
+#: cups-config.1:84 ippeveprinter.1:100 ippfind.1:196 ipptool.1:106
 #, no-wrap
 msgid "B<--version>"
 msgstr ""
@@ -7890,7 +7924,7 @@ msgstr ""
 #. type: TH
 #: ippeveprinter.1:9
 #, no-wrap
-msgid "17 May 2019"
+msgid "2 December 2019"
 msgstr ""
 
 #. type: Plain text
@@ -7899,20 +7933,21 @@ msgid "ippeveprinter - an ipp everywhere printer application for cups"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:79
+#: ippeveprinter.1:84
 msgid ""
-"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] [ "
-"B<-2> ] [ B<-D> I<device-uri> ] [ B<-F> I<output-type/subtype> ] [ B<-K> "
-"I<keypath> ] [ B<-M> I<manufacturer> ] [ B<-P> I<filename.ppd> ] [ B<-V> "
-"I<ipp-version> ] [ B<-a> I<filename.conf> ] [ B<-c> I<command> ] [ B<-d> "
-"I<spool-directory> ] [ B<-f> I<type/subtype[,...]> ] [ B<-i> I<iconfile.png> "
-"] [ B<-k> ] [ B<-l> I<location> ] [ B<-m> I<model> ] [ B<-n> I<hostname> ] [ "
-"B<-p> I<port> ] [ B<-r> I<subtype[,subtype]> ] [ B<-s> "
-"I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
+"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--pam-service> "
+"I<service> ] [ B<--version> ] [ B<-2> ] [ B<-A> ] [ B<-D> I<device-uri> ] [ "
+"B<-F> I<output-type/subtype> ] [ B<-K> I<keypath> ] [ B<-M> I<manufacturer> "
+"] [ B<-P> I<filename.ppd> ] [ B<-V> I<ipp-version> ] [ B<-a> "
+"I<filename.conf> ] [ B<-c> I<command> ] [ B<-d> I<spool-directory> ] [ B<-f> "
+"I<type/subtype[,...]> ] [ B<-i> I<iconfile.png> ] [ B<-k> ] [ B<-l> "
+"I<location> ] [ B<-m> I<model> ] [ B<-n> I<hostname> ] [ B<-p> I<port> ] [ "
+"B<-r> I<subtype[,subtype]> ] [ B<-s> I<speed[,color-speed]> ] [ B<-v[vvv]> ] "
+"I<service-name>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:82
+#: ippeveprinter.1:87
 msgid ""
 "B<ippeveprinter> is a simple Internet Printing Protocol (IPP) server "
 "conforming to the IPP Everywhere (PWG 5100.14) specification. It can be used "
@@ -7921,50 +7956,74 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:85
+#: ippeveprinter.1:90
 msgid "The following options are recognized by B<ippeveprinter:>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:88
+#: ippeveprinter.1:93
 msgid "Show program usage."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:88
+#: ippeveprinter.1:93
 #, no-wrap
 msgid "B<--no-web-forms>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:91
+#: ippeveprinter.1:96
 msgid "Disable the web interface forms used to update the media and supply levels."
 msgstr ""
 
+#. type: TP
+#: ippeveprinter.1:96
+#, no-wrap
+msgid "B<--pam-service >I<service>"
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:100
+msgid "Set the PAM service name.  The default service is \"cups\"."
+msgstr ""
+
 #. type: Plain text
-#: ippeveprinter.1:94
+#: ippeveprinter.1:103
 msgid "Show the CUPS version."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:94
+#: ippeveprinter.1:103
 #, no-wrap
 msgid "B<-2>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:97
+#: ippeveprinter.1:106
 msgid "Report support for two-sided (duplex) printing."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:97
+#: ippeveprinter.1:106
+#, no-wrap
+msgid "B<-A>"
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:111
+msgid ""
+"Enable authentication for the created printer.  B<ippeveprinter> uses PAM to "
+"authenticate HTTP Basic credentials."
+msgstr ""
+
+#. type: TP
+#: ippeveprinter.1:111
 #, no-wrap
 msgid "B<-D >I<device-uri>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:104
+#: ippeveprinter.1:118
 msgid ""
 "Set the device URI for print output.  The URI can be a filename, directory, "
 "or a network socket URI of the form \"socket://ADDRESS[:PORT]\" (where the "
@@ -7973,37 +8032,37 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:104
+#: ippeveprinter.1:118
 #, no-wrap
 msgid "B<-F >I<output-type/subtype[,...]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:108
+#: ippeveprinter.1:122
 msgid ""
 "Specifies the output MIME media type.  The default is "
 "\"application/postscript\" when the B<-P> option is specified."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:108
+#: ippeveprinter.1:122
 #, no-wrap
 msgid "B<-M >I<manufacturer>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:112
+#: ippeveprinter.1:126
 msgid "Set the manufacturer of the printer.  The default is \"Example\"."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:112
+#: ippeveprinter.1:126
 #, no-wrap
 msgid "B<-P >I<filename.ppd>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:118
+#: ippeveprinter.1:132
 msgid ""
 "Load printer attributes from the specified PPD file.  This option is "
 "typically used in conjunction with the B<ippeveps>(7)  printer command (\"-c "
@@ -8011,30 +8070,30 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:118
+#: ippeveprinter.1:132
 #, no-wrap
 msgid "B<-V 1.1>"
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:120
+#: ippeveprinter.1:134
 #, no-wrap
 msgid "B<-V 2.0>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:124
+#: ippeveprinter.1:138
 msgid "Specifies the maximum IPP version to report.  2.0 is the default."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:124
+#: ippeveprinter.1:138
 #, no-wrap
 msgid "B<-c >I<command>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:136
+#: ippeveprinter.1:150
 msgid ""
 "Run the specified command for each document that is printed.  If \"command\" "
 "is not an absolute path (\"/path/to/command\"), B<ippeveprinter> looks for "
@@ -8047,126 +8106,137 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:136
+#: ippeveprinter.1:150
 #, no-wrap
 msgid "B<-d >I<spool-directory>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:140
+#: ippeveprinter.1:154
 msgid ""
 "Specifies the directory that will hold the print files.  The default is a "
 "directory under the user's current temporary directory."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:140
+#: ippeveprinter.1:154
 #, no-wrap
 msgid "B<-f >I<type/subtype[,...]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:144
+#: ippeveprinter.1:158
 msgid ""
 "Specifies a list of MIME media types that the server will accept.  The "
 "default depends on the type of printer created."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:144
+#: ippeveprinter.1:158
 #, no-wrap
 msgid "B<-i >I<iconfile.png>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:149
+#: ippeveprinter.1:163
 msgid ""
 "Specifies the printer icon file for the server.  The file must be a PNG "
 "format image.  The default is an internally-provided PNG image."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:149
+#: ippeveprinter.1:163
 #, no-wrap
 msgid "B<-k>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:152
+#: ippeveprinter.1:166
 msgid "Keeps the print documents in the spool directory rather than deleting them."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:152
+#: ippeveprinter.1:166
 #, no-wrap
 msgid "B<-l >I<location>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:156
+#: ippeveprinter.1:170
 msgid ""
 "Specifies the human-readable location string that is reported by the "
 "server.  The default is the empty string."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:156 lpadmin.8:79
+#: ippeveprinter.1:170 lpadmin.8:79
 #, no-wrap
 msgid "B<-m >I<model>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:160
+#: ippeveprinter.1:174
 msgid "Specifies the model name of the printer.  The default is \"Printer\"."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:160
+#: ippeveprinter.1:174
 #, no-wrap
 msgid "B<-n >I<hostname>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:166
+#: ippeveprinter.1:180
 msgid ""
 "Specifies the hostname that is reported by the server.  The default is the "
 "name returned by the B<hostname>(1)  command."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:166
+#: ippeveprinter.1:180
 #, no-wrap
 msgid "B<-p >I<port>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:170
+#: ippeveprinter.1:184
 msgid ""
 "Specifies the port number to listen on.  The default is a user-specific "
 "number from 8000 to 8999."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:170
+#: ippeveprinter.1:184
+#, no-wrap
+msgid "B<-r off>"
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:187
+msgid "Turns off DNS-SD service advertisements entirely."
+msgstr ""
+
+#. type: TP
+#: ippeveprinter.1:187
 #, no-wrap
 msgid "B<-r >I<subtype[,subtype]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:175
+#: ippeveprinter.1:192
 msgid ""
 "Specifies the DNS-SD subtype(s) to advertise.  Separate multiple subtypes "
 "with a comma.  The default is \"_print\"."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:175
+#: ippeveprinter.1:192
 #, no-wrap
 msgid "B<-s >I<speed[,color-speed]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:180
+#: ippeveprinter.1:197
 msgid ""
 "Specifies the printer speed in pages per minute.  If two numbers are "
 "specified and the second number is greater than zero, the server will report "
@@ -8174,18 +8244,18 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:180
+#: ippeveprinter.1:197
 #, no-wrap
 msgid "B<-v[vvv]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:183
+#: ippeveprinter.1:200
 msgid "Be (very) verbose when logging activity to standard error."
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:190
+#: ippeveprinter.1:207
 msgid ""
 "The B<ippeveprinter> program returns 1 if it is unable to process the "
 "command-line arguments or register the IPP service.  Otherwise "
@@ -8193,14 +8263,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:194
+#: ippeveprinter.1:211
 msgid ""
 "The B<ippeveprinter> program is unique to CUPS and conforms to the IPP "
 "Everywhere (PWG 5100.14) specification."
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:198
+#: ippeveprinter.1:215
 msgid ""
 "B<ippeveprinter> adds environment variables starting with \"IPP_\" for all "
 "IPP Job attributes in the print request.  For example, when executing a "
@@ -8210,7 +8280,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:201
+#: ippeveprinter.1:218
 msgid ""
 "In addition, all IPP \"xxx-default\" and \"pwg-xxx\" Printer Description "
 "attributes are added to the environment.  For example, the "
@@ -8219,7 +8289,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:205
+#: ippeveprinter.1:222
 msgid ""
 "Enumerated values are converted to their keyword equivalents.  For example, "
 "a \"print-quality\" Job Template attribute with a enum value of 3 will "
@@ -8230,7 +8300,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:207
+#: ippeveprinter.1:224
 msgid ""
 "Finally, the \"CONTENT_TYPE\" environment variable contains the MIME media "
 "type of the document being printed, the \"DEVICE_URI\" environment variable "
@@ -8241,33 +8311,33 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: ippeveprinter.1:207
+#: ippeveprinter.1:224
 #, no-wrap
 msgid "COMMAND OUTPUT"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:209
+#: ippeveprinter.1:226
 msgid ""
 "Unless they communicate directly with a printer, print commands send "
 "printer-ready data to the standard output."
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:213
+#: ippeveprinter.1:230
 msgid ""
 "Print commands can send messages back to B<ippeveprinter> on the standard "
 "error with one of the following prefixes:"
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:213
+#: ippeveprinter.1:230
 #, no-wrap
 msgid "B<ATTR: >I<attribute=value[ attribute=value]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:217
+#: ippeveprinter.1:234
 msgid ""
 "Sets the named attribute(s) to the given values.  Currently only the "
 "\"job-impressions\" and \"job-impressions-completed\" Job Status attributes "
@@ -8277,37 +8347,37 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:217
+#: ippeveprinter.1:234
 #, no-wrap
 msgid "B<DEBUG: >I<Debugging message>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:220
+#: ippeveprinter.1:237
 msgid "Logs a debugging message if at least two -v's have been specified."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:220
+#: ippeveprinter.1:237
 #, no-wrap
 msgid "B<ERROR: >I<Error message>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:223
+#: ippeveprinter.1:240
 msgid ""
 "Logs an error message and copies the message to the \"job-state-message\" "
 "attribute."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:223
+#: ippeveprinter.1:240
 #, no-wrap
 msgid "B<INFO: >I<Informational message>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:226
+#: ippeveprinter.1:243
 msgid ""
 "Logs an informational/progress message if -v has been specified and copies "
 "the message to the \"job-state-message\" attribute unless an error has been "
@@ -8315,68 +8385,68 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:226
+#: ippeveprinter.1:243
 #, no-wrap
 msgid "B<STATE: >I<keyword[,keyword,...]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:229
+#: ippeveprinter.1:246
 msgid ""
 "Sets the printer's \"printer-state-reasons\" attribute to the listed "
 "keywords."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:229
+#: ippeveprinter.1:246
 #, no-wrap
 msgid "B<STATE: ->I<keyword[,keyword,...]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:232
+#: ippeveprinter.1:249
 msgid ""
 "Removes the listed keywords from the printer's \"printer-state-reasons\" "
 "attribute."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:232
+#: ippeveprinter.1:249
 #, no-wrap
 msgid "B<STATE: +>I<keyword[,keyword,...]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:235
+#: ippeveprinter.1:252
 msgid ""
 "Adds the listed keywords to the printer's \"printer-state-reasons\" "
 "attribute."
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:239
+#: ippeveprinter.1:256
 msgid "Run B<ippeveprinter> with a service name of My Cool Printer:"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:242
+#: ippeveprinter.1:259
 #, no-wrap
 msgid "    ippeveprinter \"My Cool Printer\"\n"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:247
+#: ippeveprinter.1:264
 msgid "Run the B<file>(1)  command whenever a job is sent to the server:"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:250
+#: ippeveprinter.1:267
 #, no-wrap
 msgid "    ippeveprinter -c /usr/bin/file \"My Cool Printer\"\n"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:255
+#: ippeveprinter.1:272
 msgid ""
 "B<ippevepcl>(7), B<ippeveps>(7), PWG Internet Printing Protocol Workgroup "
 "(http://www.pwg.org/ipp)"
diff --git a/debian/manpage-po4a/po/de.po b/debian/manpage-po4a/po/de.po
index 81b496c15..318bfee12 100644
--- a/debian/manpage-po4a/po/de.po
+++ b/debian/manpage-po4a/po/de.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cups man pages 2.2.7-5\n"
-"POT-Creation-Date: 2019-09-02 10:31+0200\n"
+"POT-Creation-Date: 2019-12-13 17:30+0100\n"
 "PO-Revision-Date: 2019-09-13 21:42+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -43,15 +43,15 @@ msgid "CUPS"
 msgstr "CUPS"
 
 #. type: TH
-#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
-#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd-helper.8:10
-#: cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10 cupsfilter.8:9
-#: cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10 cupstestppd.1:10 filter.7:10
-#: ippfind.1:9 ipptool.1:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10
-#: lpmove.8:10 lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9
-#: mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10
-#: ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10
-#: printers.conf.5:9 subscriptions.conf.5:10
+#: backend.7:10 cancel.1:10 classes.conf.5:10 cups.1:10 cupsaccept.8:10
+#: cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd-helper.8:10 cupsd-logs.5:10
+#: cupsenable.8:10 cups-files.conf.5:10 cupsfilter.8:9 cups-lpd.8:10
+#: cups-snmp.8:9 cups-snmp.conf.5:10 cupstestppd.1:10 filter.7:10 ippfind.1:9
+#: ipptool.1:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10 lpmove.8:10
+#: lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9 mailto.conf.5:10
+#: mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10 ppdcfile.5:10
+#: ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10 printers.conf.5:9
+#: subscriptions.conf.5:10
 #, no-wrap
 msgid "26 April 2019"
 msgstr "26. April 2019"
@@ -185,7 +185,7 @@ msgstr ""
 #: cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:13
 #: cupsd-helper.8:46 cupsd-logs.5:13 cupsenable.8:46 cups-files.conf.5:13
 #: cupsfilter.8:54 cups-lpd.8:23 cups-snmp.8:23 cups-snmp.conf.5:13
-#: cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:79 ippfind.1:32
+#: cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:84 ippfind.1:32
 #: ipptool.1:75 ipptoolfile.5:12 lp.1:84 lpadmin.8:54 lpc.8:20 lpinfo.8:60
 #: lpmove.8:37 lpoptions.1:53 lpq.1:31 lpr.1:53 lprm.1:31 lpstat.1:65
 #: mailto.conf.5:13 mime.convs.5:13 mime.types.5:13 notifier.7:19 ppdc.1:45
@@ -371,9 +371,9 @@ msgid ""
 "use when communicating with the device."
 msgstr ""
 "Das Feld I<scheme> stellt das vom Backend unterstützte URI-Schema bereit. "
-"Backends sollten diese Form nur verwenden, wenn das Backend irgendeine dem Schema "
-"folgende URI unterstützt. Das Feld I<device-uri> legt die komplette URI, die "
-"bei der Kommunikation mit dem Gerät verwandt werden soll, fest."
+"Backends sollten diese Form nur verwenden, wenn das Backend irgendeine dem "
+"Schema folgende URI unterstützt. Das Feld I<device-uri> legt die komplette "
+"URI, die bei der Kommunikation mit dem Gerät verwandt werden soll, fest."
 
 #. type: Plain text
 #: backend.7:119
@@ -436,7 +436,7 @@ msgstr ""
 
 #. type: SH
 #: backend.7:135 cupsfilter.8:102 cupstestppd.1:110 ippevepcl.7:39
-#: ippeveprinter.1:183 ippfind.1:214 ipptool.1:191
+#: ippeveprinter.1:200 ippfind.1:214 ipptool.1:191
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "EXIT-STATUS"
@@ -590,7 +590,7 @@ msgstr "Alle anderen Exit-Codes sind reserviert."
 
 #. type: SH
 #: backend.7:173 cups.1:60 cupsfilter.8:105 cups-snmp.8:37 ippevepcl.7:41
-#: ippeveprinter.1:194 ippfind.1:216
+#: ippeveprinter.1:211 ippfind.1:216
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "UMGEBUNG"
@@ -630,7 +630,7 @@ msgid "I</etc/cups/cups-files.conf>"
 msgstr "I</etc/cups/cups-files.conf>"
 
 #. type: SH
-#: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:110
+#: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:126
 #: cups.1:122 cupsd.conf.5:858 cupsd-helper.8:77 cups-files.conf.5:273
 #: cupsfilter.8:117 cups-lpd.8:60 cups-snmp.8:44 cups-snmp.conf.5:58
 #: cupstestppd.1:138 filter.7:201 lpadmin.8:203 lpc.8:40 lpinfo.8:117 lpr.1:151
@@ -691,11 +691,11 @@ msgstr ""
 "B<ippeveprinter>(1) unterstützt werden."
 
 #. type: SH
-#: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:122 cups.1:126
+#: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:138 cups.1:126
 #: cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:895
 #: cupsd-helper.8:81 cupsd-logs.5:216 cupsenable.8:88 cups-files.conf.5:280
 #: cupsfilter.8:131 cups-lpd.8:111 cups-snmp.8:49 cups-snmp.conf.5:62
-#: cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:251
+#: cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:268
 #: ippfind.1:255 ipptool.1:246 ipptoolfile.5:649 lp.1:219 lpadmin.8:224
 #: lpc.8:47 lpinfo.8:121 lpmove.8:66 lpoptions.1:110 lpq.1:56 lpr.1:171
 #: lprm.1:74 lpstat.1:140 mailto.conf.5:40 mime.convs.5:54 mime.types.5:100
@@ -720,11 +720,11 @@ msgid "CUPS Online Help (http://localhost:631/help)"
 msgstr "CUPS-Online-Hilfe (http://localhost:631/help)"
 
 #. type: SH
-#: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:126 cups.1:142
+#: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:142 cups.1:142
 #: cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:904
 #: cupsd-helper.8:89 cupsd-logs.5:221 cupsenable.8:96 cups-files.conf.5:290
 #: cupsfilter.8:138 cups-lpd.8:118 cups-snmp.8:55 cups-snmp.conf.5:65
-#: cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:255
+#: cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:272
 #: ippfind.1:257 ipptool.1:251 ipptoolfile.5:654 lp.1:228 lpadmin.8:230
 #: lpc.8:57 lpinfo.8:124 lpmove.8:73 lpoptions.1:117 lpq.1:63 lpr.1:180
 #: lprm.1:81 lpstat.1:147 mailto.conf.5:43 mime.convs.5:61 mime.types.5:107
@@ -735,11 +735,11 @@ msgid "COPYRIGHT"
 msgstr "COPYRIGHT"
 
 #. type: Plain text
-#: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:127 cups.1:143
+#: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:143 cups.1:143
 #: cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:905
 #: cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cups-files.conf.5:291
 #: cupsfilter.8:139 cups-lpd.8:119 cups-snmp.8:56 cups-snmp.conf.5:66
-#: cupstestppd.1:147 filter.7:221 ippeveprinter.1:256 ipptool.1:252
+#: cupstestppd.1:147 filter.7:221 ippeveprinter.1:273 ipptool.1:252
 #: ipptoolfile.5:655 lp.1:229 lpadmin.8:231 lpc.8:58 lpinfo.8:125 lpmove.8:74
 #: lpoptions.1:118 lpq.1:64 lpr.1:181 lprm.1:82 lpstat.1:148 mailto.conf.5:44
 #: mime.convs.5:62 mime.types.5:108 notifier.7:36 ppdc.1:102 ppdcfile.5:161
@@ -783,7 +783,7 @@ msgstr ""
 #. type: SH
 #: cancel.1:40 cupsaccept.8:50 cups-config.1:52 cupsctl.8:40 cupsd.8:37
 #: cupsd.conf.5:485 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:32
-#: cupstestppd.1:58 filter.7:60 ippeveprinter.1:82 ippfind.1:191 ipptool.1:88
+#: cupstestppd.1:58 filter.7:60 ippeveprinter.1:87 ippfind.1:191 ipptool.1:88
 #: lp.1:94 lpadmin.8:73 lpinfo.8:63 lpmove.8:39 lpoptions.1:68 lpq.1:36
 #: lpr.1:64 lprm.1:36 lpstat.1:68 ppdc.1:48 ppdhtml.1:25 ppdi.1:30
 #: ppdmerge.1:28 ppdpo.1:28
@@ -875,7 +875,7 @@ msgstr "Löscht Auftragsdatendateien zusätzlich zum Abbruch."
 #. type: SH
 #: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:873
 #: cupsenable.8:77 cups-lpd.8:46 cups-snmp.8:47 filter.7:199
-#: ippeveprinter.1:190 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97
+#: ippeveprinter.1:207 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97
 #: lpoptions.1:108 lprm.1:52 lpstat.1:133
 #, no-wrap
 msgid "CONFORMING TO"
@@ -894,7 +894,7 @@ msgstr ""
 
 #. type: SH
 #: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:875
-#: cupstestppd.1:125 ippeveprinter.1:235 ippfind.1:242 ipptool.1:233 lp.1:201
+#: cupstestppd.1:125 ippeveprinter.1:252 ippfind.1:242 ipptool.1:233 lp.1:201
 #: lpinfo.8:99 lpmove.8:50 lpr.1:153 lprm.1:56 mime.convs.5:43 mime.types.5:89
 #, no-wrap
 msgid "EXAMPLES"
@@ -1004,6 +1004,13 @@ msgstr ""
 msgid "client.conf"
 msgstr "client.conf"
 
+#. type: TH
+#: client.conf.5:10
+#, fuzzy, no-wrap
+#| msgid "19 October 2015"
+msgid "15 October 2019"
+msgstr "19. Oktober 2015"
+
 #. type: Plain text
 #: client.conf.5:13
 msgid "client.conf - client configuration file for cups (deprecated on macos)"
@@ -1046,8 +1053,9 @@ msgstr ""
 msgid "DIRECTIVES"
 msgstr "DIREKTIVEN"
 
+#. #AllowAnyRoot
 #. type: Plain text
-#: client.conf.5:23
+#: client.conf.5:24
 msgid ""
 "The following directives are understood by the client. Consult the online "
 "help for detailed descriptions:"
@@ -1056,19 +1064,20 @@ msgstr ""
 "Online-Hilfe für detailliertere Beschreibungen:"
 
 #. type: TP
-#: client.conf.5:23
+#: client.conf.5:24
 #, no-wrap
 msgid "B<AllowAnyRoot Yes>"
 msgstr "B<AllowAnyRoot Yes>"
 
 #. type: TP
-#: client.conf.5:25
+#: client.conf.5:26
 #, no-wrap
 msgid "B<AllowAnyRoot No>"
 msgstr "B<AllowAnyRoot No>"
 
+#. #AllowExpiredCerts
 #. type: Plain text
-#: client.conf.5:29
+#: client.conf.5:31
 msgid ""
 "Specifies whether to allow TLS with certificates that have not been signed "
 "by a trusted Certificate Authority.  The default is \"Yes\"."
@@ -1077,19 +1086,20 @@ msgstr ""
 "Zertifizierungsstelle signiert wurden, erlaubt wird. Die Vorgabe ist »Yes«."
 
 #. type: TP
-#: client.conf.5:29
+#: client.conf.5:31
 #, no-wrap
 msgid "B<AllowExpiredCerts Yes>"
 msgstr "B<AllowExpiredCerts Yes>"
 
 #. type: TP
-#: client.conf.5:31
+#: client.conf.5:33
 #, no-wrap
 msgid "B<AllowExpiredCerts No>"
 msgstr "B<AllowExpiredCerts No>"
 
+#. #DigestOptions
 #. type: Plain text
-#: client.conf.5:35
+#: client.conf.5:38
 msgid ""
 "Specifies whether to allow TLS with expired certificates.  The default is "
 "\"No\"."
@@ -1098,36 +1108,59 @@ msgstr ""
 "ist »No«."
 
 #. type: TP
-#: client.conf.5:35 cupsd.conf.5:732
+#: client.conf.5:38
+#, no-wrap
+msgid "B<DigestOptions DenyMD5>"
+msgstr ""
+
+#. type: TP
+#: client.conf.5:40
+#, fuzzy, no-wrap
+#| msgid "B<SSLOptions None>"
+msgid "B<DigestOptions None>"
+msgstr "B<SSLOptions None>"
+
+#. #Encryption
+#. type: Plain text
+#: client.conf.5:45
+msgid ""
+"Specifies HTTP Digest authentication options.  B<DenyMD5> disables support "
+"for the original MD5 hash algorithm."
+msgstr ""
+
+#. type: TP
+#: client.conf.5:45 cupsd.conf.5:732
 #, no-wrap
 msgid "B<Encryption IfRequested>"
 msgstr "B<Encryption IfRequested>"
 
 #. type: TP
-#: client.conf.5:37 cupsd.conf.5:734
+#: client.conf.5:47 cupsd.conf.5:734
 #, no-wrap
 msgid "B<Encryption Never>"
 msgstr "B<Encryption Never>"
 
 #. type: TP
-#: client.conf.5:39 cupsd.conf.5:736
+#: client.conf.5:49 cupsd.conf.5:736
 #, no-wrap
 msgid "B<Encryption Required>"
 msgstr "B<Encryption Required>"
 
+#. #GSSServiceName
 #. type: Plain text
-#: client.conf.5:42
+#: client.conf.5:53
 msgid "Specifies the level of encryption that should be used."
 msgstr "Legt die zu verwendende Verschlüsselungsstufe fest."
 
 #. type: TP
-#: client.conf.5:42 cupsd.conf.5:165
+#: client.conf.5:53 cupsd.conf.5:165
 #, no-wrap
 msgid "B<GSSServiceName >I<name>"
 msgstr "B<GSSServiceName >I<Name>"
 
+#. #ServerName
 #. type: Plain text
-#: client.conf.5:46
+#: client.conf.5:58
 msgid ""
 "Specifies the Kerberos service name that is used for authentication, "
 "typically \"host\", \"http\", or \"ipp\".  CUPS adds the remote hostname "
@@ -1139,19 +1172,19 @@ msgstr ""
 "Standardname lautet »http«."
 
 #. type: TP
-#: client.conf.5:46
+#: client.conf.5:58
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]"
 msgstr "B<ServerName >I<Hostname-oder-IP-Adresse>[I<:Port>]"
 
 #. type: TP
-#: client.conf.5:48
+#: client.conf.5:60
 #, no-wrap
 msgid "B<ServerName >I</domain/socket>"
 msgstr "B<ServerName >I</Domäne/Socket>"
 
 #. type: Plain text
-#: client.conf.5:52
+#: client.conf.5:64
 msgid ""
 "Specifies the address and optionally the port to use when connecting to the "
 "server.  B<Note: This directive is not supported on macOS 10.7 or later.>"
@@ -1161,13 +1194,14 @@ msgstr ""
 "oder neuer nicht unterstützt.>"
 
 #. type: TP
-#: client.conf.5:52
+#: client.conf.5:64
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]B</version=1.1>"
 msgstr "B<ServerName >I<Hostname-oder-IP-Adresse>[I<:Port>]B</version=1.1>"
 
+#. #SSLOptions
 #. type: Plain text
-#: client.conf.5:55
+#: client.conf.5:68
 msgid ""
 "Specifies the address and optionally the port to use when connecting to a "
 "server running CUPS 1.3.12 and earlier."
@@ -1176,20 +1210,20 @@ msgstr ""
 "verwandt werden sollen, auf dem CUPS 1.3.12 oder älter läuft, fest."
 
 #. type: TP
-#: client.conf.5:55 cupsd.conf.5:437
+#: client.conf.5:68 cupsd.conf.5:437
 #, no-wrap
 msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>] [I<MaxTLS1.0>] [I<MaxTLS1.1>] [I<MaxTLS1.2>] [I<MaxTLS1.3>] [I<MinTLS1.0>] [I<MinTLS1.1>] [I<MinTLS1.2>] [I<MinTLS1.3>]"
 msgstr "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>] [I<MaxTLS1.0>] [I<MaxTLS1.1>] [I<MaxTLS1.2>] [I<MaxTLS1.3>] [I<MinTLS1.0>] [I<MinTLS1.1>] [I<MinTLS1.2>] [I<MinTLS1.3>]"
 
 #. type: TP
-#: client.conf.5:57 cupsd.conf.5:439
+#: client.conf.5:70 cupsd.conf.5:439
 #, no-wrap
 msgid "B<SSLOptions None>"
 msgstr "B<SSLOptions None>"
 
 #. #SSLPort
 #. type: Plain text
-#: client.conf.5:71 cupsd.conf.5:454
+#: client.conf.5:85 cupsd.conf.5:454
 msgid ""
 "Sets encryption options (only in /etc/cups/client.conf).  By default, CUPS "
 "only supports encryption using TLS v1.0 or higher using known secure cipher "
@@ -1222,19 +1256,20 @@ msgstr ""
 "Betriebssysteme TLS 1.3."
 
 #. type: TP
-#: client.conf.5:71
+#: client.conf.5:85
 #, no-wrap
 msgid "B<TrustOnFirstUse Yes>"
 msgstr "B<TrustOnFirstUse Yes>"
 
 #. type: TP
-#: client.conf.5:73
+#: client.conf.5:87
 #, no-wrap
 msgid "B<TrustOnFirstUse No>"
 msgstr "B<TrustOnFirstUse No>"
 
+#. #User
 #. type: Plain text
-#: client.conf.5:77
+#: client.conf.5:92
 msgid ""
 "Specifies whether to trust new TLS certificates by default.  The default is "
 "\"Yes\"."
@@ -1243,61 +1278,62 @@ msgstr ""
 "Vorgabe ist »Yes«."
 
 #. type: TP
-#: client.conf.5:77
+#: client.conf.5:92
 #, no-wrap
 msgid "B<User >I<name>"
 msgstr "B<User >I<Name>"
 
 #. #UserAgentTokens
 #. type: Plain text
-#: client.conf.5:81
+#: client.conf.5:96
 msgid "Specifies the default user name to use for requests."
 msgstr "Legt den für Anfragen standardmäßig zu verwendenden Benutzer fest."
 
 #. type: TP
-#: client.conf.5:81
+#: client.conf.5:96
 #, no-wrap
 msgid "B<UserAgentTokens None>"
 msgstr "B<UserAgentTokens None>"
 
 #. type: TP
-#: client.conf.5:83
+#: client.conf.5:98
 #, no-wrap
 msgid "B<UserAgentTokens ProductOnly>"
 msgstr "B<UserAgentTokens ProductOnly>"
 
 #. type: TP
-#: client.conf.5:85
+#: client.conf.5:100
 #, no-wrap
 msgid "B<UserAgentTokens Major>"
 msgstr "B<UserAgentTokens Major>"
 
 #. type: TP
-#: client.conf.5:87
+#: client.conf.5:102
 #, no-wrap
 msgid "B<UserAgentTokens Minor>"
 msgstr "B<UserAgentTokens Minor>"
 
 #. type: TP
-#: client.conf.5:89
+#: client.conf.5:104
 #, no-wrap
 msgid "B<UserAgentTokens Minimal>"
 msgstr "B<UserAgentTokens Minimal>"
 
 #. type: TP
-#: client.conf.5:91
+#: client.conf.5:106
 #, no-wrap
 msgid "B<UserAgentTokens OS>"
 msgstr "B<UserAgentTokens OS>"
 
 #. type: TP
-#: client.conf.5:93
+#: client.conf.5:108
 #, no-wrap
 msgid "B<UserAgentTokens Full>"
 msgstr "B<UserAgentTokens Full>"
 
+#. #ValidateCerts
 #. type: Plain text
-#: client.conf.5:104
+#: client.conf.5:120
 msgid ""
 "Specifies what information is included in the User-Agent header of HTTP "
 "requests.  \"None\" disables the User-Agent header.  \"ProductOnly\" reports "
@@ -1307,29 +1343,28 @@ msgid ""
 "IPP/2.1\".  \"Full\" reports \"CUPS/major.minor.path (osname osversion; "
 "architecture) IPP/2.1\".  The default is \"Minimal\"."
 msgstr ""
-"Legt fest, welche Informationen in die Kopfzeilen »User-Agent« von HTTP-Anfragen "
-"aufgenommen werden. »None« deaktiviert die »User-Agent«-Kopfzeilen. »ProductOnly« "
-"meldet »CUPS«. »Major« berichtet »CUPS/major IPP/2«. »Minor« berichtet »CUPS/"
-"major.minor IPP/2.1«. »Minimal« berichtet »CUPS/major.minor.patch "
-"IPP/2.1«. »OS« berichtet »CUPS/major.minor.path (osname osversion) IPP/2.1«. "
-"»Full« berichtet »CUPS/major.minor.path (osname osversion; "
-"architecture) IPP/2.1«. Die "
-"Vorgabe ist »Minimal«."
+"Legt fest, welche Informationen in die Kopfzeilen »User-Agent« von HTTP-"
+"Anfragen aufgenommen werden. »None« deaktiviert die »User-Agent«-Kopfzeilen. "
+"»ProductOnly« meldet »CUPS«. »Major« berichtet »CUPS/major IPP/2«. »Minor« "
+"berichtet »CUPS/major.minor IPP/2.1«. »Minimal« berichtet »CUPS/major.minor."
+"patch IPP/2.1«. »OS« berichtet »CUPS/major.minor.path (osname osversion) "
+"IPP/2.1«. »Full« berichtet »CUPS/major.minor.path (osname osversion; "
+"architecture) IPP/2.1«. Die Vorgabe ist »Minimal«."
 
 #. type: TP
-#: client.conf.5:104
+#: client.conf.5:120
 #, no-wrap
 msgid "B<ValidateCerts Yes>"
 msgstr "B<ValidateCerts Yes>"
 
 #. type: TP
-#: client.conf.5:106
+#: client.conf.5:122
 #, no-wrap
 msgid "B<ValidateCerts No>"
 msgstr "B<ValidateCerts No>"
 
 #. type: Plain text
-#: client.conf.5:110
+#: client.conf.5:126
 msgid ""
 "Specifies whether to only allow TLS with certificates whose common name "
 "matches the hostname.  The default is \"No\"."
@@ -1338,7 +1373,7 @@ msgstr ""
 "den Rechnernamen passt. Die Vorgabe ist »No«."
 
 #. type: Plain text
-#: client.conf.5:115
+#: client.conf.5:131
 msgid ""
 "The B<client.conf> file is deprecated on macOS and will no longer be "
 "supported in a future version of CUPS.  Configuration settings can instead "
@@ -1350,7 +1385,7 @@ msgstr ""
 "werden:"
 
 #. type: Plain text
-#: client.conf.5:118
+#: client.conf.5:134
 #, no-wrap
 msgid ""
 "defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required\n"
@@ -1360,13 +1395,13 @@ msgstr ""
 "defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO\n"
 
 #. type: Plain text
-#: client.conf.5:120
+#: client.conf.5:136
 #, no-wrap
 msgid "defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption\n"
 msgstr "defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption\n"
 
 #. type: Plain text
-#: client.conf.5:122
+#: client.conf.5:138
 msgid ""
 "On Linux and other systems using GNU TLS, the I</etc/cups/ssl/site.crl> "
 "file, if present, provides a list of revoked X.509 certificates and is used "
@@ -1377,7 +1412,7 @@ msgstr ""
 "X.509-Zertifikate. Sie wird dann zur Prüfung von Zertifikaten verwandt."
 
 #. type: Plain text
-#: client.conf.5:126
+#: client.conf.5:142
 msgid "B<cups>(1), B<default>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 "B<cups>(1), B<default>(1), CUPS-Online Hilfe (http://localhost:631/help)"
@@ -2082,7 +2117,7 @@ msgid "Reports the default CUPS data directory."
 msgstr "Berichtet das Standard-CUPS-Datenverzeichnis."
 
 #. type: TP
-#: cups-config.1:66 ippeveprinter.1:85 ippfind.1:193 ipptool.1:91
+#: cups-config.1:66 ippeveprinter.1:90 ippfind.1:193 ipptool.1:91
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
@@ -2156,7 +2191,7 @@ msgstr ""
 "(Laufzeit-)Bibliotheken, wenn mit I<--libs> verwandt."
 
 #. type: TP
-#: cups-config.1:84 ippeveprinter.1:91 ippfind.1:196 ipptool.1:106
+#: cups-config.1:84 ippeveprinter.1:100 ippfind.1:196 ipptool.1:106
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
@@ -2656,13 +2691,12 @@ msgid ""
 "insensitive.  Comment lines start with the # character."
 msgstr ""
 "Die Datei I<cupsd.conf> konfiguriert den CUPS-Auftragsplaner B<cupsd>(8). "
-"Sie befindet sich normalerweise im Verzeichnis I</etc/cups>. "
-"Jede Zeile in der Datei kann eine Konfigurationsdirektive, eine leere Zeile "
-"oder ein Kommentar sein. Konfigurationsdirektiven bestehen typischerweise "
-"aus einem Namen und keinem oder mehren, durch Leerraum getrennten Werten. "
-"Die Groß- und Kleinschreibung der Namen und Werte der "
-"Konfigurationsdirektiven ist nicht relevant. Kommentarzeilen beginnen mit "
-"dem Zeichen »#«. "
+"Sie befindet sich normalerweise im Verzeichnis I</etc/cups>. Jede Zeile in "
+"der Datei kann eine Konfigurationsdirektive, eine leere Zeile oder ein "
+"Kommentar sein. Konfigurationsdirektiven bestehen typischerweise aus einem "
+"Namen und keinem oder mehren, durch Leerraum getrennten Werten. Die Groß- "
+"und Kleinschreibung der Namen und Werte der Konfigurationsdirektiven ist "
+"nicht relevant. Kommentarzeilen beginnen mit dem Zeichen »#«. "
 
 #. type: SS
 #: cupsd.conf.5:25 ipptoolfile.5:83
@@ -3927,12 +3961,10 @@ msgstr ""
 "Legt fest, welche Informationen in die Server-Kopfzeilen von HTTP-Antworten "
 "aufgenommen werden. »None« deaktiviert die Server-Kopfzeilen. »ProductOnly« "
 "meldet »CUPS«. »Major« berichtet »CUPS/major IPP/2«. »Minor« berichtet »CUPS/"
-"major.minor IPP/2.1«. »Minimal« berichtet »CUPS/"
-"CUPS/major.minor.patch "
-"IPP/2.1«. »OS« berichtet »CUPS/major.minor.path (osname osversion) "
-"IPP/2.1«. »Full« berichtet »CUPS/major.minor.path (osname osversion; "
-"architecture) IPP/2.1«. Die "
-"Vorgabe ist »Minimal«."
+"major.minor IPP/2.1«. »Minimal« berichtet »CUPS/CUPS/major.minor.patch "
+"IPP/2.1«. »OS« berichtet »CUPS/major.minor.path (osname osversion) IPP/2.1«. "
+"»Full« berichtet »CUPS/major.minor.path (osname osversion; architecture) "
+"IPP/2.1«. Die Vorgabe ist »Minimal«."
 
 #. type: TP
 #: cupsd.conf.5:428
@@ -5397,11 +5429,10 @@ msgid ""
 "in the B<cupsd.conf> file are now stored in the B<cups-files.conf>(5)  file "
 "instead in order to prevent certain types of privilege escalation attacks."
 msgstr ""
-"Datei-, Verzeichnis- und "
-"Benutzerkonfigurationsdirektiven, die früher in der Datei B<cupsd.conf> "
-"erlaubt wurden, werden jetzt stattdessen in der Datei B<cups-files.conf>(5) "
-"gespeichert, um bestimmte Arten von Angriffen zur Rechteerweiterung zu "
-"vermeiden."
+"Datei-, Verzeichnis- und Benutzerkonfigurationsdirektiven, die früher in der "
+"Datei B<cupsd.conf> erlaubt wurden, werden jetzt stattdessen in der Datei "
+"B<cups-files.conf>(5) gespeichert, um bestimmte Arten von Angriffen zur "
+"Rechteerweiterung zu vermeiden."
 
 #. type: Plain text
 #: cupsd.conf.5:869
@@ -8406,9 +8437,9 @@ msgid ""
 "Relaxes the PPD conformance requirements so that common whitespace, control "
 "character, and formatting problems are not treated as hard errors."
 msgstr ""
-"Weicht die PPD-Konformitätsanforderungen auf, so dass typische Leerraumzeichen-, "
-"Steuerzeichen und Formatierungsprobleme nicht als schwere Fehler behandelt "
-"werden."
+"Weicht die PPD-Konformitätsanforderungen auf, so dass typische "
+"Leerraumzeichen-, Steuerzeichen und Formatierungsprobleme nicht als schwere "
+"Fehler behandelt werden."
 
 #. type: TP
 #: cupstestppd.1:102 ipptool.1:187 ppdc.1:76
@@ -9383,11 +9414,13 @@ msgstr "Copyright \\[co] 2019 by Apple Inc."
 msgid "ippeveprinter"
 msgstr "ippeveprinter"
 
+# type: TH
 #. type: TH
 #: ippeveprinter.1:9
-#, no-wrap
-msgid "17 May 2019"
-msgstr "17. Mai 2019"
+#, fuzzy, no-wrap
+#| msgid "5 December 2008"
+msgid "2 December 2019"
+msgstr "5. Dezember 2008"
 
 #. type: Plain text
 #: ippeveprinter.1:12
@@ -9395,87 +9428,129 @@ msgid "ippeveprinter - an ipp everywhere printer application for cups"
 msgstr "ippeveprinter - eine IPP-Everywhere-Druckeranwendung für CUPS"
 
 #. type: Plain text
-#: ippeveprinter.1:79
-msgid ""
-"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] "
-"[ B<-2> ] [ B<-D> I<device-uri> ] [ B<-F> I<output-type/subtype> ] [ B<-K> "
-"I<keypath> ] [ B<-M> I<manufacturer> ] [ B<-P> I<filename.ppd> ] [ B<-V> "
-"I<ipp-version> ] [ B<-a> I<filename.conf> ] [ B<-c> I<command> ] [ B<-d> "
-"I<spool-directory> ] [ B<-f> I<type/subtype[,...]> ] [ B<-i> I<iconfile."
-"png> ] [ B<-k> ] [ B<-l> I<location> ] [ B<-m> I<model> ] [ B<-n> "
-"I<hostname> ] [ B<-p> I<port> ] [ B<-r> I<subtype[,subtype]> ] [ B<-s> "
-"I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
+#: ippeveprinter.1:84
+#, fuzzy
+#| msgid ""
+#| "B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] "
+#| "[ B<-2> ] [ B<-D> I<device-uri> ] [ B<-F> I<output-type/subtype> ] [ B<-"
+#| "K> I<keypath> ] [ B<-M> I<manufacturer> ] [ B<-P> I<filename.ppd> ] [ B<-"
+#| "V> I<ipp-version> ] [ B<-a> I<filename.conf> ] [ B<-c> I<command> ] [ B<-"
+#| "d> I<spool-directory> ] [ B<-f> I<type/subtype[,...]> ] [ B<-i> "
+#| "I<iconfile.png> ] [ B<-k> ] [ B<-l> I<location> ] [ B<-m> I<model> ] [ B<-"
+#| "n> I<hostname> ] [ B<-p> I<port> ] [ B<-r> I<subtype[,subtype]> ] [ B<-s> "
+#| "I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
+msgid ""
+"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--pam-service> "
+"I<service> ] [ B<--version> ] [ B<-2> ] [ B<-A> ] [ B<-D> I<device-uri> ] "
+"[ B<-F> I<output-type/subtype> ] [ B<-K> I<keypath> ] [ B<-M> "
+"I<manufacturer> ] [ B<-P> I<filename.ppd> ] [ B<-V> I<ipp-version> ] [ B<-a> "
+"I<filename.conf> ] [ B<-c> I<command> ] [ B<-d> I<spool-directory> ] [ B<-f> "
+"I<type/subtype[,...]> ] [ B<-i> I<iconfile.png> ] [ B<-k> ] [ B<-l> "
+"I<location> ] [ B<-m> I<model> ] [ B<-n> I<hostname> ] [ B<-p> I<port> ] "
+"[ B<-r> I<subtype[,subtype]> ] [ B<-s> I<speed[,color-speed]> ] [ B<-"
+"v[vvv]> ] I<service-name>"
 msgstr ""
 "B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] "
 "[ B<-2> ] [ B<-D> I<Geräte-URI> ] [ B<-F> I<Ausgabetyp/-untertyp> ] [ B<-K> "
-"I<Schlüsselpfad> ] [ B<-M> I<Hersteller> ] [ B<-P> I<Dateiname.ppd> ] [ B<-V> "
-"I<IPP-Version> ] [ B<-a> I<Dateiname.conf> ] [ B<-c> I<Befehl> ] [ B<-d> "
+"I<Schlüsselpfad> ] [ B<-M> I<Hersteller> ] [ B<-P> I<Dateiname.ppd> ] [ B<-"
+"V> I<IPP-Version> ] [ B<-a> I<Dateiname.conf> ] [ B<-c> I<Befehl> ] [ B<-d> "
 "I<Spool-Verzeichnis> ] [ B<-f> I<Typ/Untertyp[,…]> ] [ B<-i> I<Icon-Datei."
 "png> ] [ B<-k> ] [ B<-l> I<Ort> ] [ B<-m> I<Modell> ] [ B<-n> "
 "I<Rechnername> ] [ B<-p> I<Port> ] [ B<-r> I<Untertyp[,Untertyp]> ] [ B<-s> "
 "I<Geschwindigkeit[,Farbgeschwindigkeit]> ] [ B<-v[vvv]> ] I<Dienstename>"
 
 #. type: Plain text
-#: ippeveprinter.1:82
+#: ippeveprinter.1:87
 msgid ""
 "B<ippeveprinter> is a simple Internet Printing Protocol (IPP) server "
 "conforming to the IPP Everywhere (PWG 5100.14) specification. It can be used "
 "to test client software or act as a very basic print server that runs a "
 "command for every job that is printed."
 msgstr ""
-"B<ippeveprinter> ist ein einfacher Internet Printing Protocol (IPP)-Server, der "
-"der Spezifikation »IPP Everywhere (PWG 5100.14)« folgt. Er kann zum Testen "
-"von Client-Software dienen oder als sehr rudimentärer Server, der für jeden "
-"Druckauftrag einen Befehl ausführt, verwandt werden."
+"B<ippeveprinter> ist ein einfacher Internet Printing Protocol (IPP)-Server, "
+"der der Spezifikation »IPP Everywhere (PWG 5100.14)« folgt. Er kann zum "
+"Testen von Client-Software dienen oder als sehr rudimentärer Server, der für "
+"jeden Druckauftrag einen Befehl ausführt, verwandt werden."
 
 #. type: Plain text
-#: ippeveprinter.1:85
+#: ippeveprinter.1:90
 msgid "The following options are recognized by B<ippeveprinter:>"
 msgstr "Die folgenden Optionen werden von I<ippeveprinter> erkannt:"
 
 #. type: Plain text
-#: ippeveprinter.1:88
+#: ippeveprinter.1:93
 msgid "Show program usage."
 msgstr "Zeigt die Programm-Verwendung."
 
 #. type: TP
-#: ippeveprinter.1:88
+#: ippeveprinter.1:93
 #, no-wrap
 msgid "B<--no-web-forms>"
 msgstr "B<--no-web-forms>"
 
 #. type: Plain text
-#: ippeveprinter.1:91
+#: ippeveprinter.1:96
 msgid ""
 "Disable the web interface forms used to update the media and supply levels."
 msgstr ""
 "Deaktiviert die zur Aktualisierung der Medien- und Bereitstellungsstufen "
 "verwandte Webschnittstellenformulare."
 
+#. type: TP
+#: ippeveprinter.1:96
+#, fuzzy, no-wrap
+#| msgid "B<--ippserver >I<filename>"
+msgid "B<--pam-service >I<service>"
+msgstr "B<--ippserver >I<Dateiname>"
+
 #. type: Plain text
-#: ippeveprinter.1:94
+#: ippeveprinter.1:100
+#, fuzzy
+#| msgid ""
+#| "Specifies the service name when using Kerberos authentication.  The "
+#| "default service name is \"http.\""
+msgid "Set the PAM service name.  The default service is \"cups\"."
+msgstr ""
+"Legt den Dienstenamen, wenn Kerberos-Authentifizierung eingesetzt wird, "
+"fest. Der Vorgabedienstname ist »http«."
+
+#. type: Plain text
+#: ippeveprinter.1:103
 msgid "Show the CUPS version."
 msgstr "Zeigt die CUPS-Version an."
 
 #. type: TP
-#: ippeveprinter.1:94
+#: ippeveprinter.1:103
 #, no-wrap
 msgid "B<-2>"
 msgstr "B<-2>"
 
 #. type: Plain text
-#: ippeveprinter.1:97
+#: ippeveprinter.1:106
 msgid "Report support for two-sided (duplex) printing."
 msgstr "Meldet die Unterstützung für zweiseitigen (Duplex-)Druck."
 
 #. type: TP
-#: ippeveprinter.1:97
+#: ippeveprinter.1:106
+#, no-wrap
+msgid "B<-A>"
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:111
+msgid ""
+"Enable authentication for the created printer.  B<ippeveprinter> uses PAM to "
+"authenticate HTTP Basic credentials."
+msgstr ""
+
+#. type: TP
+#: ippeveprinter.1:111
 #, no-wrap
 msgid "B<-D >I<device-uri>"
 msgstr "B<-D >I<Geräte-URI>"
 
 #. type: Plain text
-#: ippeveprinter.1:104
+#: ippeveprinter.1:118
 msgid ""
 "Set the device URI for print output.  The URI can be a filename, directory, "
 "or a network socket URI of the form \"socket://ADDRESS[:PORT]\" (where the "
@@ -9489,13 +9564,13 @@ msgstr ""
 "Auftragskennung und dem Namen erzeugen."
 
 #. type: TP
-#: ippeveprinter.1:104
+#: ippeveprinter.1:118
 #, no-wrap
 msgid "B<-F >I<output-type/subtype[,...]>"
 msgstr "B<-F >I<Ausgabetyp/Untertyp[,…]>"
 
 #. type: Plain text
-#: ippeveprinter.1:108
+#: ippeveprinter.1:122
 msgid ""
 "Specifies the output MIME media type.  The default is \"application/"
 "postscript\" when the B<-P> option is specified."
@@ -9504,24 +9579,24 @@ msgstr ""
 "postscript«, wenn die Option B<-P> festgelegt ist."
 
 #. type: TP
-#: ippeveprinter.1:108
+#: ippeveprinter.1:122
 #, no-wrap
 msgid "B<-M >I<manufacturer>"
 msgstr "B<-M >I<Hersteller>"
 
 #. type: Plain text
-#: ippeveprinter.1:112
+#: ippeveprinter.1:126
 msgid "Set the manufacturer of the printer.  The default is \"Example\"."
 msgstr "Setzt den Hersteller des Druckers. Die Vorgabe ist »Example«."
 
 #. type: TP
-#: ippeveprinter.1:112
+#: ippeveprinter.1:126
 #, no-wrap
 msgid "B<-P >I<filename.ppd>"
 msgstr "B<-P >I<Dateiname.ppd>"
 
 #. type: Plain text
-#: ippeveprinter.1:118
+#: ippeveprinter.1:132
 msgid ""
 "Load printer attributes from the specified PPD file.  This option is "
 "typically used in conjunction with the B<ippeveps>(7)  printer command (\"-c "
@@ -9532,30 +9607,30 @@ msgstr ""
 "ippeveps\") verwandt."
 
 #. type: TP
-#: ippeveprinter.1:118
+#: ippeveprinter.1:132
 #, no-wrap
 msgid "B<-V 1.1>"
 msgstr "B<-V 1.1>"
 
 #. type: TP
-#: ippeveprinter.1:120
+#: ippeveprinter.1:134
 #, no-wrap
 msgid "B<-V 2.0>"
 msgstr "B<-V 2.0>"
 
 #. type: Plain text
-#: ippeveprinter.1:124
+#: ippeveprinter.1:138
 msgid "Specifies the maximum IPP version to report.  2.0 is the default."
 msgstr "Legt die maximal zu berichtende IPP-Version fest. 2.0 ist die Vorgabe."
 
 #. type: TP
-#: ippeveprinter.1:124
+#: ippeveprinter.1:138
 #, no-wrap
 msgid "B<-c >I<command>"
 msgstr "B<-c >I<Befehl>"
 
 #. type: Plain text
-#: ippeveprinter.1:136
+#: ippeveprinter.1:150
 msgid ""
 "Run the specified command for each document that is printed.  If \"command\" "
 "is not an absolute path (\"/path/to/command\"), B<ippeveprinter> looks for "
@@ -9577,13 +9652,13 @@ msgstr ""
 "Handbuchseite B<cups>(1) für weitere Details."
 
 #. type: TP
-#: ippeveprinter.1:136
+#: ippeveprinter.1:150
 #, no-wrap
 msgid "B<-d >I<spool-directory>"
 msgstr "B<-d >I<Spool-Verzeichnis>"
 
 #. type: Plain text
-#: ippeveprinter.1:140
+#: ippeveprinter.1:154
 msgid ""
 "Specifies the directory that will hold the print files.  The default is a "
 "directory under the user's current temporary directory."
@@ -9593,13 +9668,13 @@ msgstr ""
 "Benutzers."
 
 #. type: TP
-#: ippeveprinter.1:140
+#: ippeveprinter.1:154
 #, no-wrap
 msgid "B<-f >I<type/subtype[,...]>"
 msgstr "B<-f >I<Typ/Untertyp[,…]>"
 
 #. type: Plain text
-#: ippeveprinter.1:144
+#: ippeveprinter.1:158
 msgid ""
 "Specifies a list of MIME media types that the server will accept.  The "
 "default depends on the type of printer created."
@@ -9608,13 +9683,13 @@ msgstr ""
 "Vorgabe hängt vom Typ des erstellten Druckers ab."
 
 #. type: TP
-#: ippeveprinter.1:144
+#: ippeveprinter.1:158
 #, no-wrap
 msgid "B<-i >I<iconfile.png>"
 msgstr "B<-i >I<Icon-Datei.png>"
 
 #. type: Plain text
-#: ippeveprinter.1:149
+#: ippeveprinter.1:163
 msgid ""
 "Specifies the printer icon file for the server.  The file must be a PNG "
 "format image.  The default is an internally-provided PNG image."
@@ -9623,25 +9698,25 @@ msgstr ""
 "Format PNG sein. Die Vorgabe ist ein intern bereitgestelltes PNG-Bild."
 
 #. type: TP
-#: ippeveprinter.1:149
+#: ippeveprinter.1:163
 #, no-wrap
 msgid "B<-k>"
 msgstr "B<-k>"
 
 #. type: Plain text
-#: ippeveprinter.1:152
+#: ippeveprinter.1:166
 msgid ""
 "Keeps the print documents in the spool directory rather than deleting them."
 msgstr "Belässt die Druckdokumente im Spool-Verzeichnis, statt sie zu löschen."
 
 #. type: TP
-#: ippeveprinter.1:152
+#: ippeveprinter.1:166
 #, no-wrap
 msgid "B<-l >I<location>"
 msgstr "B<-l >I<Ort>"
 
 #. type: Plain text
-#: ippeveprinter.1:156
+#: ippeveprinter.1:170
 msgid ""
 "Specifies the human-readable location string that is reported by the "
 "server.  The default is the empty string."
@@ -9650,24 +9725,24 @@ msgstr ""
 "wird. Die Vorgabe ist die leere Zeichenkette."
 
 #. type: TP
-#: ippeveprinter.1:156 lpadmin.8:79
+#: ippeveprinter.1:170 lpadmin.8:79
 #, no-wrap
 msgid "B<-m >I<model>"
 msgstr "B<-m >I<Modell>"
 
 #. type: Plain text
-#: ippeveprinter.1:160
+#: ippeveprinter.1:174
 msgid "Specifies the model name of the printer.  The default is \"Printer\"."
 msgstr "Legt den Modellnamen des Druckers fest. Die Vorgabe ist »Printer«."
 
 #. type: TP
-#: ippeveprinter.1:160
+#: ippeveprinter.1:174
 #, no-wrap
 msgid "B<-n >I<hostname>"
 msgstr "B<-n >I<Rechnername>"
 
 #. type: Plain text
-#: ippeveprinter.1:166
+#: ippeveprinter.1:180
 msgid ""
 "Specifies the hostname that is reported by the server.  The default is the "
 "name returned by the B<hostname>(1)  command."
@@ -9676,13 +9751,13 @@ msgstr ""
 "der durch den Befehl B<hostname>(1) zurückgelieferte Name."
 
 #. type: TP
-#: ippeveprinter.1:166
+#: ippeveprinter.1:180
 #, no-wrap
 msgid "B<-p >I<port>"
 msgstr "B<-p >I<Port>"
 
 #. type: Plain text
-#: ippeveprinter.1:170
+#: ippeveprinter.1:184
 msgid ""
 "Specifies the port number to listen on.  The default is a user-specific "
 "number from 8000 to 8999."
@@ -9691,13 +9766,25 @@ msgstr ""
 "ist eine benutzerspezifische Nummer zwischen 8000 und 8999."
 
 #. type: TP
-#: ippeveprinter.1:170
+#: ippeveprinter.1:184
+#, fuzzy, no-wrap
+#| msgid "B<-r>"
+msgid "B<-r off>"
+msgstr "B<-r>"
+
+#. type: Plain text
+#: ippeveprinter.1:187
+msgid "Turns off DNS-SD service advertisements entirely."
+msgstr ""
+
+#. type: TP
+#: ippeveprinter.1:187
 #, no-wrap
 msgid "B<-r >I<subtype[,subtype]>"
 msgstr "B<-r >I<Untertyp[,Untertyp]>"
 
 #. type: Plain text
-#: ippeveprinter.1:175
+#: ippeveprinter.1:192
 msgid ""
 "Specifies the DNS-SD subtype(s) to advertise.  Separate multiple subtypes "
 "with a comma.  The default is \"_print\"."
@@ -9706,13 +9793,13 @@ msgstr ""
 "Mehrere Untertypen werden mit Kommata getrennt. Die Vorgabe ist »_print«."
 
 #. type: TP
-#: ippeveprinter.1:175
+#: ippeveprinter.1:192
 #, no-wrap
 msgid "B<-s >I<speed[,color-speed]>"
 msgstr "B<-s >I<Geschwindigkeit[,Farb-Geschwindigkeit]>"
 
 #. type: Plain text
-#: ippeveprinter.1:180
+#: ippeveprinter.1:197
 msgid ""
 "Specifies the printer speed in pages per minute.  If two numbers are "
 "specified and the second number is greater than zero, the server will report "
@@ -9723,40 +9810,41 @@ msgstr ""
 "Server angeben, dass er Farbdruck unterstützt. Die Vorgabe ist »10,0«."
 
 #. type: TP
-#: ippeveprinter.1:180
+#: ippeveprinter.1:197
 #, no-wrap
 msgid "B<-v[vvv]>"
 msgstr "B<-v[vvv]>"
 
 #. type: Plain text
-#: ippeveprinter.1:183
+#: ippeveprinter.1:200
 msgid "Be (very) verbose when logging activity to standard error."
 msgstr ""
-"Das Protokollieren der Aktivitäten auf die Standardfehlerausgabe erfolgt (sehr) "
-"ausführlich."
+"Das Protokollieren der Aktivitäten auf die Standardfehlerausgabe erfolgt "
+"(sehr) ausführlich."
 
 #. type: Plain text
-#: ippeveprinter.1:190
+#: ippeveprinter.1:207
 msgid ""
 "The B<ippeveprinter> program returns 1 if it is unable to process the "
 "command-line arguments or register the IPP service.  Otherwise "
 "B<ippeveprinter> will run continuously until terminated."
 msgstr ""
-"Das Programm B<ippeveprinter> liefert 1 zurück, falls es nicht in der Lage ist, "
-"die Befehlszeilenargumente zu verarbeiten oder den IPP-Dienst zu "
-"registrieren. Andernfalls läuft B<ippeveprinter> dauerhaft, bis er beendet wird."
+"Das Programm B<ippeveprinter> liefert 1 zurück, falls es nicht in der Lage "
+"ist, die Befehlszeilenargumente zu verarbeiten oder den IPP-Dienst zu "
+"registrieren. Andernfalls läuft B<ippeveprinter> dauerhaft, bis er beendet "
+"wird."
 
 #. type: Plain text
-#: ippeveprinter.1:194
+#: ippeveprinter.1:211
 msgid ""
 "The B<ippeveprinter> program is unique to CUPS and conforms to the IPP "
 "Everywhere (PWG 5100.14) specification."
 msgstr ""
-"Das Programm B<ippeveprinter> ist eine Besonderheit von CUPS und konform zu der "
-"Spezifikation »IPP Everywhere (PWG 5100.14)«."
+"Das Programm B<ippeveprinter> ist eine Besonderheit von CUPS und konform zu "
+"der Spezifikation »IPP Everywhere (PWG 5100.14)«."
 
 #. type: Plain text
-#: ippeveprinter.1:198
+#: ippeveprinter.1:215
 msgid ""
 "B<ippeveprinter> adds environment variables starting with \"IPP_\" for all "
 "IPP Job attributes in the print request.  For example, when executing a "
@@ -9771,7 +9859,7 @@ msgstr ""
 "Attributes gesetzt."
 
 #. type: Plain text
-#: ippeveprinter.1:201
+#: ippeveprinter.1:218
 msgid ""
 "In addition, all IPP \"xxx-default\" and \"pwg-xxx\" Printer Description "
 "attributes are added to the environment.  For example, the "
@@ -9784,7 +9872,7 @@ msgstr ""
 "Auftragsvorlagenattribut »media« gesetzt."
 
 #. type: Plain text
-#: ippeveprinter.1:205
+#: ippeveprinter.1:222
 msgid ""
 "Enumerated values are converted to their keyword equivalents.  For example, "
 "a \"print-quality\" Job Template attribute with a enum value of 3 will "
@@ -9801,7 +9889,7 @@ msgstr ""
 "»print-quality«."
 
 #. type: Plain text
-#: ippeveprinter.1:207
+#: ippeveprinter.1:224
 msgid ""
 "Finally, the \"CONTENT_TYPE\" environment variable contains the MIME media "
 "type of the document being printed, the \"DEVICE_URI\" environment variable "
@@ -9817,13 +9905,13 @@ msgstr ""
 "»PPD« enthält den PPD-Dateinamen, wie mit der Option »-P« angegeben."
 
 #. type: SH
-#: ippeveprinter.1:207
+#: ippeveprinter.1:224
 #, no-wrap
 msgid "COMMAND OUTPUT"
 msgstr "BEFEHLSAUSGABE"
 
 #. type: Plain text
-#: ippeveprinter.1:209
+#: ippeveprinter.1:226
 msgid ""
 "Unless they communicate directly with a printer, print commands send printer-"
 "ready data to the standard output."
@@ -9832,7 +9920,7 @@ msgstr ""
 "kommunizieren direkt mit einem Drucker."
 
 #. type: Plain text
-#: ippeveprinter.1:213
+#: ippeveprinter.1:230
 msgid ""
 "Print commands can send messages back to B<ippeveprinter> on the standard "
 "error with one of the following prefixes:"
@@ -9841,13 +9929,13 @@ msgstr ""
 "B<ippeveprinter> mit den folgenden Präfixen zurückschicken:"
 
 #. type: TP
-#: ippeveprinter.1:213
+#: ippeveprinter.1:230
 #, no-wrap
 msgid "B<ATTR: >I<attribute=value[ attribute=value]>"
 msgstr "B<ATTR: >I<Attribut=Wert[ Attribut=Wert]>"
 
 #. type: Plain text
-#: ippeveprinter.1:217
+#: ippeveprinter.1:234
 msgid ""
 "Sets the named attribute(s) to the given values.  Currently only the \"job-"
 "impressions\" and \"job-impressions-completed\" Job Status attributes and "
@@ -9862,26 +9950,26 @@ msgstr ""
 "werden."
 
 #. type: TP
-#: ippeveprinter.1:217
+#: ippeveprinter.1:234
 #, no-wrap
 msgid "B<DEBUG: >I<Debugging message>"
 msgstr "B<DEBUG: >I<Fehlersuchnachricht>"
 
 #. type: Plain text
-#: ippeveprinter.1:220
+#: ippeveprinter.1:237
 msgid "Logs a debugging message if at least two -v's have been specified."
 msgstr ""
 "Protokolliert eine Fehlersuchnachricht, falls mindestens zwei »-v« angegeben "
 "wurden."
 
 #. type: TP
-#: ippeveprinter.1:220
+#: ippeveprinter.1:237
 #, no-wrap
 msgid "B<ERROR: >I<Error message>"
 msgstr "B<ERROR: >I<Fehlernachricht>"
 
 #. type: Plain text
-#: ippeveprinter.1:223
+#: ippeveprinter.1:240
 msgid ""
 "Logs an error message and copies the message to the \"job-state-message\" "
 "attribute."
@@ -9890,13 +9978,13 @@ msgstr ""
 "»job-state-message«."
 
 #. type: TP
-#: ippeveprinter.1:223
+#: ippeveprinter.1:240
 #, no-wrap
 msgid "B<INFO: >I<Informational message>"
 msgstr "B<INFO: >I<informative Nachricht>"
 
 #. type: Plain text
-#: ippeveprinter.1:226
+#: ippeveprinter.1:243
 msgid ""
 "Logs an informational/progress message if -v has been specified and copies "
 "the message to the \"job-state-message\" attribute unless an error has been "
@@ -9907,13 +9995,13 @@ msgstr ""
 "message«, falls kein Fehler berichtet wurde."
 
 #. type: TP
-#: ippeveprinter.1:226
+#: ippeveprinter.1:243
 #, no-wrap
 msgid "B<STATE: >I<keyword[,keyword,...]>"
 msgstr "B<STATE: >I<Schlüsselwort[,Schlüsselwort,…]>"
 
 #. type: Plain text
-#: ippeveprinter.1:229
+#: ippeveprinter.1:246
 msgid ""
 "Sets the printer's \"printer-state-reasons\" attribute to the listed "
 "keywords."
@@ -9922,13 +10010,13 @@ msgstr ""
 "Schlüsselwörter."
 
 #. type: TP
-#: ippeveprinter.1:229
+#: ippeveprinter.1:246
 #, no-wrap
 msgid "B<STATE: ->I<keyword[,keyword,...]>"
 msgstr "B<STATE: ->I<Schlüsselwort[,Schlüsselwort,…]>"
 
 #. type: Plain text
-#: ippeveprinter.1:232
+#: ippeveprinter.1:249
 msgid ""
 "Removes the listed keywords from the printer's \"printer-state-reasons\" "
 "attribute."
@@ -9937,13 +10025,13 @@ msgstr ""
 "reasons« des Druckers."
 
 #. type: TP
-#: ippeveprinter.1:232
+#: ippeveprinter.1:249
 #, no-wrap
 msgid "B<STATE: +>I<keyword[,keyword,...]>"
 msgstr "B<STATE: +>I<Schlüsselwort[,Schlüsselwort,…]>"
 
 #. type: Plain text
-#: ippeveprinter.1:235
+#: ippeveprinter.1:252
 msgid ""
 "Adds the listed keywords to the printer's \"printer-state-reasons\" "
 "attribute."
@@ -9952,31 +10040,31 @@ msgstr ""
 "des Druckers hinzu."
 
 #. type: Plain text
-#: ippeveprinter.1:239
+#: ippeveprinter.1:256
 msgid "Run B<ippeveprinter> with a service name of My Cool Printer:"
 msgstr "B<ippeveprinter> mit dem Dienstnamen »Mein Toller Drucker« ausführen:"
 
 #. type: Plain text
-#: ippeveprinter.1:242
+#: ippeveprinter.1:259
 #, no-wrap
 msgid "    ippeveprinter \"My Cool Printer\"\n"
 msgstr "    ippeveprinter \"Mein Toller Drucker\"\n"
 
 #. type: Plain text
-#: ippeveprinter.1:247
+#: ippeveprinter.1:264
 msgid "Run the B<file>(1)  command whenever a job is sent to the server:"
 msgstr ""
 "Den Befehl B<file>(1) immer ausführen, wenn ein Auftrag an den Server "
 "gesendet wird:"
 
 #. type: Plain text
-#: ippeveprinter.1:250
+#: ippeveprinter.1:267
 #, no-wrap
 msgid "    ippeveprinter -c /usr/bin/file \"My Cool Printer\"\n"
 msgstr "    ippeveprinter -c /usr/bin/file \"Mein Toller Drucker\"\n"
 
 #. type: Plain text
-#: ippeveprinter.1:255
+#: ippeveprinter.1:272
 msgid ""
 "B<ippevepcl>(7), B<ippeveps>(7), PWG Internet Printing Protocol Workgroup "
 "(http://www.pwg.org/ipp)"
@@ -10805,9 +10893,9 @@ msgstr ""
 "include-error> ] [ B<--version> ] [ B<-4> ] [ B<-6> ] [ B<-C> ] [ B<-E> ] "
 "[ B<-I> ] [ B<-L> ] [ B<-P> I<Dateiname.plist> ] [ B<-S> ] [ B<-T> "
 "I<Sekunden> ] [ B<-V> I<Version> ] [ B<-X> ] [ B<-c> ] [ B<-d> "
-"I<Name=Wert> ] [ B<-f> I<Dateiname> ] [ B<-h> ] [ B<-i> I<Sekunden> ] [ B<-n> "
-"I<Wiederholungszähler> ] [ B<-q> ] [ B<-t> ] [ B<-v ]> I<Drucker-URI> I<Testdatei> "
-"[ …  I<Testdatei> ]"
+"I<Name=Wert> ] [ B<-f> I<Dateiname> ] [ B<-h> ] [ B<-i> I<Sekunden> ] [ B<-"
+"n> I<Wiederholungszähler> ] [ B<-q> ] [ B<-t> ] [ B<-v ]> I<Drucker-URI> "
+"I<Testdatei> [ …  I<Testdatei> ]"
 
 #. type: Plain text
 #: ipptool.1:88
@@ -13882,12 +13970,12 @@ msgid ""
 "version of CUPS."
 msgstr ""
 "Legt eine Standard-PPD-Datei für den Drucker aus dem Verzeichnis I<Model> "
-"oder mittels einer der Druckerschnittstellen fest. Verwenden Sie die Option I<-"
-"m> mit dem Befehl B<lpinfo>(8), um eine Liste der unterstützten Modelle zu "
-"erhalten. Das Modell »raw« bereinigt jede PPD-Datei und das Modell "
+"oder mittels einer der Druckerschnittstellen fest. Verwenden Sie die Option "
+"I<-m> mit dem Befehl B<lpinfo>(8), um eine Liste der unterstützten Modelle "
+"zu erhalten. Das Modell »raw« bereinigt jede PPD-Datei und das Modell "
 "»everywhere« fragt den von der angegebenen IPP-I<Geräte-URI> referenzierten "
-"Drucker ab. Hinweis: Alle Modelle außer »everywhere« sind veraltet und werden in einer "
-"zukünftigen Version von CUPS nicht mehr unterstützt."
+"Drucker ab. Hinweis: Alle Modelle außer »everywhere« sind veraltet und "
+"werden in einer zukünftigen Version von CUPS nicht mehr unterstützt."
 
 #. type: TP
 #: lpadmin.8:87
@@ -14061,9 +14149,8 @@ msgstr ""
 "»abort-job« (den aktuellen Auftrag bei Fehlern abbrechen), »retry-job« (den "
 "Auftrag in der Zukunft erneut versuchen), »retry-current-job« (den Auftrag "
 "sofort erneut versuchen) oder »stop-printer« (den Drucker bei Fehlern "
-"anhalten) sein. Die "
-"Standardfehlerrichtlinie ist »stop-printer« für Drucker und »retry-current-"
-"job« für Klassen."
+"anhalten) sein. Die Standardfehlerrichtlinie ist »stop-printer« für Drucker "
+"und »retry-current-job« für Klassen."
 
 #. type: TP
 #: lpadmin.8:135
@@ -14265,8 +14352,8 @@ msgid ""
 "printer.  Note: PPD files and printer drivers are deprecated and will not be "
 "supported in a future version of CUPS."
 msgstr ""
-"Legt eine PostScript-Printer-Description-Datei (PPD) für die Verwendung mit dem "
-"Drucker fest. Hinweis: PPD-Dateien und Druckertreiber sind veraltet und "
+"Legt eine PostScript-Printer-Description-Datei (PPD) für die Verwendung mit "
+"dem Drucker fest. Hinweis: PPD-Dateien und Druckertreiber sind veraltet und "
 "werden in einer zukünftigen Version von CUPS nicht mehr unterstützt."
 
 #. type: Plain text
@@ -14276,10 +14363,10 @@ msgid ""
 "password depending on the printing system configuration.  This differs from "
 "the System V version which requires the root user to execute this command."
 msgstr ""
-"Die CUPS-Versionen von B<lpadmin> könnten den Benutzer schließlich, "
-"abhängig von der Konfiguration des Drucksystems, nach einem Zugriffspasswort "
-"fragen. Dies unterscheidet sich von der System-V-Version, die verlangt, dass "
-"der Benutzer »root« diese Befehle ausführt."
+"Die CUPS-Versionen von B<lpadmin> könnten den Benutzer schließlich, abhängig "
+"von der Konfiguration des Drucksystems, nach einem Zugriffspasswort fragen. "
+"Dies unterscheidet sich von der System-V-Version, die verlangt, dass der "
+"Benutzer »root« diese Befehle ausführt."
 
 #. type: Plain text
 #: lpadmin.8:209
@@ -14442,8 +14529,8 @@ msgid ""
 "This program is deprecated and will be removed in a future feature release "
 "of CUPS."
 msgstr ""
-"Dieses Programm ist veraltet und wird in einer zukünftigen "
-"Funktionalitäts-Veröffentlichung von CUPS entfernt werden."
+"Dieses Programm ist veraltet und wird in einer zukünftigen Funktionalitäts-"
+"Veröffentlichung von CUPS entfernt werden."
 
 #. type: Plain text
 #: lpc.8:47
@@ -15914,8 +16001,8 @@ msgid ""
 "\"."
 msgstr ""
 "Die Regeln könnten durch Benutzung von Klammern gruppiert werden, zum "
-"Aneinanderhängen wird »+« für ein logisches UND und »,« oder Leerraumzeichen für "
-"ein logisches ODER und »!« für Negation benutzt."
+"Aneinanderhängen wird »+« für ein logisches UND und »,« oder Leerraumzeichen "
+"für ein logisches ODER und »!« für Negation benutzt."
 
 #. type: SS
 #: mime.types.5:37
@@ -16099,9 +16186,9 @@ msgid ""
 "containing whitespace and angle brackets (E<lt>E<gt>) for hexadecimal "
 "strings."
 msgstr ""
-"Zeichenkettenkonstanten können für Zeichenketten, die Leerraumzeichen und spitze "
-"Klammern (E<lt>E<gt>) für hexadezimale Zeichenketten enthalten, innerhalb "
-"von Anführungszeichen (\"\") angegeben werden."
+"Zeichenkettenkonstanten können für Zeichenketten, die Leerraumzeichen und "
+"spitze Klammern (E<lt>E<gt>) für hexadezimale Zeichenketten enthalten, "
+"innerhalb von Anführungszeichen (\"\") angegeben werden."
 
 #. type: SS
 #: mime.types.5:78
@@ -17188,11 +17275,18 @@ msgstr ""
 "B<mime.convs>(5), B<mime.types>(5), B<printers.conf>(5), CUPS-Online-Hilfe "
 "(http://localhost:631/help)"
 
+#~ msgid "17 May 2019"
+#~ msgstr "17. Mai 2019"
+
 #~ msgid "client.conf - client configuration file for cups"
 #~ msgstr "classes.conf - Client-konfigurationsdatei für CUPS"
 
-#~ msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
-#~ msgstr "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
+#~ msgid ""
+#~ "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] "
+#~ "[I<DenyTLS1.0>]"
+#~ msgstr ""
+#~ "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] "
+#~ "[I<DenyTLS1.0>]"
 
 #~ msgid ""
 #~ "Sets encryption options (only in /etc/cups/client.conf).  By default, "
@@ -17562,9 +17656,6 @@ msgstr ""
 #~ "CUPS-Online-Hilfe (http://localhost:631/help), Adobe PostScript Language "
 #~ "Document Structuring Conventions Specification, Version 3.0."
 
-#~ msgid "19 October 2015"
-#~ msgstr "19. Oktober 2015"
-
 #~ msgid "14 February 2018"
 #~ msgstr "14. Februar 2018"
 
@@ -18902,10 +18993,6 @@ msgstr ""
 #~ "Die CUPS-Version von I<lpc> implementiert nicht alle Standardbefehle der "
 #~ "Berkeley- oder LPRng-Version."
 
-# type: TH
-#~ msgid "5 December 2008"
-#~ msgstr "5. Dezember 2008"
-
 # type: TP
 #~ msgid "--"
 #~ msgstr "--"
diff --git a/debian/manpage-po4a/po/fr.po b/debian/manpage-po4a/po/fr.po
index 701354e7a..0942f50fb 100644
--- a/debian/manpage-po4a/po/fr.po
+++ b/debian/manpage-po4a/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cups-2.0.3-6\n"
-"POT-Creation-Date: 2019-09-02 10:31+0200\n"
+"POT-Creation-Date: 2019-12-13 17:30+0100\n"
 "PO-Revision-Date: 2018-04-25 11:57+0200\n"
 "Last-Translator: Jean-Paul Guillonneau <guillonneau.jeanpaul@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -44,15 +44,15 @@ msgstr "CUPS"
 
 # type: TH
 #. type: TH
-#: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
-#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd-helper.8:10
-#: cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:10 cupsfilter.8:9
-#: cups-lpd.8:10 cups-snmp.8:9 cups-snmp.conf.5:10 cupstestppd.1:10 filter.7:10
-#: ippfind.1:9 ipptool.1:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10
-#: lpmove.8:10 lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9
-#: mailto.conf.5:10 mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10
-#: ppdcfile.5:10 ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10
-#: printers.conf.5:9 subscriptions.conf.5:10
+#: backend.7:10 cancel.1:10 classes.conf.5:10 cups.1:10 cupsaccept.8:10
+#: cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd-helper.8:10 cupsd-logs.5:10
+#: cupsenable.8:10 cups-files.conf.5:10 cupsfilter.8:9 cups-lpd.8:10
+#: cups-snmp.8:9 cups-snmp.conf.5:10 cupstestppd.1:10 filter.7:10 ippfind.1:9
+#: ipptool.1:9 lp.1:10 lpadmin.8:10 lpc.8:10 lpinfo.8:10 lpmove.8:10
+#: lpoptions.1:10 lpq.1:10 lpr.1:10 lprm.1:10 lpstat.1:9 mailto.conf.5:10
+#: mime.convs.5:10 mime.types.5:10 notifier.7:10 ppdc.1:10 ppdcfile.5:10
+#: ppdhtml.1:10 ppdi.1:10 ppdmerge.1:10 ppdpo.1:10 printers.conf.5:9
+#: subscriptions.conf.5:10
 #, no-wrap
 msgid "26 April 2019"
 msgstr "26 avril 2019"
@@ -193,7 +193,7 @@ msgstr ""
 #: cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:13
 #: cupsd-helper.8:46 cupsd-logs.5:13 cupsenable.8:46 cups-files.conf.5:13
 #: cupsfilter.8:54 cups-lpd.8:23 cups-snmp.8:23 cups-snmp.conf.5:13
-#: cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:79 ippfind.1:32
+#: cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:84 ippfind.1:32
 #: ipptool.1:75 ipptoolfile.5:12 lp.1:84 lpadmin.8:54 lpc.8:20 lpinfo.8:60
 #: lpmove.8:37 lpoptions.1:53 lpq.1:31 lpr.1:53 lprm.1:31 lpstat.1:65
 #: mailto.conf.5:13 mime.convs.5:13 mime.types.5:13 notifier.7:19 ppdc.1:45
@@ -477,7 +477,7 @@ msgstr ""
 # type: SH
 #. type: SH
 #: backend.7:135 cupsfilter.8:102 cupstestppd.1:110 ippevepcl.7:39
-#: ippeveprinter.1:183 ippfind.1:214 ipptool.1:191
+#: ippeveprinter.1:200 ippfind.1:214 ipptool.1:191
 #, no-wrap
 msgid "EXIT STATUS"
 msgstr "CODE DE RETOUR"
@@ -656,7 +656,7 @@ msgstr "Tous les autres codes de retour sont réservés."
 # type: SH
 #. type: SH
 #: backend.7:173 cups.1:60 cupsfilter.8:105 cups-snmp.8:37 ippevepcl.7:41
-#: ippeveprinter.1:194 ippfind.1:216
+#: ippeveprinter.1:211 ippfind.1:216
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "ENVIRONNEMENT"
@@ -701,7 +701,7 @@ msgstr "I</etc/cups/cups-files.conf>"
 
 # type: SH
 #. type: SH
-#: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:110
+#: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:126
 #: cups.1:122 cupsd.conf.5:858 cupsd-helper.8:77 cups-files.conf.5:273
 #: cupsfilter.8:117 cups-lpd.8:60 cups-snmp.8:44 cups-snmp.conf.5:58
 #: cupstestppd.1:138 filter.7:201 lpadmin.8:203 lpc.8:40 lpinfo.8:117 lpr.1:151
@@ -765,11 +765,11 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:122 cups.1:126
+#: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:138 cups.1:126
 #: cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:895
 #: cupsd-helper.8:81 cupsd-logs.5:216 cupsenable.8:88 cups-files.conf.5:280
 #: cupsfilter.8:131 cups-lpd.8:111 cups-snmp.8:49 cups-snmp.conf.5:62
-#: cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:251
+#: cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:268
 #: ippfind.1:255 ipptool.1:246 ipptoolfile.5:649 lp.1:219 lpadmin.8:224
 #: lpc.8:47 lpinfo.8:121 lpmove.8:66 lpoptions.1:110 lpq.1:56 lpr.1:171
 #: lprm.1:74 lpstat.1:140 mailto.conf.5:40 mime.convs.5:54 mime.types.5:100
@@ -797,11 +797,11 @@ msgstr "Aide en ligne de CUPS : E<lt>URL:I<http://localhost:631/help>E<gt>"
 
 # type: SH
 #. type: SH
-#: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:126 cups.1:142
+#: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:142 cups.1:142
 #: cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:904
 #: cupsd-helper.8:89 cupsd-logs.5:221 cupsenable.8:96 cups-files.conf.5:290
 #: cupsfilter.8:138 cups-lpd.8:118 cups-snmp.8:55 cups-snmp.conf.5:65
-#: cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:255
+#: cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:272
 #: ippfind.1:257 ipptool.1:251 ipptoolfile.5:654 lp.1:228 lpadmin.8:230
 #: lpc.8:57 lpinfo.8:124 lpmove.8:73 lpoptions.1:117 lpq.1:63 lpr.1:180
 #: lprm.1:81 lpstat.1:147 mailto.conf.5:43 mime.convs.5:61 mime.types.5:107
@@ -813,11 +813,11 @@ msgstr "COPYRIGHT"
 
 # type: Plain text
 #. type: Plain text
-#: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:127 cups.1:143
+#: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:143 cups.1:143
 #: cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:905
 #: cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cups-files.conf.5:291
 #: cupsfilter.8:139 cups-lpd.8:119 cups-snmp.8:56 cups-snmp.conf.5:66
-#: cupstestppd.1:147 filter.7:221 ippeveprinter.1:256 ipptool.1:252
+#: cupstestppd.1:147 filter.7:221 ippeveprinter.1:273 ipptool.1:252
 #: ipptoolfile.5:655 lp.1:229 lpadmin.8:231 lpc.8:58 lpinfo.8:125 lpmove.8:74
 #: lpoptions.1:118 lpq.1:64 lpr.1:181 lprm.1:82 lpstat.1:148 mailto.conf.5:44
 #: mime.convs.5:62 mime.types.5:108 notifier.7:36 ppdc.1:102 ppdcfile.5:161
@@ -865,7 +865,7 @@ msgstr ""
 #. type: SH
 #: cancel.1:40 cupsaccept.8:50 cups-config.1:52 cupsctl.8:40 cupsd.8:37
 #: cupsd.conf.5:485 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:32
-#: cupstestppd.1:58 filter.7:60 ippeveprinter.1:82 ippfind.1:191 ipptool.1:88
+#: cupstestppd.1:58 filter.7:60 ippeveprinter.1:87 ippfind.1:191 ipptool.1:88
 #: lp.1:94 lpadmin.8:73 lpinfo.8:63 lpmove.8:39 lpoptions.1:68 lpq.1:36
 #: lpr.1:64 lprm.1:36 lpstat.1:68 ppdc.1:48 ppdhtml.1:25 ppdi.1:30
 #: ppdmerge.1:28 ppdpo.1:28
@@ -964,7 +964,7 @@ msgstr "Supprimer les fichiers de données des travaux en plus de l’annulation
 #. type: SH
 #: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:873
 #: cupsenable.8:77 cups-lpd.8:46 cups-snmp.8:47 filter.7:199
-#: ippeveprinter.1:190 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97
+#: ippeveprinter.1:207 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97
 #: lpoptions.1:108 lprm.1:52 lpstat.1:133
 #, no-wrap
 msgid "CONFORMING TO"
@@ -986,7 +986,7 @@ msgstr ""
 # type: SH
 #. type: SH
 #: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:875
-#: cupstestppd.1:125 ippeveprinter.1:235 ippfind.1:242 ipptool.1:233 lp.1:201
+#: cupstestppd.1:125 ippeveprinter.1:252 ippfind.1:242 ipptool.1:233 lp.1:201
 #: lpinfo.8:99 lpmove.8:50 lpr.1:153 lprm.1:56 mime.convs.5:43 mime.types.5:89
 #, no-wrap
 msgid "EXAMPLES"
@@ -1105,6 +1105,14 @@ msgstr ""
 msgid "client.conf"
 msgstr "client.conf"
 
+# type: TH
+#. type: TH
+#: client.conf.5:10
+#, fuzzy, no-wrap
+#| msgid "19 October 2017"
+msgid "15 October 2019"
+msgstr "19 octobre 2017"
+
 # type: Plain text
 #. type: Plain text
 #: client.conf.5:13
@@ -1151,8 +1159,9 @@ msgid "DIRECTIVES"
 msgstr "DIRECTIVES"
 
 # type: Plain text
+#. #AllowAnyRoot
 #. type: Plain text
-#: client.conf.5:23
+#: client.conf.5:24
 msgid ""
 "The following directives are understood by the client. Consult the online "
 "help for detailed descriptions:"
@@ -1161,19 +1170,20 @@ msgstr ""
 "reporter à l'aide en ligne pour une description plus détaillée :"
 
 #. type: TP
-#: client.conf.5:23
+#: client.conf.5:24
 #, no-wrap
 msgid "B<AllowAnyRoot Yes>"
 msgstr "B<AllowAnyRoot> I<Yes>"
 
 #. type: TP
-#: client.conf.5:25
+#: client.conf.5:26
 #, no-wrap
 msgid "B<AllowAnyRoot No>"
 msgstr "B<AllowAnyRoot> I<No>"
 
+#. #AllowExpiredCerts
 #. type: Plain text
-#: client.conf.5:29
+#: client.conf.5:31
 msgid ""
 "Specifies whether to allow TLS with certificates that have not been signed "
 "by a trusted Certificate Authority.  The default is \"Yes\"."
@@ -1182,19 +1192,20 @@ msgstr ""
 "signés par des autorités de certification de confiance. Par défaut, « Yes »."
 
 #. type: TP
-#: client.conf.5:29
+#: client.conf.5:31
 #, no-wrap
 msgid "B<AllowExpiredCerts Yes>"
 msgstr "B<AllowExpiredCerts> I<Yes>"
 
 #. type: TP
-#: client.conf.5:31
+#: client.conf.5:33
 #, no-wrap
 msgid "B<AllowExpiredCerts No>"
 msgstr "B<AllowExpiredCerts> I<No>"
 
+#. #DigestOptions
 #. type: Plain text
-#: client.conf.5:35
+#: client.conf.5:38
 msgid ""
 "Specifies whether to allow TLS with expired certificates.  The default is "
 "\"No\"."
@@ -1202,41 +1213,64 @@ msgstr ""
 "Indiquer s’il faut utiliser TLS avec des certificats périmés. Par défaut, "
 "« No »."
 
+#. type: TP
+#: client.conf.5:38
+#, no-wrap
+msgid "B<DigestOptions DenyMD5>"
+msgstr ""
+
+#. type: TP
+#: client.conf.5:40
+#, fuzzy, no-wrap
+#| msgid "B<SSLOptions None>"
+msgid "B<DigestOptions None>"
+msgstr "B<SSLOptions> I<None>"
+
+#. #Encryption
+#. type: Plain text
+#: client.conf.5:45
+msgid ""
+"Specifies HTTP Digest authentication options.  B<DenyMD5> disables support "
+"for the original MD5 hash algorithm."
+msgstr ""
+
 # type: TP
 #. type: TP
-#: client.conf.5:35 cupsd.conf.5:732
+#: client.conf.5:45 cupsd.conf.5:732
 #, no-wrap
 msgid "B<Encryption IfRequested>"
 msgstr "B<Encryption> I<IfRequested>"
 
 # type: TP
 #. type: TP
-#: client.conf.5:37 cupsd.conf.5:734
+#: client.conf.5:47 cupsd.conf.5:734
 #, no-wrap
 msgid "B<Encryption Never>"
 msgstr "B<Encryption> I<Never>"
 
 # type: TP
 #. type: TP
-#: client.conf.5:39 cupsd.conf.5:736
+#: client.conf.5:49 cupsd.conf.5:736
 #, no-wrap
 msgid "B<Encryption Required>"
 msgstr "B<Encryption> I<Required>"
 
 # type: Plain text
+#. #GSSServiceName
 #. type: Plain text
-#: client.conf.5:42
+#: client.conf.5:53
 msgid "Specifies the level of encryption that should be used."
 msgstr "Définir si un chiffrement doit être utilisé."
 
 #. type: TP
-#: client.conf.5:42 cupsd.conf.5:165
+#: client.conf.5:53 cupsd.conf.5:165
 #, no-wrap
 msgid "B<GSSServiceName >I<name>"
 msgstr "B<GSSServiceName> I<nom>"
 
+#. #ServerName
 #. type: Plain text
-#: client.conf.5:46
+#: client.conf.5:58
 msgid ""
 "Specifies the Kerberos service name that is used for authentication, "
 "typically \"host\", \"http\", or \"ipp\".  CUPS adds the remote hostname "
@@ -1249,21 +1283,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: client.conf.5:46
+#: client.conf.5:58
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]"
 msgstr "B<ServerName> I<nom_hôte>-ou-I<adresse-ip>[B<:>I<port>]"
 
 # type: TP
 #. type: TP
-#: client.conf.5:48
+#: client.conf.5:60
 #, no-wrap
 msgid "B<ServerName >I</domain/socket>"
 msgstr "B<ServerName> I</domaine/socket>"
 
 # type: Plain text
 #. type: Plain text
-#: client.conf.5:52
+#: client.conf.5:64
 msgid ""
 "Specifies the address and optionally the port to use when connecting to the "
 "server.  B<Note: This directive is not supported on macOS 10.7 or later.>"
@@ -1274,14 +1308,15 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: client.conf.5:52
+#: client.conf.5:64
 #, no-wrap
 msgid "B<ServerName >I<hostname-or-ip-address>[I<:port>]B</version=1.1>"
 msgstr "B<ServerName> I<nom_hôte>-ou-I<adresse-ip>[B<:>I<port>]B</version=1.1>"
 
 # type: Plain text
+#. #SSLOptions
 #. type: Plain text
-#: client.conf.5:55
+#: client.conf.5:68
 msgid ""
 "Specifies the address and optionally the port to use when connecting to a "
 "server running CUPS 1.3.12 and earlier."
@@ -1290,20 +1325,20 @@ msgstr ""
 "serveur sous CUPS version 1.3.12 ou précédente."
 
 #. type: TP
-#: client.conf.5:55 cupsd.conf.5:437
+#: client.conf.5:68 cupsd.conf.5:437
 #, no-wrap
 msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>] [I<MaxTLS1.0>] [I<MaxTLS1.1>] [I<MaxTLS1.2>] [I<MaxTLS1.3>] [I<MinTLS1.0>] [I<MinTLS1.1>] [I<MinTLS1.2>] [I<MinTLS1.3>]"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:57 cupsd.conf.5:439
+#: client.conf.5:70 cupsd.conf.5:439
 #, no-wrap
 msgid "B<SSLOptions None>"
 msgstr "B<SSLOptions> I<None>"
 
 #. #SSLPort
 #. type: Plain text
-#: client.conf.5:71 cupsd.conf.5:454
+#: client.conf.5:85 cupsd.conf.5:454
 #, fuzzy
 msgid ""
 "Sets encryption options (only in /etc/cups/client.conf).  By default, CUPS "
@@ -1336,20 +1371,21 @@ msgstr ""
 "minimale du protocole à TLS version 1.1."
 
 #. type: TP
-#: client.conf.5:71
+#: client.conf.5:85
 #, no-wrap
 msgid "B<TrustOnFirstUse Yes>"
 msgstr "B<TrustOnFirstUse> I<Yes>"
 
 #. type: TP
-#: client.conf.5:73
+#: client.conf.5:87
 #, no-wrap
 msgid "B<TrustOnFirstUse No>"
 msgstr "B<TrustOnFirstUse> I<No>"
 
 # type: Plain text
+#. #User
 #. type: Plain text
-#: client.conf.5:77
+#: client.conf.5:92
 msgid ""
 "Specifies whether to trust new TLS certificates by default.  The default is "
 "\"Yes\"."
@@ -1359,7 +1395,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: client.conf.5:77
+#: client.conf.5:92
 #, no-wrap
 msgid "B<User >I<name>"
 msgstr "B<User> I<nom>"
@@ -1367,61 +1403,62 @@ msgstr "B<User> I<nom>"
 # type: Plain text
 #. #UserAgentTokens
 #. type: Plain text
-#: client.conf.5:81
+#: client.conf.5:96
 msgid "Specifies the default user name to use for requests."
 msgstr "Indiquer le nom d'utilisateur par défaut à utiliser pour les requêtes."
 
 # type: TP
 #. type: TP
-#: client.conf.5:81
+#: client.conf.5:96
 #, fuzzy, no-wrap
 msgid "B<UserAgentTokens None>"
 msgstr "B<ServerTokens> I<None>"
 
 # type: TP
 #. type: TP
-#: client.conf.5:83
+#: client.conf.5:98
 #, fuzzy, no-wrap
 msgid "B<UserAgentTokens ProductOnly>"
 msgstr "B<ServerTokens> I<ProductOnly>"
 
 # type: TP
 #. type: TP
-#: client.conf.5:85
+#: client.conf.5:100
 #, fuzzy, no-wrap
 msgid "B<UserAgentTokens Major>"
 msgstr "B<ServerTokens> I<Major>"
 
 # type: TP
 #. type: TP
-#: client.conf.5:87
+#: client.conf.5:102
 #, fuzzy, no-wrap
 msgid "B<UserAgentTokens Minor>"
 msgstr "B<ServerTokens> I<Minor>"
 
 # type: TP
 #. type: TP
-#: client.conf.5:89
+#: client.conf.5:104
 #, fuzzy, no-wrap
 msgid "B<UserAgentTokens Minimal>"
 msgstr "B<ServerTokens> I<Minimal>"
 
 # type: TP
 #. type: TP
-#: client.conf.5:91
+#: client.conf.5:106
 #, fuzzy, no-wrap
 msgid "B<UserAgentTokens OS>"
 msgstr "B<ServerTokens> I<OS>"
 
 # type: TP
 #. type: TP
-#: client.conf.5:93
+#: client.conf.5:108
 #, fuzzy, no-wrap
 msgid "B<UserAgentTokens Full>"
 msgstr "B<ServerTokens> I<Full>"
 
+#. #ValidateCerts
 #. type: Plain text
-#: client.conf.5:104
+#: client.conf.5:120
 #, fuzzy
 msgid ""
 "Specifies what information is included in the User-Agent header of HTTP "
@@ -1440,19 +1477,19 @@ msgstr ""
 "« CUPS 2.0.0 (UNAME) IPP/2.0 ». Par défaut, « Minimal »."
 
 #. type: TP
-#: client.conf.5:104
+#: client.conf.5:120
 #, no-wrap
 msgid "B<ValidateCerts Yes>"
 msgstr "B<ValidateCerts> I<Yes>"
 
 #. type: TP
-#: client.conf.5:106
+#: client.conf.5:122
 #, no-wrap
 msgid "B<ValidateCerts No>"
 msgstr "B<ValidateCerts> I<No>"
 
 #. type: Plain text
-#: client.conf.5:110
+#: client.conf.5:126
 msgid ""
 "Specifies whether to only allow TLS with certificates whose common name "
 "matches the hostname.  The default is \"No\"."
@@ -1461,7 +1498,7 @@ msgstr ""
 "usuel correspond au nom d’hôte. Par défaut, « No »."
 
 #. type: Plain text
-#: client.conf.5:115
+#: client.conf.5:131
 msgid ""
 "The B<client.conf> file is deprecated on macOS and will no longer be "
 "supported in a future version of CUPS.  Configuration settings can instead "
@@ -1473,7 +1510,7 @@ msgstr ""
 "B<defaults>(1) :"
 
 #. type: Plain text
-#: client.conf.5:118
+#: client.conf.5:134
 #, no-wrap
 msgid ""
 "defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required\n"
@@ -1483,13 +1520,13 @@ msgstr ""
 "defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO\n"
 
 #. type: Plain text
-#: client.conf.5:120
+#: client.conf.5:136
 #, no-wrap
 msgid "defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption\n"
 msgstr "defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption\n"
 
 #. type: Plain text
-#: client.conf.5:122
+#: client.conf.5:138
 msgid ""
 "On Linux and other systems using GNU TLS, the I</etc/cups/ssl/site.crl> "
 "file, if present, provides a list of revoked X.509 certificates and is used "
@@ -1501,7 +1538,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: client.conf.5:126
+#: client.conf.5:142
 msgid "B<cups>(1), B<default>(1), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 "B<cupsd>(1), B<default>(7), aide en ligne de CUPS E<lt>URL:I<http://"
@@ -2268,7 +2305,7 @@ msgstr "Afficher le répertoire de données par défaut de CUPS."
 
 # type: TP
 #. type: TP
-#: cups-config.1:66 ippeveprinter.1:85 ippfind.1:193 ipptool.1:91
+#: cups-config.1:66 ippeveprinter.1:90 ippfind.1:193 ipptool.1:91
 #, no-wrap
 msgid "B<--help>"
 msgstr "B<--help>"
@@ -2354,7 +2391,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cups-config.1:84 ippeveprinter.1:91 ippfind.1:196 ipptool.1:106
+#: cups-config.1:84 ippeveprinter.1:100 ippfind.1:196 ipptool.1:106
 #, no-wrap
 msgid "B<--version>"
 msgstr "B<--version>"
@@ -2894,7 +2931,6 @@ msgstr "cupsd.conf"
 #. type: TH
 #: cupsd.conf.5:10
 #, no-wrap
-#| msgid "16 July 2012"
 msgid "16 July 2019"
 msgstr "16 juillet 2019"
 
@@ -10073,9 +10109,10 @@ msgstr "/printers"
 # type: TH
 #. type: TH
 #: ippeveprinter.1:9
-#, no-wrap
-msgid "17 May 2019"
-msgstr "17 mai 2019"
+#, fuzzy, no-wrap
+#| msgid "5 December 2008"
+msgid "2 December 2019"
+msgstr "5 décembre 2008"
 
 #. type: Plain text
 #: ippeveprinter.1:12
@@ -10084,17 +10121,18 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ippeveprinter.1:79
+#: ippeveprinter.1:84
 #, fuzzy
 msgid ""
-"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] "
-"[ B<-2> ] [ B<-D> I<device-uri> ] [ B<-F> I<output-type/subtype> ] [ B<-K> "
-"I<keypath> ] [ B<-M> I<manufacturer> ] [ B<-P> I<filename.ppd> ] [ B<-V> "
-"I<ipp-version> ] [ B<-a> I<filename.conf> ] [ B<-c> I<command> ] [ B<-d> "
-"I<spool-directory> ] [ B<-f> I<type/subtype[,...]> ] [ B<-i> I<iconfile."
-"png> ] [ B<-k> ] [ B<-l> I<location> ] [ B<-m> I<model> ] [ B<-n> "
-"I<hostname> ] [ B<-p> I<port> ] [ B<-r> I<subtype[,subtype]> ] [ B<-s> "
-"I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
+"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--pam-service> "
+"I<service> ] [ B<--version> ] [ B<-2> ] [ B<-A> ] [ B<-D> I<device-uri> ] "
+"[ B<-F> I<output-type/subtype> ] [ B<-K> I<keypath> ] [ B<-M> "
+"I<manufacturer> ] [ B<-P> I<filename.ppd> ] [ B<-V> I<ipp-version> ] [ B<-a> "
+"I<filename.conf> ] [ B<-c> I<command> ] [ B<-d> I<spool-directory> ] [ B<-f> "
+"I<type/subtype[,...]> ] [ B<-i> I<iconfile.png> ] [ B<-k> ] [ B<-l> "
+"I<location> ] [ B<-m> I<model> ] [ B<-n> I<hostname> ] [ B<-p> I<port> ] "
+"[ B<-r> I<subtype[,subtype]> ] [ B<-s> I<speed[,color-speed]> ] [ B<-"
+"v[vvv]> ] I<service-name>"
 msgstr ""
 "B<ippserver> [ B<-2> ] [ B<-M> I<fabricant> ] [ B<-P> ] [ B<-c> "
 "I<commande> ] [ B<-d> I<rép_spool> ] [ B<-f> I<type/sous-type[,...]> ] [ B<-"
@@ -10103,7 +10141,7 @@ msgstr ""
 "s> I<vitesse[,vitesse_couleur-]> ] [ B<-v[vvv]> ] I<service>"
 
 #. type: Plain text
-#: ippeveprinter.1:82
+#: ippeveprinter.1:87
 #, fuzzy
 msgid ""
 "B<ippeveprinter> is a simple Internet Printing Protocol (IPP) server "
@@ -10118,57 +10156,88 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: ippeveprinter.1:85
+#: ippeveprinter.1:90
 #, fuzzy
 msgid "The following options are recognized by B<ippeveprinter:>"
 msgstr "Les options suivantes sont reconnues par B<ippserver> :"
 
 # type: Plain text
 #. type: Plain text
-#: ippeveprinter.1:88
+#: ippeveprinter.1:93
 #, fuzzy
 msgid "Show program usage."
 msgstr "Afficher un message d'aide."
 
 #. type: TP
-#: ippeveprinter.1:88
+#: ippeveprinter.1:93
 #, no-wrap
 msgid "B<--no-web-forms>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:91
+#: ippeveprinter.1:96
 msgid ""
 "Disable the web interface forms used to update the media and supply levels."
 msgstr ""
 
+# type: TP
+#. type: TP
+#: ippeveprinter.1:96
+#, fuzzy, no-wrap
+msgid "B<--pam-service >I<service>"
+msgstr "B<-p> I<nom_fichier.ppd>"
+
+#. type: Plain text
+#: ippeveprinter.1:100
+#, fuzzy
+#| msgid ""
+#| "Specifies the service name when using Kerberos authentication.  The "
+#| "default service name is \"http.\""
+msgid "Set the PAM service name.  The default service is \"cups\"."
+msgstr ""
+"Indiquer le nom de service lors de l'utilisation de l'authentification "
+"Kerberos. Le nom du service par défaut est « http »."
+
 # type: Plain text
 #. type: Plain text
-#: ippeveprinter.1:94
+#: ippeveprinter.1:103
 #, fuzzy
 msgid "Show the CUPS version."
 msgstr "Afficher si le serveur CUPS est actif."
 
 #. type: TP
-#: ippeveprinter.1:94
+#: ippeveprinter.1:103
 #, no-wrap
 msgid "B<-2>"
 msgstr "B<-2>"
 
 #. type: Plain text
-#: ippeveprinter.1:97
+#: ippeveprinter.1:106
 msgid "Report support for two-sided (duplex) printing."
 msgstr "Déclaration de prise en charge de l’impression recto-verso (duplex)."
 
+#. type: TP
+#: ippeveprinter.1:106
+#, no-wrap
+msgid "B<-A>"
+msgstr ""
+
+#. type: Plain text
+#: ippeveprinter.1:111
+msgid ""
+"Enable authentication for the created printer.  B<ippeveprinter> uses PAM to "
+"authenticate HTTP Basic credentials."
+msgstr ""
+
 # type: TP
 #. type: TP
-#: ippeveprinter.1:97
+#: ippeveprinter.1:111
 #, fuzzy, no-wrap
 msgid "B<-D >I<device-uri>"
 msgstr "B<-v \">I<uri_périphérique>B<\">"
 
 #. type: Plain text
-#: ippeveprinter.1:104
+#: ippeveprinter.1:118
 msgid ""
 "Set the device URI for print output.  The URI can be a filename, directory, "
 "or a network socket URI of the form \"socket://ADDRESS[:PORT]\" (where the "
@@ -10178,13 +10247,13 @@ msgstr ""
 
 # type: TH
 #. type: TP
-#: ippeveprinter.1:104
+#: ippeveprinter.1:118
 #, fuzzy, no-wrap
 msgid "B<-F >I<output-type/subtype[,...]>"
 msgstr "B<-f >I<type/sous-type[,...]>"
 
 #. type: Plain text
-#: ippeveprinter.1:108
+#: ippeveprinter.1:122
 msgid ""
 "Specifies the output MIME media type.  The default is \"application/"
 "postscript\" when the B<-P> option is specified."
@@ -10192,27 +10261,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:108
+#: ippeveprinter.1:122
 #, no-wrap
 msgid "B<-M >I<manufacturer>"
 msgstr "B<-M >I<fabricant>"
 
 # type: Plain text
 #. type: Plain text
-#: ippeveprinter.1:112
+#: ippeveprinter.1:126
 #, fuzzy
 msgid "Set the manufacturer of the printer.  The default is \"Example\"."
 msgstr "Définir le fabricant de l’imprimante. Par défaut, « Test »."
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:112
+#: ippeveprinter.1:126
 #, fuzzy, no-wrap
 msgid "B<-P >I<filename.ppd>"
 msgstr "B<-p> I<nom_fichier.ppd>"
 
 #. type: Plain text
-#: ippeveprinter.1:118
+#: ippeveprinter.1:132
 msgid ""
 "Load printer attributes from the specified PPD file.  This option is "
 "typically used in conjunction with the B<ippeveps>(7)  printer command (\"-c "
@@ -10220,33 +10289,33 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:118
+#: ippeveprinter.1:132
 #, fuzzy, no-wrap
 msgid "B<-V 1.1>"
 msgstr "B<VERSION 1.1>"
 
 #. type: TP
-#: ippeveprinter.1:120
+#: ippeveprinter.1:134
 #, fuzzy, no-wrap
 msgid "B<-V 2.0>"
 msgstr "B<VERSION 2.0>"
 
 # type: Plain text
 #. type: Plain text
-#: ippeveprinter.1:124
+#: ippeveprinter.1:138
 #, fuzzy
 msgid "Specifies the maximum IPP version to report.  2.0 is the default."
 msgstr "Indiquer le numéro de version d’IPP à utiliser pour ce test."
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:124
+#: ippeveprinter.1:138
 #, no-wrap
 msgid "B<-c >I<command>"
 msgstr "B<-c >I<commande>"
 
 #. type: Plain text
-#: ippeveprinter.1:136
+#: ippeveprinter.1:150
 msgid ""
 "Run the specified command for each document that is printed.  If \"command\" "
 "is not an absolute path (\"/path/to/command\"), B<ippeveprinter> looks for "
@@ -10260,14 +10329,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:136
+#: ippeveprinter.1:150
 #, no-wrap
 msgid "B<-d >I<spool-directory>"
 msgstr "B<-d >I<rép_spool>"
 
 # type: Plain text
 #. type: Plain text
-#: ippeveprinter.1:140
+#: ippeveprinter.1:154
 msgid ""
 "Specifies the directory that will hold the print files.  The default is a "
 "directory under the user's current temporary directory."
@@ -10277,13 +10346,13 @@ msgstr ""
 
 # type: TH
 #. type: TP
-#: ippeveprinter.1:140
+#: ippeveprinter.1:154
 #, no-wrap
 msgid "B<-f >I<type/subtype[,...]>"
 msgstr "B<-f >I<type/sous-type[,...]>"
 
 #. type: Plain text
-#: ippeveprinter.1:144
+#: ippeveprinter.1:158
 #, fuzzy
 msgid ""
 "Specifies a list of MIME media types that the server will accept.  The "
@@ -10294,14 +10363,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:144
+#: ippeveprinter.1:158
 #, no-wrap
 msgid "B<-i >I<iconfile.png>"
 msgstr "B<-i >I<icône.png>"
 
 # type: Plain text
 #. type: Plain text
-#: ippeveprinter.1:149
+#: ippeveprinter.1:163
 #, fuzzy
 msgid ""
 "Specifies the printer icon file for the server.  The file must be a PNG "
@@ -10310,13 +10379,13 @@ msgstr ""
 "Indiquer le fichier d’icône de l’imprimante. Par défaut, « printer.png ».\"."
 
 #. type: TP
-#: ippeveprinter.1:149
+#: ippeveprinter.1:163
 #, no-wrap
 msgid "B<-k>"
 msgstr "B<-k>"
 
 #. type: Plain text
-#: ippeveprinter.1:152
+#: ippeveprinter.1:166
 msgid ""
 "Keeps the print documents in the spool directory rather than deleting them."
 msgstr ""
@@ -10325,14 +10394,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:152
+#: ippeveprinter.1:166
 #, no-wrap
 msgid "B<-l >I<location>"
 msgstr "B<-l> I<emplacement>"
 
 # type: Plain text
 #. type: Plain text
-#: ippeveprinter.1:156
+#: ippeveprinter.1:170
 msgid ""
 "Specifies the human-readable location string that is reported by the "
 "server.  The default is the empty string."
@@ -10342,27 +10411,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:156 lpadmin.8:79
+#: ippeveprinter.1:170 lpadmin.8:79
 #, no-wrap
 msgid "B<-m >I<model>"
 msgstr "B<-m >I<modèle>"
 
 # type: Plain text
 #. type: Plain text
-#: ippeveprinter.1:160
+#: ippeveprinter.1:174
 msgid "Specifies the model name of the printer.  The default is \"Printer\"."
 msgstr "Définir le nom de modèle de l’imprimante. Par défaut, « Printer »."
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:160
+#: ippeveprinter.1:174
 #, no-wrap
 msgid "B<-n >I<hostname>"
 msgstr "B<-n >I<nom_hôte>"
 
 # type: Plain text
 #. type: Plain text
-#: ippeveprinter.1:166
+#: ippeveprinter.1:180
 msgid ""
 "Specifies the hostname that is reported by the server.  The default is the "
 "name returned by the B<hostname>(1)  command."
@@ -10372,13 +10441,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:166
+#: ippeveprinter.1:180
 #, no-wrap
 msgid "B<-p >I<port>"
 msgstr "B<-p >I<port>"
 
 #. type: Plain text
-#: ippeveprinter.1:170
+#: ippeveprinter.1:184
 msgid ""
 "Specifies the port number to listen on.  The default is a user-specific "
 "number from 8000 to 8999."
@@ -10386,15 +10455,27 @@ msgstr ""
 "Indiquer le numéro de port à écouter. Par défaut, un numéro défini par "
 "l’utilisateur de B<8000> à B<8999>."
 
+#. type: TP
+#: ippeveprinter.1:184
+#, fuzzy, no-wrap
+#| msgid "B<-r>"
+msgid "B<-r off>"
+msgstr "B<-r>"
+
+#. type: Plain text
+#: ippeveprinter.1:187
+msgid "Turns off DNS-SD service advertisements entirely."
+msgstr ""
+
 # type: TH
 #. type: TP
-#: ippeveprinter.1:170
+#: ippeveprinter.1:187
 #, fuzzy, no-wrap
 msgid "B<-r >I<subtype[,subtype]>"
 msgstr "B<-r >I<sous-type>"
 
 #. type: Plain text
-#: ippeveprinter.1:175
+#: ippeveprinter.1:192
 #, fuzzy
 msgid ""
 "Specifies the DNS-SD subtype(s) to advertise.  Separate multiple subtypes "
@@ -10404,13 +10485,13 @@ msgstr ""
 "des virgules. Par défaut, « _print_»."
 
 #. type: TP
-#: ippeveprinter.1:175
+#: ippeveprinter.1:192
 #, no-wrap
 msgid "B<-s >I<speed[,color-speed]>"
 msgstr "B<-s >I<vitesse[,vitesse_couleur]>"
 
 #. type: Plain text
-#: ippeveprinter.1:180
+#: ippeveprinter.1:197
 msgid ""
 "Specifies the printer speed in pages per minute.  If two numbers are "
 "specified and the second number is greater than zero, the server will report "
@@ -10421,20 +10502,20 @@ msgstr ""
 "déclarera une prise en charge de la couleur. Par défaut, « 10,0 »."
 
 #. type: TP
-#: ippeveprinter.1:180
+#: ippeveprinter.1:197
 #, no-wrap
 msgid "B<-v[vvv]>"
 msgstr "B<-v[vvv]>"
 
 #. type: Plain text
-#: ippeveprinter.1:183
+#: ippeveprinter.1:200
 #, fuzzy
 msgid "Be (very) verbose when logging activity to standard error."
 msgstr ""
 "Journaliser de manière (très) détaillée l’activité sur la sortie standard."
 
 #. type: Plain text
-#: ippeveprinter.1:190
+#: ippeveprinter.1:207
 #, fuzzy
 msgid ""
 "The B<ippeveprinter> program returns 1 if it is unable to process the "
@@ -10446,7 +10527,7 @@ msgstr ""
 "B<ippserver> continuera jusqu’à la fin de la commande."
 
 #. type: Plain text
-#: ippeveprinter.1:194
+#: ippeveprinter.1:211
 #, fuzzy
 msgid ""
 "The B<ippeveprinter> program is unique to CUPS and conforms to the IPP "
@@ -10456,7 +10537,7 @@ msgstr ""
 "spécification IPP Everywhere (PWG 5100.14)."
 
 #. type: Plain text
-#: ippeveprinter.1:198
+#: ippeveprinter.1:215
 #, fuzzy
 msgid ""
 "B<ippeveprinter> adds environment variables starting with \"IPP_\" for all "
@@ -10472,7 +10553,7 @@ msgstr ""
 "« IPP_MEDIA » sera définie à la valeur de cet attribut."
 
 #. type: Plain text
-#: ippeveprinter.1:201
+#: ippeveprinter.1:218
 msgid ""
 "In addition, all IPP \"xxx-default\" and \"pwg-xxx\" Printer Description "
 "attributes are added to the environment.  For example, the "
@@ -10481,7 +10562,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:205
+#: ippeveprinter.1:222
 #, fuzzy
 msgid ""
 "Enumerated values are converted to their keyword equivalents.  For example, "
@@ -10497,7 +10578,7 @@ msgstr ""
 "comme valeur « draft » (brouillon)."
 
 #. type: Plain text
-#: ippeveprinter.1:207
+#: ippeveprinter.1:224
 msgid ""
 "Finally, the \"CONTENT_TYPE\" environment variable contains the MIME media "
 "type of the document being printed, the \"DEVICE_URI\" environment variable "
@@ -10509,20 +10590,20 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: ippeveprinter.1:207
+#: ippeveprinter.1:224
 #, fuzzy, no-wrap
 msgid "COMMAND OUTPUT"
 msgstr "COMMANDES"
 
 #. type: Plain text
-#: ippeveprinter.1:209
+#: ippeveprinter.1:226
 msgid ""
 "Unless they communicate directly with a printer, print commands send printer-"
 "ready data to the standard output."
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:213
+#: ippeveprinter.1:230
 msgid ""
 "Print commands can send messages back to B<ippeveprinter> on the standard "
 "error with one of the following prefixes:"
@@ -10530,13 +10611,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:213
+#: ippeveprinter.1:230
 #, fuzzy, no-wrap
 msgid "B<ATTR: >I<attribute=value[ attribute=value]>"
 msgstr "B<ATTR: >I<attribut=valeur >[ I<... attribut=valeur>]"
 
 #. type: Plain text
-#: ippeveprinter.1:217
+#: ippeveprinter.1:234
 msgid ""
 "Sets the named attribute(s) to the given values.  Currently only the \"job-"
 "impressions\" and \"job-impressions-completed\" Job Status attributes and "
@@ -10547,25 +10628,25 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:217
+#: ippeveprinter.1:234
 #, fuzzy, no-wrap
 msgid "B<DEBUG: >I<Debugging message>"
 msgstr "B<DEBUG: >I<message>"
 
 #. type: Plain text
-#: ippeveprinter.1:220
+#: ippeveprinter.1:237
 msgid "Logs a debugging message if at least two -v's have been specified."
 msgstr ""
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:220
+#: ippeveprinter.1:237
 #, fuzzy, no-wrap
 msgid "B<ERROR: >I<Error message>"
 msgstr "B<ERROR:>I< message>"
 
 #. type: Plain text
-#: ippeveprinter.1:223
+#: ippeveprinter.1:240
 msgid ""
 "Logs an error message and copies the message to the \"job-state-message\" "
 "attribute."
@@ -10573,13 +10654,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: ippeveprinter.1:223
+#: ippeveprinter.1:240
 #, fuzzy, no-wrap
 msgid "B<INFO: >I<Informational message>"
 msgstr "B<INFO:>I< message>"
 
 #. type: Plain text
-#: ippeveprinter.1:226
+#: ippeveprinter.1:243
 msgid ""
 "Logs an informational/progress message if -v has been specified and copies "
 "the message to the \"job-state-message\" attribute unless an error has been "
@@ -10587,71 +10668,71 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:226
+#: ippeveprinter.1:243
 #, no-wrap
 msgid "B<STATE: >I<keyword[,keyword,...]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:229
+#: ippeveprinter.1:246
 msgid ""
 "Sets the printer's \"printer-state-reasons\" attribute to the listed "
 "keywords."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:229
+#: ippeveprinter.1:246
 #, no-wrap
 msgid "B<STATE: ->I<keyword[,keyword,...]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:232
+#: ippeveprinter.1:249
 msgid ""
 "Removes the listed keywords from the printer's \"printer-state-reasons\" "
 "attribute."
 msgstr ""
 
 #. type: TP
-#: ippeveprinter.1:232
+#: ippeveprinter.1:249
 #, no-wrap
 msgid "B<STATE: +>I<keyword[,keyword,...]>"
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:235
+#: ippeveprinter.1:252
 msgid ""
 "Adds the listed keywords to the printer's \"printer-state-reasons\" "
 "attribute."
 msgstr ""
 
 #. type: Plain text
-#: ippeveprinter.1:239
+#: ippeveprinter.1:256
 #, fuzzy
 msgid "Run B<ippeveprinter> with a service name of My Cool Printer:"
 msgstr "Exécuter B<ippserver> avec un nom de service de Ma Super Imprimante :"
 
 #. type: Plain text
-#: ippeveprinter.1:242
+#: ippeveprinter.1:259
 #, fuzzy, no-wrap
 msgid "    ippeveprinter \"My Cool Printer\"\n"
 msgstr "    ippserver \"Ma Super Imprimante\"\n"
 
 #. type: Plain text
-#: ippeveprinter.1:247
+#: ippeveprinter.1:264
 msgid "Run the B<file>(1)  command whenever a job is sent to the server:"
 msgstr ""
 "Exécuter la commande B<file>(1) à chaque fois qu’un travail est envoyé au "
 "serveur :"
 
 #. type: Plain text
-#: ippeveprinter.1:250
+#: ippeveprinter.1:267
 #, fuzzy, no-wrap
 msgid "    ippeveprinter -c /usr/bin/file \"My Cool Printer\"\n"
 msgstr "    ippserver -c file \"Ma Super Imprimante\"\n"
 
 #. type: Plain text
-#: ippeveprinter.1:255
+#: ippeveprinter.1:272
 #, fuzzy
 msgid ""
 "B<ippevepcl>(7), B<ippeveps>(7), PWG Internet Printing Protocol Workgroup "
@@ -12003,7 +12084,6 @@ msgstr "ipptoolfile"
 #. type: TH
 #: ipptoolfile.5:9
 #, no-wrap
-#| msgid "5 August 2019"
 msgid "15 August 2019"
 msgstr "15 août 2019"
 
@@ -18417,6 +18497,10 @@ msgstr ""
 "types>(5), B<printers.conf>(5), aide en ligne de CUPS E<lt>URL:I<http://"
 "localhost:631/help>E<gt>."
 
+# type: TH
+#~ msgid "17 May 2019"
+#~ msgstr "17 mai 2019"
+
 # type: TH
 #~ msgid "4 April 2014"
 #~ msgstr "4 avril 2014"
@@ -18429,18 +18513,18 @@ msgstr ""
 #~ msgid "15 April 2014"
 #~ msgstr "15 avril 2014"
 
-# type: TH
-#~ msgid "19 October 2017"
-#~ msgstr "19 octobre 2017"
-
 # type: Plain text
 #, fuzzy
 #~| msgid "classes.conf - class configuration file for cups"
 #~ msgid "client.conf - client configuration file for cups"
 #~ msgstr "classes.conf - Fichier de configuration des classes de CUPS"
 
-#~ msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
-#~ msgstr "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>]"
+#~ msgid ""
+#~ "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] "
+#~ "[I<DenyTLS1.0>]"
+#~ msgstr ""
+#~ "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] "
+#~ "[I<DenyTLS1.0>]"
 
 #~ msgid ""
 #~ "Sets encryption options (only in /etc/cups/client.conf).  By default, "
@@ -20396,10 +20480,6 @@ msgstr ""
 #~ "La version CUPS de B<lpc> n'implémente pas toutes les commandes des "
 #~ "versions Berkeley ou LPRng."
 
-# type: TH
-#~ msgid "5 December 2008"
-#~ msgstr "5 décembre 2008"
-
 # type: TP
 #~ msgid "--"
 #~ msgstr "B<-->"
-- 
cgit v1.2.3


From 2f23786ab0b7be4f646f380957c92971a343612d Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Mon, 23 Dec 2019 16:34:41 +0100
Subject: On Ubuntu i386, drop cups and cups-core-drivers

Closes: #947185
---
 debian/rules | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/rules b/debian/rules
index 19a8da87e..d03b06cba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,10 @@ derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes")
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
+   skip_packages = -Ncups -Ncups-core-drivers
+endif
+
 # The build system uses only DSOFLAGS but not LDFLAGS to build some libraries.
 # Add LDFLAGS to enable (hardening) build flags.
 export DSOFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
@@ -247,3 +251,9 @@ override_dh_installdocs:
 override_dh_installpam:
 	dh_installpam -pcups-daemon --name=cups
 	dh_installpam --remaining-packages
+
+override_dh_builddeb:
+	dh_builddeb ${skip_packages}
+
+override_dh_gencontrol:
+	dh_gencontrol ${skip_packages}
-- 
cgit v1.2.3


From 27553a2510ba2c86728074a9123e6de737029e5d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 23 Dec 2019 16:38:34 +0100
Subject: CVE-2019-2228 Mention in upstream changelog

---
 debian/changelog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 94dfb3a79..8d27d4c90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 cups (2.3.1-1) UNRELEASED; urgency=medium
 
-  * Update to new upstream version 2.3.1.
+  * New 2.3.1 upstream release:
+    - CVE-2019-2228: The `ippSetValuetag` function did not validate the
+      default language value
 
  -- Didier Raboud <odyx@debian.org>  Fri, 13 Dec 2019 17:18:35 +0100
 
-- 
cgit v1.2.3


From 836f22df5ec7d9f893cc92049a48a79157ac220d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 23 Dec 2019 16:48:40 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...0003-Install-root-backends-world-readable.patch |  65 +++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  47 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 debian/patches/airprint-support.patch              |  93 ++++
 debian/patches/confdirperms.patch                  |  28 +
 .../cups-set-default-error-policy-retry-job.patch  |  75 +++
 .../cupsd-set-default-for-SyncOnClose-to-Yes.patch |  66 +++
 debian/patches/debianize_cups-config.patch         |  50 ++
 debian/patches/default_log_settings.patch          |  27 +
 .../patches/do-not-broadcast-with-hostnames.patch  |  26 +
 ...-with-multiple-files-and-multiple-formats.patch |  28 +
 debian/patches/logfiles_adm_readable.patch         |  62 +++
 .../man-cups-lpd-drop-dangling-references.patch    |  25 +
 debian/patches/manpage-hyphen-minus.patch          | 573 +++++++++++++++++++++
 debian/patches/manpage-translations.patch          | 343 ++++++++++++
 .../patches/move-cupsd-conf-default-to-share.patch |  64 +++
 debian/patches/no-conffile-timestamp.patch         |  68 +++
 debian/patches/pwg-raster-attributes.patch         | 111 ++++
 debian/patches/reactivate_recommended_driver.patch |  41 ++
 debian/patches/removecvstag.patch                  |  31 ++
 debian/patches/rename-systemd-units.patch          |  59 +++
 debian/patches/series                              |  33 ++
 debian/patches/show-compile-command-lines.patch    |  23 +
 debian/patches/test-i18n-nonlinux.patch            |  26 +
 .../tests-fix-ppdLocalize-on-unclean-env.patch     |  32 ++
 ...-ignore-ipv6-address-family-not-supported.patch |  25 +
 .../tests-ignore-kfreebsd-amd64-not-a-pdf.patch    |  26 +
 ...d-unable-to-write-uncompressed-print-data.patch |  26 +
 debian/patches/tests-ignore-usb-crash.patch        |  33 ++
 debian/patches/tests-ignore-warnings.patch         |  30 ++
 .../tests-make-lpstat-call-reproducible.patch      |  25 +
 debian/patches/tests-no-pdftourf.patch             |  67 +++
 debian/patches/tests-use-ipv4-lo-address.patch     |  65 +++
 .../tests-wait-on-unfinished-jobs-everytime.patch  |  30 ++
 34 files changed, 2433 insertions(+)
 create mode 100644 debian/patches/0003-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/airprint-support.patch
 create mode 100644 debian/patches/confdirperms.patch
 create mode 100644 debian/patches/cups-set-default-error-policy-retry-job.patch
 create mode 100644 debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/debianize_cups-config.patch
 create mode 100644 debian/patches/default_log_settings.patch
 create mode 100644 debian/patches/do-not-broadcast-with-hostnames.patch
 create mode 100644 debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
 create mode 100644 debian/patches/logfiles_adm_readable.patch
 create mode 100644 debian/patches/man-cups-lpd-drop-dangling-references.patch
 create mode 100644 debian/patches/manpage-hyphen-minus.patch
 create mode 100644 debian/patches/manpage-translations.patch
 create mode 100644 debian/patches/move-cupsd-conf-default-to-share.patch
 create mode 100644 debian/patches/no-conffile-timestamp.patch
 create mode 100644 debian/patches/pwg-raster-attributes.patch
 create mode 100644 debian/patches/reactivate_recommended_driver.patch
 create mode 100644 debian/patches/removecvstag.patch
 create mode 100644 debian/patches/rename-systemd-units.patch
 create mode 100644 debian/patches/series
 create mode 100644 debian/patches/show-compile-command-lines.patch
 create mode 100644 debian/patches/test-i18n-nonlinux.patch
 create mode 100644 debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
 create mode 100644 debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
 create mode 100644 debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
 create mode 100644 debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
 create mode 100644 debian/patches/tests-ignore-usb-crash.patch
 create mode 100644 debian/patches/tests-ignore-warnings.patch
 create mode 100644 debian/patches/tests-make-lpstat-call-reproducible.patch
 create mode 100644 debian/patches/tests-no-pdftourf.patch
 create mode 100644 debian/patches/tests-use-ipv4-lo-address.patch
 create mode 100644 debian/patches/tests-wait-on-unfinished-jobs-everytime.patch

diff --git a/debian/patches/0003-Install-root-backends-world-readable.patch b/debian/patches/0003-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..c5c6f4fae
--- /dev/null
+++ b/debian/patches/0003-Install-root-backends-world-readable.patch
@@ -0,0 +1,65 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: http://www.cups.org/str.php?L2935
+Bug-Debian: http://bugs.debian.org/410171
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..9f41361a3
--- /dev/null
+++ b/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,47 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://www.cups.org/str.php?L3552
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..55dbf7bcc
--- /dev/null
+++ b/debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+
+Bug-Debian: https://bugs.debian.org/837936
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 23abe87..04ac4ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch
new file mode 100644
index 000000000..54fbdd4af
--- /dev/null
+++ b/debian/patches/airprint-support.patch
@@ -0,0 +1,93 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: http://bugs.debian.org/700961
+Bug: https://cups.org/str.php?L4341
+Last-Update: 2015-02-10
+
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 440aac1..6223ef7 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3806,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch
new file mode 100644
index 000000000..524090f2b
--- /dev/null
+++ b/debian/patches/confdirperms.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Last-Update: 2015-02-10
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/cups-set-default-error-policy-retry-job.patch b/debian/patches/cups-set-default-error-policy-retry-job.patch
new file mode 100644
index 000000000..41540cddb
--- /dev/null
+++ b/debian/patches/cups-set-default-error-policy-retry-job.patch
@@ -0,0 +1,75 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job", since it is less
+
+ confusing and a better default on most machines.
+ .
+ Amend documentation accordingly.
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Last-Update: 2016-07-03
+
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..7352732b2
--- /dev/null
+++ b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,66 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Last-Update: 2015-02-10
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch
new file mode 100644
index 000000000..05e6037ef
--- /dev/null
+++ b/debian/patches/debianize_cups-config.patch
@@ -0,0 +1,50 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Last-Update: 2014-06-11
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/default_log_settings.patch b/debian/patches/default_log_settings.patch
new file mode 100644
index 000000000..fca2bee7c
--- /dev/null
+++ b/debian/patches/default_log_settings.patch
@@ -0,0 +1,27 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Last-Update: 2015-02-10
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/do-not-broadcast-with-hostnames.patch b/debian/patches/do-not-broadcast-with-hostnames.patch
new file mode 100644
index 000000000..339a35266
--- /dev/null
+++ b/debian/patches/do-not-broadcast-with-hostnames.patch
@@ -0,0 +1,26 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
new file mode 100644
index 000000000..423c4796d
--- /dev/null
+++ b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
@@ -0,0 +1,28 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://www.cups.org/str.php?L4348
+Last-Updated: 2015-02-10
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch
new file mode 100644
index 000000000..28556bfb1
--- /dev/null
+++ b/debian/patches/logfiles_adm_readable.patch
@@ -0,0 +1,62 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+
+Last-Update: 2015-02-10
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/man-cups-lpd-drop-dangling-references.patch b/debian/patches/man-cups-lpd-drop-dangling-references.patch
new file mode 100644
index 000000000..711f28dff
--- /dev/null
+++ b/debian/patches/man-cups-lpd-drop-dangling-references.patch
@@ -0,0 +1,25 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: http://bugs.debian.org/570157
+Last-Update: 2015-10-02
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/manpage-hyphen-minus.patch b/debian/patches/manpage-hyphen-minus.patch
new file mode 100644
index 000000000..14f0eb921
--- /dev/null
+++ b/debian/patches/manpage-hyphen-minus.patch
@@ -0,0 +1,573 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://cups.org/str.php?L4299
+Last-Update: 2015-02-10
+
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch
new file mode 100644
index 000000000..575d4c653
--- /dev/null
+++ b/debian/patches/manpage-translations.patch
@@ -0,0 +1,343 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages.
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/478597
+
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/move-cupsd-conf-default-to-share.patch b/debian/patches/move-cupsd-conf-default-to-share.patch
new file mode 100644
index 000000000..a645fc11d
--- /dev/null
+++ b/debian/patches/move-cupsd-conf-default-to-share.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://cups.org/str.php?L4342
+Bug-Debian: http://bugs.debian.org/640124
+Last-Update: 2015-02-10
+
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/no-conffile-timestamp.patch b/debian/patches/no-conffile-timestamp.patch
new file mode 100644
index 000000000..a08e95330
--- /dev/null
+++ b/debian/patches/no-conffile-timestamp.patch
@@ -0,0 +1,68 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 6223ef7..53bc62a 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/pwg-raster-attributes.patch b/debian/patches/pwg-raster-attributes.patch
new file mode 100644
index 000000000..079eae70b
--- /dev/null
+++ b/debian/patches/pwg-raster-attributes.patch
@@ -0,0 +1,111 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:04 +0200
+Subject: For PWG Raster, add required IPP attributes
+
+Add required by IPP Everywhere for PWG Raster when PWG Raster as input format
+is supported
+
+Bug-Upstream: https://www.cups.org/str.php?L4428
+Last-Update: 2015-02-10
+Patch-Name: pwg-raster-attributes.patch
+---
+ scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 76 insertions(+), 1 deletion(-)
+
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 8069039..440aac1 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
+   cupsd_location_t *auth;		/* Pointer to authentication element */
+   const char	*auth_supported;	/* Authentication supported */
+   ipp_t		*oldattrs;		/* Old printer attributes */
+-  ipp_attribute_t *attr;		/* Attribute data */
++  ipp_attribute_t *attr, *attr2;	/* Attribute data */
+   char		*name,			/* Current user/group name */
+ 		*filter;		/* Current filter */
++  mime_type_t   *type;
+ 
+ 
+  /*
+@@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */
+ 
+   add_printer_formats(p);
+ 
++  /* 
++   * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input
++   * is supported
++   */
++  for (type = (mime_type_t *)cupsArrayFirst(p->filetypes);
++       type;
++       type = (mime_type_t *)cupsArrayNext(p->filetypes))
++  {
++    if (!_cups_strcasecmp(type->super, "image"))
++    {
++      if (!_cups_strcasecmp(type->type, "pwg-raster"))
++      {
++	if (p->ppd_attrs != NULL &&
++	    (attr = ippFindAttribute(p->ppd_attrs,
++				     "printer-resolution-supported",
++				     IPP_TAG_ZERO)) != NULL)
++	{
++	  attr2 = ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
++				    "pwg-raster-document-resolution-supported",
++				    attr->num_values, IPP_RES_PER_INCH,
++				    NULL, NULL);
++	  for (i = 0; i < attr->num_values; i ++)
++	  {
++	    attr2->values[i].resolution.xres =
++	      attr->values[i].resolution.xres;
++	    attr2->values[i].resolution.yres =
++	      attr->values[i].resolution.yres;
++	    attr2->values[i].resolution.units = IPP_RES_PER_INCH;
++	  }
++	}
++	else
++	{
++	  static const int	pwg_raster_document_resolution_supported[] =
++	  {
++	    300,
++	    600,
++	    1200
++	  };
++	  ippAddResolutions(p->attrs, IPP_TAG_PRINTER,
++			    "pwg-raster-document-resolution-supported",
++			    (int)(sizeof(pwg_raster_document_resolution_supported) /
++				  sizeof(pwg_raster_document_resolution_supported[0])),
++			    IPP_RES_PER_INCH,
++			    pwg_raster_document_resolution_supported,
++			    pwg_raster_document_resolution_supported);
++	}
++	ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
++		     "pwg-raster-document-sheet-back", NULL, "normal");
++	static const char * const pwg_raster_document_type_supported[] =
++	{
++	  "adobergb-8",
++	  "adobergb-16",
++	  "black-1",
++	  "black-8",
++	  "black-16",
++	  "cmyk-8",
++	  "cmyk-16",
++	  "rgb-8",
++	  "rgb-16",
++	  "sgray-1",
++	  "sgray-8",
++	  "sgray-16",
++	  "srgb-8",
++	  "srgb-16"
++	};
++	ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
++		      "pwg-raster-document-type-supported",
++		      (int)(sizeof(pwg_raster_document_type_supported) /
++			    sizeof(pwg_raster_document_type_supported[0])), NULL,
++		      pwg_raster_document_type_supported);
++      }
++    }
++  }
++
+  /*
+   * Add name-default attributes...
+   */
diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch
new file mode 100644
index 000000000..382f384a2
--- /dev/null
+++ b/debian/patches/reactivate_recommended_driver.patch
@@ -0,0 +1,41 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Last-Update: 2015-02-10
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/removecvstag.patch b/debian/patches/removecvstag.patch
new file mode 100644
index 000000000..1925abf85
--- /dev/null
+++ b/debian/patches/removecvstag.patch
@@ -0,0 +1,31 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: http://www.cups.org/str.php?L2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Last-Update: 2014-01-16
+
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/rename-systemd-units.patch b/debian/patches/rename-systemd-units.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/rename-systemd-units.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..5ebddb187
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,33 @@
+pwg-raster-attributes.patch
+manpage-hyphen-minus.patch
+0003-Install-root-backends-world-readable.patch
+fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+tests-ignore-warnings.patch
+tests-ignore-usb-crash.patch
+tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+tests-ignore-ipv6-address-family-not-supported.patch
+tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+test-i18n-nonlinux.patch
+tests-wait-on-unfinished-jobs-everytime.patch
+tests-fix-ppdLocalize-on-unclean-env.patch
+tests-use-ipv4-lo-address.patch
+tests-make-lpstat-call-reproducible.patch
+tests-no-pdftourf.patch
+move-cupsd-conf-default-to-share.patch
+airprint-support.patch
+0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+no-conffile-timestamp.patch
+removecvstag.patch
+rename-systemd-units.patch
+do-not-broadcast-with-hostnames.patch
+reactivate_recommended_driver.patch
+logfiles_adm_readable.patch
+default_log_settings.patch
+confdirperms.patch
+show-compile-command-lines.patch
+cupsd-set-default-for-SyncOnClose-to-Yes.patch
+cups-set-default-error-policy-retry-job.patch
+man-cups-lpd-drop-dangling-references.patch
+debianize_cups-config.patch
+0035-Build-mantohtml-with-the-build-architecture-compiler.patch
+manpage-translations.patch
diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/test-i18n-nonlinux.patch b/debian/patches/test-i18n-nonlinux.patch
new file mode 100644
index 000000000..0024719b8
--- /dev/null
+++ b/debian/patches/test-i18n-nonlinux.patch
@@ -0,0 +1,26 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: http://bugs.debian.org/662996
+
+Last-Update: 2015-10-02
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
new file mode 100644
index 000000000..0c5c6e9c3
--- /dev/null
+++ b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
@@ -0,0 +1,32 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Last-Update: 2015-02-10
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
new file mode 100644
index 000000000..2d0271089
--- /dev/null
+++ b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Last-Update: 2015-02-10
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
new file mode 100644
index 000000000..eea2bfe8a
--- /dev/null
+++ b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
@@ -0,0 +1,26 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Last-Update: 2015-02-10
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
new file mode 100644
index 000000000..e6280a925
--- /dev/null
+++ b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
@@ -0,0 +1,26 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Last-Update: 2016-08-09
+
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-usb-crash.patch b/debian/patches/tests-ignore-usb-crash.patch
new file mode 100644
index 000000000..1a0f41289
--- /dev/null
+++ b/debian/patches/tests-ignore-usb-crash.patch
@@ -0,0 +1,33 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Last-Update: 2015-02-10
+
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/tests-ignore-warnings.patch b/debian/patches/tests-ignore-warnings.patch
new file mode 100644
index 000000000..25fb5ee30
--- /dev/null
+++ b/debian/patches/tests-ignore-warnings.patch
@@ -0,0 +1,30 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Last-Update: 2015-08-05
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/tests-make-lpstat-call-reproducible.patch b/debian/patches/tests-make-lpstat-call-reproducible.patch
new file mode 100644
index 000000000..a342c06a0
--- /dev/null
+++ b/debian/patches/tests-make-lpstat-call-reproducible.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Last-Update: 2016-07-11
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 3f0becd..baebdee 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/tests-no-pdftourf.patch b/debian/patches/tests-no-pdftourf.patch
new file mode 100644
index 000000000..f0da622f1
--- /dev/null
+++ b/debian/patches/tests-no-pdftourf.patch
@@ -0,0 +1,67 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index baebdee..001e2f6 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/tests-use-ipv4-lo-address.patch b/debian/patches/tests-use-ipv4-lo-address.patch
new file mode 100644
index 000000000..f6ff7165f
--- /dev/null
+++ b/debian/patches/tests-use-ipv4-lo-address.patch
@@ -0,0 +1,65 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Last-Update: 2016-08-05
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 4929820..3f0becd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
new file mode 100644
index 000000000..f29cb785b
--- /dev/null
+++ b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
@@ -0,0 +1,30 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: http://bugs.debian.org/670878
+Last-Update: 2015-02-10
+
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..4929820 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From d0bbf06d83bf314def9914ad814bd00479aaf314 Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Tue, 24 Dec 2019 06:39:18 +0100
Subject: Update German man page (2207t)

---
 debian/changelog             |  8 ++++--
 debian/manpage-po4a/po/de.po | 62 ++++++++++++++++----------------------------
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d27d4c90..019788614 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-cups (2.3.1-1) UNRELEASED; urgency=medium
+cups (2.3.1-1.1) UNRELEASED; urgency=medium
 
+  [ Didier Raboud ]
   * New 2.3.1 upstream release:
     - CVE-2019-2228: The `ippSetValuetag` function did not validate the
       default language value
 
- -- Didier Raboud <odyx@debian.org>  Fri, 13 Dec 2019 17:18:35 +0100
+  [ Helge Kreutzmann ]
+  * Update German man page (2207t)
+
+ -- Didier Raboud <odyx@debian.org>  Tue, 24 Dec 2019 06:35:55 +0100
 
 cups (2.3.0-7) unstable; urgency=medium
 
diff --git a/debian/manpage-po4a/po/de.po b/debian/manpage-po4a/po/de.po
index 318bfee12..8ca604144 100644
--- a/debian/manpage-po4a/po/de.po
+++ b/debian/manpage-po4a/po/de.po
@@ -10,9 +10,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cups man pages 2.2.7-5\n"
+"Project-Id-Version: cups man pages 2.3.1-1\n"
 "POT-Creation-Date: 2019-12-13 17:30+0100\n"
-"PO-Revision-Date: 2019-09-13 21:42+0200\n"
+"PO-Revision-Date: 2019-12-24 06:37+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -1006,10 +1006,9 @@ msgstr "client.conf"
 
 #. type: TH
 #: client.conf.5:10
-#, fuzzy, no-wrap
-#| msgid "19 October 2015"
+#, no-wrap
 msgid "15 October 2019"
-msgstr "19. Oktober 2015"
+msgstr "15. Oktober 2019"
 
 #. type: Plain text
 #: client.conf.5:13
@@ -1111,14 +1110,13 @@ msgstr ""
 #: client.conf.5:38
 #, no-wrap
 msgid "B<DigestOptions DenyMD5>"
-msgstr ""
+msgstr "B<DigestOptions DenyMD5>"
 
 #. type: TP
 #: client.conf.5:40
-#, fuzzy, no-wrap
-#| msgid "B<SSLOptions None>"
+#, no-wrap
 msgid "B<DigestOptions None>"
-msgstr "B<SSLOptions None>"
+msgstr "B<DigestOptions None>"
 
 #. #Encryption
 #. type: Plain text
@@ -1127,6 +1125,8 @@ msgid ""
 "Specifies HTTP Digest authentication options.  B<DenyMD5> disables support "
 "for the original MD5 hash algorithm."
 msgstr ""
+"Legt die »HTTP Digest«-Authentisierungsoptionen fest. B<DenyMD5> deaktiviert "
+"die Unterstützung für den ursprünglichen MD5-Hash-Algorithmus."
 
 #. type: TP
 #: client.conf.5:45 cupsd.conf.5:732
@@ -9414,13 +9414,11 @@ msgstr "Copyright \\[co] 2019 by Apple Inc."
 msgid "ippeveprinter"
 msgstr "ippeveprinter"
 
-# type: TH
 #. type: TH
 #: ippeveprinter.1:9
-#, fuzzy, no-wrap
-#| msgid "5 December 2008"
+#, no-wrap
 msgid "2 December 2019"
-msgstr "5. Dezember 2008"
+msgstr "2. Dezember 2019"
 
 #. type: Plain text
 #: ippeveprinter.1:12
@@ -9429,16 +9427,6 @@ msgstr "ippeveprinter - eine IPP-Everywhere-Druckeranwendung für CUPS"
 
 #. type: Plain text
 #: ippeveprinter.1:84
-#, fuzzy
-#| msgid ""
-#| "B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] "
-#| "[ B<-2> ] [ B<-D> I<device-uri> ] [ B<-F> I<output-type/subtype> ] [ B<-"
-#| "K> I<keypath> ] [ B<-M> I<manufacturer> ] [ B<-P> I<filename.ppd> ] [ B<-"
-#| "V> I<ipp-version> ] [ B<-a> I<filename.conf> ] [ B<-c> I<command> ] [ B<-"
-#| "d> I<spool-directory> ] [ B<-f> I<type/subtype[,...]> ] [ B<-i> "
-#| "I<iconfile.png> ] [ B<-k> ] [ B<-l> I<location> ] [ B<-m> I<model> ] [ B<-"
-#| "n> I<hostname> ] [ B<-p> I<port> ] [ B<-r> I<subtype[,subtype]> ] [ B<-s> "
-#| "I<speed[,color-speed]> ] [ B<-v[vvv]> ] I<service-name>"
 msgid ""
 "B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--pam-service> "
 "I<service> ] [ B<--version> ] [ B<-2> ] [ B<-A> ] [ B<-D> I<device-uri> ] "
@@ -9450,8 +9438,9 @@ msgid ""
 "[ B<-r> I<subtype[,subtype]> ] [ B<-s> I<speed[,color-speed]> ] [ B<-"
 "v[vvv]> ] I<service-name>"
 msgstr ""
-"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--version> ] "
-"[ B<-2> ] [ B<-D> I<Geräte-URI> ] [ B<-F> I<Ausgabetyp/-untertyp> ] [ B<-K> "
+"B<ippeveprinter> [ B<--help> ] [ B<--no-web-forms> ] [ B<--pam-service> "
+"I<Dienst> ][ B<--version> ] "
+"[ B<-2> ]  [ B<-A> ] [ B<-D> I<Geräte-URI> ] [ B<-F> I<Ausgabetyp/-untertyp> ] [ B<-K> "
 "I<Schlüsselpfad> ] [ B<-M> I<Hersteller> ] [ B<-P> I<Dateiname.ppd> ] [ B<-"
 "V> I<IPP-Version> ] [ B<-a> I<Dateiname.conf> ] [ B<-c> I<Befehl> ] [ B<-d> "
 "I<Spool-Verzeichnis> ] [ B<-f> I<Typ/Untertyp[,…]> ] [ B<-i> I<Icon-Datei."
@@ -9498,21 +9487,15 @@ msgstr ""
 
 #. type: TP
 #: ippeveprinter.1:96
-#, fuzzy, no-wrap
-#| msgid "B<--ippserver >I<filename>"
+#, no-wrap
 msgid "B<--pam-service >I<service>"
-msgstr "B<--ippserver >I<Dateiname>"
+msgstr "B<--pam-service >I<Dienst>"
 
 #. type: Plain text
 #: ippeveprinter.1:100
-#, fuzzy
-#| msgid ""
-#| "Specifies the service name when using Kerberos authentication.  The "
-#| "default service name is \"http.\""
 msgid "Set the PAM service name.  The default service is \"cups\"."
 msgstr ""
-"Legt den Dienstenamen, wenn Kerberos-Authentifizierung eingesetzt wird, "
-"fest. Der Vorgabedienstname ist »http«."
+"Legt den PAM-Dienstenamen fest. Der Vorgabedienst ist »cups«."
 
 #. type: Plain text
 #: ippeveprinter.1:103
@@ -9534,7 +9517,7 @@ msgstr "Meldet die Unterstützung für zweiseitigen (Duplex-)Druck."
 #: ippeveprinter.1:106
 #, no-wrap
 msgid "B<-A>"
-msgstr ""
+msgstr "B<-A>"
 
 #. type: Plain text
 #: ippeveprinter.1:111
@@ -9542,6 +9525,8 @@ msgid ""
 "Enable authentication for the created printer.  B<ippeveprinter> uses PAM to "
 "authenticate HTTP Basic credentials."
 msgstr ""
+"Aktiviert Authentisierung für erstellte Drucker. B<ippeveprinter> verwendet "
+"PAM, um »HTTP Basic«-Zugriffsberechtigungen zu authentisieren."
 
 #. type: TP
 #: ippeveprinter.1:111
@@ -9767,15 +9752,14 @@ msgstr ""
 
 #. type: TP
 #: ippeveprinter.1:184
-#, fuzzy, no-wrap
-#| msgid "B<-r>"
+#, no-wrap
 msgid "B<-r off>"
-msgstr "B<-r>"
+msgstr "B<-r off>"
 
 #. type: Plain text
 #: ippeveprinter.1:187
 msgid "Turns off DNS-SD service advertisements entirely."
-msgstr ""
+msgstr "Schaltet DNS-SD-Dienstebewerbung komplett aus."
 
 #. type: TP
 #: ippeveprinter.1:187
-- 
cgit v1.2.3


From 2058f85a2ddc0ed6cc079dc1498814abc17ba0c7 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 24 Dec 2019 13:02:06 +0100
Subject: cups 2.3.1-1 Debian release

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 019788614..4330cd022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cups (2.3.1-1.1) UNRELEASED; urgency=medium
+cups (2.3.1-1) unstable; urgency=medium
 
   [ Didier Raboud ]
   * New 2.3.1 upstream release:
@@ -8,7 +8,7 @@ cups (2.3.1-1.1) UNRELEASED; urgency=medium
   [ Helge Kreutzmann ]
   * Update German man page (2207t)
 
- -- Didier Raboud <odyx@debian.org>  Tue, 24 Dec 2019 06:35:55 +0100
+ -- Didier Raboud <odyx@debian.org>  Tue, 24 Dec 2019 13:02:06 +0100
 
 cups (2.3.0-7) unstable; urgency=medium
 
-- 
cgit v1.2.3


From f06ee9e48f33f097a475ed6a358e6481e42557fb Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 31 Dec 2019 13:32:32 +0100
Subject: Update previous changelog entry to add bug closure for CVE-2019-2228

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4330cd022..7fe7225f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ cups (2.3.1-1) unstable; urgency=medium
   [ Didier Raboud ]
   * New 2.3.1 upstream release:
     - CVE-2019-2228: The `ippSetValuetag` function did not validate the
-      default language value
+      default language value (Closes: #946782)
 
   [ Helge Kreutzmann ]
   * Update German man page (2207t)
-- 
cgit v1.2.3


From 2a7fe751c18aa949f040a4fd5eb67d4e88a5a3e4 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 21 Jan 2020 10:44:09 +0100
Subject: Add missing closure of 947185 in 2.3.1

---
 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7fe7225f5..f7b9b3997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ cups (2.3.1-1) unstable; urgency=medium
     - CVE-2019-2228: The `ippSetValuetag` function did not validate the
       default language value (Closes: #946782)
 
+  [ Steve Langasek ]
+  * On Ubuntu i386, drop cups and cups-core-drivers (Closes: #947185)
+
   [ Helge Kreutzmann ]
   * Update German man page (2207t)
 
-- 
cgit v1.2.3


From a675bc1b6db1b7a84c1d9ac9ec27ab3908706a28 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://cups.org/str.php?L4299
Last-Update: 2015-02-10

Patch-Name: manpage-hyphen-minus.patch

Gbp-Pq: Name manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From b29d66106e4eb6c68e9f0f7c97bfeed6321c2da2 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: http://www.cups.org/str.php?L2935
Bug-Debian: http://bugs.debian.org/410171

Gbp-Pq: Name 0003-Install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From 8613fcfb615c814b42e0a2b3640e50e06a69158b Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://www.cups.org/str.php?L4348
Last-Updated: 2015-02-10
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch

Gbp-Pq: Name fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From fa10615caf7bf50cbdd70162f4776f1b11957d2e Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Last-Update: 2015-08-05

Patch-Name: tests-ignore-warnings.patch

Gbp-Pq: Name tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From e8a677a6ef0cb1ed19ef89ed99c7df1c4141175e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Last-Update: 2015-02-10

Patch-Name: tests-ignore-usb-crash.patch

Gbp-Pq: Name tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From ab3490857b96f5f5855ef4570f34dc71b37a65e0 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch

Gbp-Pq: Name tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 0f94ccbd159c32982c98301ae63f41825ad41eb2 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch

Gbp-Pq: Name tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From fc93bacd820448c8ec8b66eae196c5f717234b66 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Last-Update: 2016-08-09

Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch

Gbp-Pq: Name tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 8369e26eeab004cfc255070a8e2e9f8e33e1d55f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: http://bugs.debian.org/662996

Last-Update: 2015-10-02
Patch-Name: test-i18n-nonlinux.patch

Gbp-Pq: Name test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From d339d858b0b009fcc7f74f8e5b7d725e17b5b27d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: http://bugs.debian.org/670878
Last-Update: 2015-02-10

Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch

Gbp-Pq: Name tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..492982005 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From 5ca2b51b8d74e2996378011123085453db7c9e3f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Last-Update: 2015-02-10
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch

Gbp-Pq: Name tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From 011d1c069e400832a85fe02f5bdfa5976916c5ab Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Last-Update: 2016-08-05
Patch-Name: tests-use-ipv4-lo-address.patch

Gbp-Pq: Name tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 492982005..3f0becde9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From 6a8f8039d2982981a57da416a21aa84c515572a5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Last-Update: 2016-07-11
Patch-Name: tests-make-lpstat-call-reproducible.patch

Gbp-Pq: Name tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 3f0becde9..baebdeec9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From 5be879815425d6b09457e79e73cd704367188ef6 Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream

Patch-Name: tests-no-pdftourf.patch

Gbp-Pq: Name tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index baebdeec9..001e2f61f 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From 8569d0ed1038af2823d7ea98ab46846379f534d9 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://cups.org/str.php?L4342
Bug-Debian: http://bugs.debian.org/640124
Last-Update: 2015-02-10

Patch-Name: move-cupsd-conf-default-to-share.patch

Gbp-Pq: Name move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From e77f0be05a1ca2805540e371acd0fb8745e5e869 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: http://bugs.debian.org/700961
Bug: https://cups.org/str.php?L4341
Last-Update: 2015-02-10

Patch-Name: airprint-support.patch

Gbp-Pq: Name airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 80690397d..2fff84b60 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 2d4da51cb8567912c71c9944a8b0b97847f814e1 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://www.cups.org/str.php?L3552

Gbp-Pq: Name 0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From d92cec393105b55109478fa0e5c7e61b7b07ca7f Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673

Patch-Name: no-conffile-timestamp.patch

Gbp-Pq: Name no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 2fff84b60..a729475a3 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 608aeab1632dd8054ac9f7e6428cb5c028bef89c Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: http://www.cups.org/str.php?L2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Last-Update: 2014-01-16

Patch-Name: removecvstag.patch

Gbp-Pq: Name removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From d868ed8c19bb1a5cfeb155a226e6859ebd484e7d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch

Gbp-Pq: Name rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From 2906f34eb556f26112c4c5fe1d61a6727a348382 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586

Patch-Name: do-not-broadcast-with-hostnames.patch

Gbp-Pq: Name do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From a42f28a78790068c74cb409ac54ff894a9132ea2 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Last-Update: 2015-02-10

Patch-Name: reactivate_recommended_driver.patch

Gbp-Pq: Name reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From cd1df8717a59a06264f962edbb709207bfc05f9c Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953

Last-Update: 2015-02-10
Patch-Name: logfiles_adm_readable.patch

Gbp-Pq: Name logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From f4a2dc4b84126711f8d515811d14ce78bd49a97f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Last-Update: 2015-02-10

Patch-Name: default_log_settings.patch

Gbp-Pq: Name default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From 8cbcf08d316b9a15ffb6e5126d69b47861d782f0 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Last-Update: 2015-02-10

Patch-Name: confdirperms.patch

Gbp-Pq: Name confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 690d232d5b3f46a62b774c99aed87961db333fd4 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch

Gbp-Pq: Name show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From 15c29e868f5496ee1d4c7b78d97458a37f9facff Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Last-Update: 2015-02-10

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch

Gbp-Pq: Name cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From a16f13d3adbdecf332d6f4d8ac0842c251340b94 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job", since it is less

 confusing and a better default on most machines.
 .
 Amend documentation accordingly.
Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Last-Update: 2016-07-03

Patch-Name: cups-set-default-error-policy-retry-job.patch

Gbp-Pq: Name cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From 01dae52b992d297205223d45cdfa2f323532a823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: http://bugs.debian.org/570157
Last-Update: 2015-10-02
Patch-Name: man-cups-lpd-drop-dangling-references.patch

Gbp-Pq: Name man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 3bb6055ba2e2606850fa95a1405a2da7554169af Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Last-Update: 2014-06-11
Patch-Name: debianize_cups-config.patch

Gbp-Pq: Name debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 5dae33b09b8da4ac45465497e85817e48e691c48 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936

Gbp-Pq: Name 0035-Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 23abe870e..04ac4ff50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 5bc55ca8549e46aeda3f8928dd79c3c951930e7f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: http://bugs.debian.org/478597

Patch-Name: manpage-translations.patch

Gbp-Pq: Name manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 7074662fadfba991e2dfd1b98b082e37d4cd44a3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sun, 26 Jan 2020 15:23:24 +0100
Subject: cups 2.3.1-2 Debian release

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f7b9b3997..707a9b218 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cups (2.3.1-2) unstable; urgency=medium
+
+  * Drop pwg-raster-attributes.patch
+  * Amend 2.3.1-1 changelog entry to add missing Ubuntu package drop and CVE
+    bug closure
+
+ -- Didier Raboud <odyx@debian.org>  Sun, 26 Jan 2020 15:23:24 +0100
+
 cups (2.3.1-1) unstable; urgency=medium
 
   [ Didier Raboud ]
-- 
cgit v1.2.3


From b65e068378efb9a7b33eea60a7e324ccd6e29a50 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sun, 26 Jan 2020 15:24:50 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...0003-Install-root-backends-world-readable.patch |  65 +++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  47 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 debian/patches/airprint-support.patch              |  93 ++++
 debian/patches/confdirperms.patch                  |  28 +
 .../cups-set-default-error-policy-retry-job.patch  |  75 +++
 .../cupsd-set-default-for-SyncOnClose-to-Yes.patch |  66 +++
 debian/patches/debianize_cups-config.patch         |  50 ++
 debian/patches/default_log_settings.patch          |  27 +
 .../patches/do-not-broadcast-with-hostnames.patch  |  26 +
 ...-with-multiple-files-and-multiple-formats.patch |  28 +
 debian/patches/logfiles_adm_readable.patch         |  62 +++
 .../man-cups-lpd-drop-dangling-references.patch    |  25 +
 debian/patches/manpage-hyphen-minus.patch          | 573 +++++++++++++++++++++
 debian/patches/manpage-translations.patch          | 343 ++++++++++++
 .../patches/move-cupsd-conf-default-to-share.patch |  64 +++
 debian/patches/no-conffile-timestamp.patch         |  68 +++
 debian/patches/reactivate_recommended_driver.patch |  41 ++
 debian/patches/removecvstag.patch                  |  31 ++
 debian/patches/rename-systemd-units.patch          |  59 +++
 debian/patches/series                              |  32 ++
 debian/patches/show-compile-command-lines.patch    |  23 +
 debian/patches/test-i18n-nonlinux.patch            |  26 +
 .../tests-fix-ppdLocalize-on-unclean-env.patch     |  32 ++
 ...-ignore-ipv6-address-family-not-supported.patch |  25 +
 .../tests-ignore-kfreebsd-amd64-not-a-pdf.patch    |  26 +
 ...d-unable-to-write-uncompressed-print-data.patch |  26 +
 debian/patches/tests-ignore-usb-crash.patch        |  33 ++
 debian/patches/tests-ignore-warnings.patch         |  30 ++
 .../tests-make-lpstat-call-reproducible.patch      |  25 +
 debian/patches/tests-no-pdftourf.patch             |  67 +++
 debian/patches/tests-use-ipv4-lo-address.patch     |  65 +++
 .../tests-wait-on-unfinished-jobs-everytime.patch  |  30 ++
 33 files changed, 2321 insertions(+)
 create mode 100644 debian/patches/0003-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/airprint-support.patch
 create mode 100644 debian/patches/confdirperms.patch
 create mode 100644 debian/patches/cups-set-default-error-policy-retry-job.patch
 create mode 100644 debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/debianize_cups-config.patch
 create mode 100644 debian/patches/default_log_settings.patch
 create mode 100644 debian/patches/do-not-broadcast-with-hostnames.patch
 create mode 100644 debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
 create mode 100644 debian/patches/logfiles_adm_readable.patch
 create mode 100644 debian/patches/man-cups-lpd-drop-dangling-references.patch
 create mode 100644 debian/patches/manpage-hyphen-minus.patch
 create mode 100644 debian/patches/manpage-translations.patch
 create mode 100644 debian/patches/move-cupsd-conf-default-to-share.patch
 create mode 100644 debian/patches/no-conffile-timestamp.patch
 create mode 100644 debian/patches/reactivate_recommended_driver.patch
 create mode 100644 debian/patches/removecvstag.patch
 create mode 100644 debian/patches/rename-systemd-units.patch
 create mode 100644 debian/patches/series
 create mode 100644 debian/patches/show-compile-command-lines.patch
 create mode 100644 debian/patches/test-i18n-nonlinux.patch
 create mode 100644 debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
 create mode 100644 debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
 create mode 100644 debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
 create mode 100644 debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
 create mode 100644 debian/patches/tests-ignore-usb-crash.patch
 create mode 100644 debian/patches/tests-ignore-warnings.patch
 create mode 100644 debian/patches/tests-make-lpstat-call-reproducible.patch
 create mode 100644 debian/patches/tests-no-pdftourf.patch
 create mode 100644 debian/patches/tests-use-ipv4-lo-address.patch
 create mode 100644 debian/patches/tests-wait-on-unfinished-jobs-everytime.patch

diff --git a/debian/patches/0003-Install-root-backends-world-readable.patch b/debian/patches/0003-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..c5c6f4fae
--- /dev/null
+++ b/debian/patches/0003-Install-root-backends-world-readable.patch
@@ -0,0 +1,65 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: http://www.cups.org/str.php?L2935
+Bug-Debian: http://bugs.debian.org/410171
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..9f41361a3
--- /dev/null
+++ b/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,47 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://www.cups.org/str.php?L3552
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..55dbf7bcc
--- /dev/null
+++ b/debian/patches/0035-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+
+Bug-Debian: https://bugs.debian.org/837936
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 23abe87..04ac4ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch
new file mode 100644
index 000000000..ee86a997b
--- /dev/null
+++ b/debian/patches/airprint-support.patch
@@ -0,0 +1,93 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: http://bugs.debian.org/700961
+Bug: https://cups.org/str.php?L4341
+Last-Update: 2015-02-10
+
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 8069039..2fff84b 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch
new file mode 100644
index 000000000..524090f2b
--- /dev/null
+++ b/debian/patches/confdirperms.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Last-Update: 2015-02-10
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/cups-set-default-error-policy-retry-job.patch b/debian/patches/cups-set-default-error-policy-retry-job.patch
new file mode 100644
index 000000000..41540cddb
--- /dev/null
+++ b/debian/patches/cups-set-default-error-policy-retry-job.patch
@@ -0,0 +1,75 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job", since it is less
+
+ confusing and a better default on most machines.
+ .
+ Amend documentation accordingly.
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Last-Update: 2016-07-03
+
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..7352732b2
--- /dev/null
+++ b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,66 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Last-Update: 2015-02-10
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch
new file mode 100644
index 000000000..05e6037ef
--- /dev/null
+++ b/debian/patches/debianize_cups-config.patch
@@ -0,0 +1,50 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Last-Update: 2014-06-11
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/default_log_settings.patch b/debian/patches/default_log_settings.patch
new file mode 100644
index 000000000..fca2bee7c
--- /dev/null
+++ b/debian/patches/default_log_settings.patch
@@ -0,0 +1,27 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Last-Update: 2015-02-10
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/do-not-broadcast-with-hostnames.patch b/debian/patches/do-not-broadcast-with-hostnames.patch
new file mode 100644
index 000000000..339a35266
--- /dev/null
+++ b/debian/patches/do-not-broadcast-with-hostnames.patch
@@ -0,0 +1,26 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
new file mode 100644
index 000000000..423c4796d
--- /dev/null
+++ b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
@@ -0,0 +1,28 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://www.cups.org/str.php?L4348
+Last-Updated: 2015-02-10
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch
new file mode 100644
index 000000000..28556bfb1
--- /dev/null
+++ b/debian/patches/logfiles_adm_readable.patch
@@ -0,0 +1,62 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+
+Last-Update: 2015-02-10
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/man-cups-lpd-drop-dangling-references.patch b/debian/patches/man-cups-lpd-drop-dangling-references.patch
new file mode 100644
index 000000000..711f28dff
--- /dev/null
+++ b/debian/patches/man-cups-lpd-drop-dangling-references.patch
@@ -0,0 +1,25 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: http://bugs.debian.org/570157
+Last-Update: 2015-10-02
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/manpage-hyphen-minus.patch b/debian/patches/manpage-hyphen-minus.patch
new file mode 100644
index 000000000..14f0eb921
--- /dev/null
+++ b/debian/patches/manpage-hyphen-minus.patch
@@ -0,0 +1,573 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://cups.org/str.php?L4299
+Last-Update: 2015-02-10
+
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch
new file mode 100644
index 000000000..575d4c653
--- /dev/null
+++ b/debian/patches/manpage-translations.patch
@@ -0,0 +1,343 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages.
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/478597
+
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/move-cupsd-conf-default-to-share.patch b/debian/patches/move-cupsd-conf-default-to-share.patch
new file mode 100644
index 000000000..a645fc11d
--- /dev/null
+++ b/debian/patches/move-cupsd-conf-default-to-share.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://cups.org/str.php?L4342
+Bug-Debian: http://bugs.debian.org/640124
+Last-Update: 2015-02-10
+
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/no-conffile-timestamp.patch b/debian/patches/no-conffile-timestamp.patch
new file mode 100644
index 000000000..adb926635
--- /dev/null
+++ b/debian/patches/no-conffile-timestamp.patch
@@ -0,0 +1,68 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 2fff84b..a729475 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch
new file mode 100644
index 000000000..382f384a2
--- /dev/null
+++ b/debian/patches/reactivate_recommended_driver.patch
@@ -0,0 +1,41 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Last-Update: 2015-02-10
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/removecvstag.patch b/debian/patches/removecvstag.patch
new file mode 100644
index 000000000..1925abf85
--- /dev/null
+++ b/debian/patches/removecvstag.patch
@@ -0,0 +1,31 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: http://www.cups.org/str.php?L2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Last-Update: 2014-01-16
+
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/rename-systemd-units.patch b/debian/patches/rename-systemd-units.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/rename-systemd-units.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..48b78c453
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,32 @@
+manpage-hyphen-minus.patch
+0003-Install-root-backends-world-readable.patch
+fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+tests-ignore-warnings.patch
+tests-ignore-usb-crash.patch
+tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+tests-ignore-ipv6-address-family-not-supported.patch
+tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+test-i18n-nonlinux.patch
+tests-wait-on-unfinished-jobs-everytime.patch
+tests-fix-ppdLocalize-on-unclean-env.patch
+tests-use-ipv4-lo-address.patch
+tests-make-lpstat-call-reproducible.patch
+tests-no-pdftourf.patch
+move-cupsd-conf-default-to-share.patch
+airprint-support.patch
+0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+no-conffile-timestamp.patch
+removecvstag.patch
+rename-systemd-units.patch
+do-not-broadcast-with-hostnames.patch
+reactivate_recommended_driver.patch
+logfiles_adm_readable.patch
+default_log_settings.patch
+confdirperms.patch
+show-compile-command-lines.patch
+cupsd-set-default-for-SyncOnClose-to-Yes.patch
+cups-set-default-error-policy-retry-job.patch
+man-cups-lpd-drop-dangling-references.patch
+debianize_cups-config.patch
+0035-Build-mantohtml-with-the-build-architecture-compiler.patch
+manpage-translations.patch
diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/test-i18n-nonlinux.patch b/debian/patches/test-i18n-nonlinux.patch
new file mode 100644
index 000000000..0024719b8
--- /dev/null
+++ b/debian/patches/test-i18n-nonlinux.patch
@@ -0,0 +1,26 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: http://bugs.debian.org/662996
+
+Last-Update: 2015-10-02
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
new file mode 100644
index 000000000..0c5c6e9c3
--- /dev/null
+++ b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
@@ -0,0 +1,32 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Last-Update: 2015-02-10
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
new file mode 100644
index 000000000..2d0271089
--- /dev/null
+++ b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Last-Update: 2015-02-10
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
new file mode 100644
index 000000000..eea2bfe8a
--- /dev/null
+++ b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
@@ -0,0 +1,26 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Last-Update: 2015-02-10
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
new file mode 100644
index 000000000..e6280a925
--- /dev/null
+++ b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
@@ -0,0 +1,26 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Last-Update: 2016-08-09
+
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/tests-ignore-usb-crash.patch b/debian/patches/tests-ignore-usb-crash.patch
new file mode 100644
index 000000000..1a0f41289
--- /dev/null
+++ b/debian/patches/tests-ignore-usb-crash.patch
@@ -0,0 +1,33 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Last-Update: 2015-02-10
+
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/tests-ignore-warnings.patch b/debian/patches/tests-ignore-warnings.patch
new file mode 100644
index 000000000..25fb5ee30
--- /dev/null
+++ b/debian/patches/tests-ignore-warnings.patch
@@ -0,0 +1,30 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Last-Update: 2015-08-05
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/tests-make-lpstat-call-reproducible.patch b/debian/patches/tests-make-lpstat-call-reproducible.patch
new file mode 100644
index 000000000..a342c06a0
--- /dev/null
+++ b/debian/patches/tests-make-lpstat-call-reproducible.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Last-Update: 2016-07-11
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 3f0becd..baebdee 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/tests-no-pdftourf.patch b/debian/patches/tests-no-pdftourf.patch
new file mode 100644
index 000000000..f0da622f1
--- /dev/null
+++ b/debian/patches/tests-no-pdftourf.patch
@@ -0,0 +1,67 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index baebdee..001e2f6 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/tests-use-ipv4-lo-address.patch b/debian/patches/tests-use-ipv4-lo-address.patch
new file mode 100644
index 000000000..f6ff7165f
--- /dev/null
+++ b/debian/patches/tests-use-ipv4-lo-address.patch
@@ -0,0 +1,65 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Last-Update: 2016-08-05
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 4929820..3f0becd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
new file mode 100644
index 000000000..f29cb785b
--- /dev/null
+++ b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
@@ -0,0 +1,30 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: http://bugs.debian.org/670878
+Last-Update: 2015-02-10
+
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..4929820 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From b15ac123736f23c260ee9d226a3d1849c0272b6b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 30 Jan 2020 17:08:24 +0100
Subject: Update README.Debian to remove SystemdIdleExit references, that's
 long gone

---
 debian/libcups2.README.Debian | 5 ++---
 debian/manpage-po4a/po/de.po  | 6 ------
 debian/manpage-po4a/po/fr.po  | 6 ------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/debian/libcups2.README.Debian b/debian/libcups2.README.Debian
index ed51502ab..5c1e3aa2a 100644
--- a/debian/libcups2.README.Debian
+++ b/debian/libcups2.README.Debian
@@ -140,9 +140,8 @@ needs to be configured to listen to the correct IPs and aports by dropping
 configuration files in the /etc/systemd/system/cups.socket.d/ directory.
 
 When launched by socket-activation, CUPS can additionally exit itself after
-being idle for some time (30 seconds by default) by using 'SystemdIdleExit on'
-in /etc/cups/cupsd.conf'. The delay before exiting on idle can be configured
-using 'IdleExitTimeout' in that same file.
+being idle for some time (60 seconds by default) by setting 'IdleExitTimeout'
+in /etc/cups/cupsd.conf'.
 
 Printing without using a local cups daemon
 ==========================================
diff --git a/debian/manpage-po4a/po/de.po b/debian/manpage-po4a/po/de.po
index 8ca604144..1a8191f03 100644
--- a/debian/manpage-po4a/po/de.po
+++ b/debian/manpage-po4a/po/de.po
@@ -18446,12 +18446,6 @@ msgstr ""
 #~ msgid "SSLPort"
 #~ msgstr "SSLPort"
 
-#~ msgid "SystemdIdleExit No"
-#~ msgstr "SystemdIdleExit No"
-
-#~ msgid "SystemdIdleExit Yes"
-#~ msgstr "SystemdIdleExit Yes"
-
 #~ msgid "Specifies whether to exit on inactivity when launched by systemd."
 #~ msgstr ""
 #~ "Legt fest, ob beim Start durch Systemd im Falle von Inaktivität beendet "
diff --git a/debian/manpage-po4a/po/fr.po b/debian/manpage-po4a/po/fr.po
index 0942f50fb..8ffc90c0d 100644
--- a/debian/manpage-po4a/po/fr.po
+++ b/debian/manpage-po4a/po/fr.po
@@ -19888,12 +19888,6 @@ msgstr ""
 #~ msgid "SSLPort"
 #~ msgstr "B<SSLPort>"
 
-#~ msgid "SystemdIdleExit No"
-#~ msgstr "SystemdIdleExit No"
-
-#~ msgid "SystemdIdleExit Yes"
-#~ msgstr "SystemdIdleExit Yes"
-
 # type: Plain text
 #~ msgid "Specifies whether to exit on inactivity when launched by systemd."
 #~ msgstr ""
-- 
cgit v1.2.3


From 30c98ab54418005b4fb4b325d77970cc20e7cdcb Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://github.com/apple/cups/issues/?L4299
Patch-Name: manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From dafa62164f2bd6ffc7ea2d0709494dd8895502a6 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: https://github.com/apple/cups/issues/?L2935
Bug-Debian: https://bugs.debian.org/410171
Patch-Name install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From f3406c5f51d7b73375b54273ff3841932a849f1c Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://github.com/apple/cups/issues/?L4348
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From d9cd7a62646075a2cadb82a5d2b23af3bdd049ca Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From c6d179e65a40e8c093ca99af05769a6b0d69f38c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Patch-Name: tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From 64a4ee4f1cf84b4ccb0b3c9404d6a9b99e7e9270 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 24b8f571b8c871db6de97767ede91db404bc32b5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From cbf0ffabcbf4cd063b1e86ce0b639c1e2d9b685b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 929739b66b6872cdc9aae471c30c43236870ef63 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: https://bugs.debian.org/662996
Patch-Name: test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 18060865b635730b675ebb810ce126f27b0598fb Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: https://bugs.debian.org/670878
Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..492982005 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From c93e04c7561428a29c5b3fe6c4c13a7b7726053a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From ad90bec73f24ad345652f37b808978aa61fcd111 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 492982005..3f0becde9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From d669d542356fb6fbbeabd4ac36f129975c000233 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 3f0becde9..baebdeec9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From ea5f53481a75e3b2f09f0901c0c1d5d3f56a760b Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream
Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index baebdeec9..001e2f61f 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From 98aeb82f4df7ef418019ab7013e4d7937844027e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/?L4342
Bug-Debian: https://bugs.debian.org/640124
Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From c99606d1a5c904ab21962f3e3cc98d20f7571a1d Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 80690397d..2fff84b60 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 97b123ce982d1c1e984cd8836e87131c24fe14f7 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://github.com/apple/cups/issues/?3552
Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From a6faac18a3a64cd005e8af5e6cbc7da07d47820e Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 2fff84b60..a729475a3 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 9d0cfef3b49af7693debb5787dd6da9b776a1186 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: http://www.cups.org/str.php?L2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From 735cd198cc220559062db1ac741c6e6c6b68bd0d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From ded3859c32ee103ee2e7b226f2177825f5ed6605 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 61a3ec7f6ce482c506f6197efee6a1804f3d71b7 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 6cf4cccace83f6a84f711e8d969cb4721aa1b831 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From 7e171c8a5b783bc2cbf31a5f9c34cbb80a9c2140 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From 2679ffdaa9d66a54f7999cd9f0edb40581db135e Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 8a33f937719f11732fdc6769fce83ddf8a712234 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From 381edf3d3a1df26c323931a31a60c4c3f9a0cb30 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 5e2c366a269d52097319a51508defbacb10a2bb7 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job", since it is less

 confusing and a better default on most machines.
 .
 Amend documentation accordingly.
Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From cf2cc7e27e3ca9b97ed4cdfc9a651486b2f8d773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: https://bugs.debian.org/570157
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 174bd6c242734b812ea21e65645a1d9bddffb2d8 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From adcbe3a3c1a26472503dee80d8be19b7705ec8b9 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 23abe870e..04ac4ff50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From d8e4b64e291bb12838ff8e095d19212bf9e7a034 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From a74125714b7f4b54ccaf80206776b4bc5bf2d330 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 30 Jan 2020 20:28:54 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...-hyphen-used-as-minus-sign-manpage-errors.patch | 571 +++++++++++++++++++++
 ...0002-Install-root-backends-world-readable.patch |  66 +++
 ...s-with-multiple-files-or-multiple-formats.patch |  27 +
 ...sts-Ignore-warnings-from-colord-and-Avahi.patch |  28 +
 ...ignore-usb-dnssd-backend-unexpected-exits.patch |  31 ++
 .../0006-Tests-ignore-loadFile-failures.patch      |  25 +
 ...e-errors-triggered-on-ipv6-deprived-hosts.patch |  24 +
 ...re-the-failure-to-write-uncompressed-data.patch |  24 +
 ...t-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch |  24 +
 ...sure-that-all-scheduled-jobs-are-finished.patch |  28 +
 ...-LC_-environment-variables-when-testing-n.patch |  31 ++
 ...27.0.0.1-instead-of-localhost-to-help-pbu.patch |  64 +++
 ...-LC_ALL-C-environment-variable-when-grepp.patch |  24 +
 ...it-830cfed95a5349b008999eebd34f5233bc3582.patch |  66 +++
 ...d.conf.default-from-SERVERROOT-to-DATADIR.patch |  62 +++
 ...pport-Apple-AirPrint-printing-from-iPhone.patch |  91 ++++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  48 ++
 ...e-stamps-in-conffiles-to-avoid-ever-chang.patch |  67 +++
 ...t-write-VCS-tags-into-installed-conffiles.patch |  29 ++
 ...systemd-service-file-from-org.cups.cups.-.patch |  59 +++
 ...host-names-for-broadcasting-print-queues-.patch |  25 +
 ...s-the-recommended-comments-of-the-NickNam.patch |  39 ++
 ...og-files-readable-to-group-adm-if-present.patch |  60 +++
 ...CUPS-own-log-rotating-as-the-system-alrea.patch |  25 +
 ...t-mess-with-the-permissions-of-cupsd.conf.patch |  26 +
 .../patches/0026-Show-compile-command-lines.patch  |  23 +
 ...27-Set-the-default-for-SyncOnClose-to-Yes.patch |  64 +++
 ...-job-error-policy-to-retry-job-since-it-i.patch |  73 +++
 ...rop-dangling-references-from-cups-lpd.man.patch |  24 +
 ...chitecture-in-cups-config-to-make-it-arch.patch |  49 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 ...rastructure-and-translations-for-manpages.patch | 342 ++++++++++++
 debian/patches/series                              |  32 ++
 33 files changed, 2281 insertions(+)
 create mode 100644 debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
 create mode 100644 debian/patches/0002-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
 create mode 100644 debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
 create mode 100644 debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
 create mode 100644 debian/patches/0006-Tests-ignore-loadFile-failures.patch
 create mode 100644 debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
 create mode 100644 debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
 create mode 100644 debian/patches/0009-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
 create mode 100644 debian/patches/0010-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
 create mode 100644 debian/patches/0011-Tests-Force-LC_-environment-variables-when-testing-n.patch
 create mode 100644 debian/patches/0012-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
 create mode 100644 debian/patches/0013-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
 create mode 100644 debian/patches/0014-revert-commit-830cfed95a5349b008999eebd34f5233bc3582.patch
 create mode 100644 debian/patches/0015-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
 create mode 100644 debian/patches/0016-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
 create mode 100644 debian/patches/0017-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0018-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
 create mode 100644 debian/patches/0019-Do-not-write-VCS-tags-into-installed-conffiles.patch
 create mode 100644 debian/patches/0020-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
 create mode 100644 debian/patches/0021-Do-not-use-host-names-for-broadcasting-print-queues-.patch
 create mode 100644 debian/patches/0022-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
 create mode 100644 debian/patches/0023-Make-log-files-readable-to-group-adm-if-present.patch
 create mode 100644 debian/patches/0024-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
 create mode 100644 debian/patches/0025-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
 create mode 100644 debian/patches/0026-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0027-Set-the-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/0028-Set-default-job-error-policy-to-retry-job-since-it-i.patch
 create mode 100644 debian/patches/0029-Drop-dangling-references-from-cups-lpd.man.patch
 create mode 100644 debian/patches/0030-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
 create mode 100644 debian/patches/0031-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/0032-po4a-infrastructure-and-translations-for-manpages.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
new file mode 100644
index 000000000..026b21e03
--- /dev/null
+++ b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
@@ -0,0 +1,571 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://github.com/apple/cups/issues/?L4299
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/0002-Install-root-backends-world-readable.patch b/debian/patches/0002-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..2b51e38ce
--- /dev/null
+++ b/debian/patches/0002-Install-root-backends-world-readable.patch
@@ -0,0 +1,66 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: https://github.com/apple/cups/issues/?L2935
+Bug-Debian: https://bugs.debian.org/410171
+Patch-Name install-root-backends-world-readable.patch
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
new file mode 100644
index 000000000..da719313e
--- /dev/null
+++ b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
@@ -0,0 +1,27 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://github.com/apple/cups/issues/?L4348
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch b/debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
new file mode 100644
index 000000000..a0c55e473
--- /dev/null
+++ b/debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch b/debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
new file mode 100644
index 000000000..21d84e708
--- /dev/null
+++ b/debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/0006-Tests-ignore-loadFile-failures.patch b/debian/patches/0006-Tests-ignore-loadFile-failures.patch
new file mode 100644
index 000000000..6f592d7e7
--- /dev/null
+++ b/debian/patches/0006-Tests-ignore-loadFile-failures.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch b/debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
new file mode 100644
index 000000000..8088de19f
--- /dev/null
+++ b/debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch b/debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
new file mode 100644
index 000000000..708c28dcf
--- /dev/null
+++ b/debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0009-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch b/debian/patches/0009-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
new file mode 100644
index 000000000..931feb799
--- /dev/null
+++ b/debian/patches/0009-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: https://bugs.debian.org/662996
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/0010-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch b/debian/patches/0010-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
new file mode 100644
index 000000000..92b506a73
--- /dev/null
+++ b/debian/patches/0010-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: https://bugs.debian.org/670878
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..4929820 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
diff --git a/debian/patches/0011-Tests-Force-LC_-environment-variables-when-testing-n.patch b/debian/patches/0011-Tests-Force-LC_-environment-variables-when-testing-n.patch
new file mode 100644
index 000000000..9c3a8463e
--- /dev/null
+++ b/debian/patches/0011-Tests-Force-LC_-environment-variables-when-testing-n.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/0012-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch b/debian/patches/0012-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
new file mode 100644
index 000000000..dd3c020e0
--- /dev/null
+++ b/debian/patches/0012-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 4929820..3f0becd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/0013-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch b/debian/patches/0013-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
new file mode 100644
index 000000000..2b9dbf9a0
--- /dev/null
+++ b/debian/patches/0013-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 3f0becd..baebdee 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/0014-revert-commit-830cfed95a5349b008999eebd34f5233bc3582.patch b/debian/patches/0014-revert-commit-830cfed95a5349b008999eebd34f5233bc3582.patch
new file mode 100644
index 000000000..e6a3ed8d3
--- /dev/null
+++ b/debian/patches/0014-revert-commit-830cfed95a5349b008999eebd34f5233bc3582.patch
@@ -0,0 +1,66 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index baebdee..001e2f6 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/0015-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch b/debian/patches/0015-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
new file mode 100644
index 000000000..e0ce61828
--- /dev/null
+++ b/debian/patches/0015-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/?L4342
+Bug-Debian: https://bugs.debian.org/640124
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0016-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch b/debian/patches/0016-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
new file mode 100644
index 000000000..768134e37
--- /dev/null
+++ b/debian/patches/0016-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
@@ -0,0 +1,91 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 8069039..2fff84b 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0017-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0017-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..823705289
--- /dev/null
+++ b/debian/patches/0017-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,48 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://github.com/apple/cups/issues/?3552
+Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0018-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch b/debian/patches/0018-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
new file mode 100644
index 000000000..1498c2db5
--- /dev/null
+++ b/debian/patches/0018-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
@@ -0,0 +1,67 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 2fff84b..a729475 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/0019-Do-not-write-VCS-tags-into-installed-conffiles.patch b/debian/patches/0019-Do-not-write-VCS-tags-into-installed-conffiles.patch
new file mode 100644
index 000000000..3b77eab5a
--- /dev/null
+++ b/debian/patches/0019-Do-not-write-VCS-tags-into-installed-conffiles.patch
@@ -0,0 +1,29 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: http://www.cups.org/str.php?L2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/0020-Rename-the-systemd-service-file-from-org.cups.cups.-.patch b/debian/patches/0020-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/0020-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/0021-Do-not-use-host-names-for-broadcasting-print-queues-.patch b/debian/patches/0021-Do-not-use-host-names-for-broadcasting-print-queues-.patch
new file mode 100644
index 000000000..ef052d5ef
--- /dev/null
+++ b/debian/patches/0021-Do-not-use-host-names-for-broadcasting-print-queues-.patch
@@ -0,0 +1,25 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/0022-CUPS-removes-the-recommended-comments-of-the-NickNam.patch b/debian/patches/0022-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
new file mode 100644
index 000000000..f30429b4c
--- /dev/null
+++ b/debian/patches/0022-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
@@ -0,0 +1,39 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0023-Make-log-files-readable-to-group-adm-if-present.patch b/debian/patches/0023-Make-log-files-readable-to-group-adm-if-present.patch
new file mode 100644
index 000000000..7b93a2da1
--- /dev/null
+++ b/debian/patches/0023-Make-log-files-readable-to-group-adm-if-present.patch
@@ -0,0 +1,60 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/0024-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch b/debian/patches/0024-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
new file mode 100644
index 000000000..c5e7fb2a1
--- /dev/null
+++ b/debian/patches/0024-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/0025-Do-not-mess-with-the-permissions-of-cupsd.conf.patch b/debian/patches/0025-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
new file mode 100644
index 000000000..2057a4856
--- /dev/null
+++ b/debian/patches/0025-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
@@ -0,0 +1,26 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0026-Show-compile-command-lines.patch b/debian/patches/0026-Show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/0026-Show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/0027-Set-the-default-for-SyncOnClose-to-Yes.patch b/debian/patches/0027-Set-the-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..40b9bbdfe
--- /dev/null
+++ b/debian/patches/0027-Set-the-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,64 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/0028-Set-default-job-error-policy-to-retry-job-since-it-i.patch b/debian/patches/0028-Set-default-job-error-policy-to-retry-job-since-it-i.patch
new file mode 100644
index 000000000..eb3dbcc82
--- /dev/null
+++ b/debian/patches/0028-Set-default-job-error-policy-to-retry-job-since-it-i.patch
@@ -0,0 +1,73 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job", since it is less
+
+ confusing and a better default on most machines.
+ .
+ Amend documentation accordingly.
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/0029-Drop-dangling-references-from-cups-lpd.man.patch b/debian/patches/0029-Drop-dangling-references-from-cups-lpd.man.patch
new file mode 100644
index 000000000..0853e7056
--- /dev/null
+++ b/debian/patches/0029-Drop-dangling-references-from-cups-lpd.man.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: https://bugs.debian.org/570157
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/0030-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch b/debian/patches/0030-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
new file mode 100644
index 000000000..142ad8a04
--- /dev/null
+++ b/debian/patches/0030-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0031-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0031-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..5bb407023
--- /dev/null
+++ b/debian/patches/0031-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+Bug-Debian: https://bugs.debian.org/837936
+Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 23abe87..04ac4ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0032-po4a-infrastructure-and-translations-for-manpages.patch b/debian/patches/0032-po4a-infrastructure-and-translations-for-manpages.patch
new file mode 100644
index 000000000..b821ca3a1
--- /dev/null
+++ b/debian/patches/0032-po4a-infrastructure-and-translations-for-manpages.patch
@@ -0,0 +1,342 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages.
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..43cc47197
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,32 @@
+0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
+0002-Install-root-backends-world-readable.patch
+0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
+0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
+0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
+0006-Tests-ignore-loadFile-failures.patch
+0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
+0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
+0009-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
+0010-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
+0011-Tests-Force-LC_-environment-variables-when-testing-n.patch
+0012-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
+0013-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
+0014-revert-commit-830cfed95a5349b008999eebd34f5233bc3582.patch
+0015-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
+0016-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
+0017-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0018-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
+0019-Do-not-write-VCS-tags-into-installed-conffiles.patch
+0020-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
+0021-Do-not-use-host-names-for-broadcasting-print-queues-.patch
+0022-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
+0023-Make-log-files-readable-to-group-adm-if-present.patch
+0024-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
+0025-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
+0026-Show-compile-command-lines.patch
+0027-Set-the-default-for-SyncOnClose-to-Yes.patch
+0028-Set-default-job-error-policy-to-retry-job-since-it-i.patch
+0029-Drop-dangling-references-from-cups-lpd.man.patch
+0030-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
+0031-Build-mantohtml-with-the-build-architecture-compiler.patch
+0032-po4a-infrastructure-and-translations-for-manpages.patch
-- 
cgit v1.2.3


From 6f4620f2b1d68b8f79aca334875deef50e94318d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://github.com/apple/cups/issues/4299
Patch-Name: manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From 38e8f3c02baf28eadcaed7ee95c3540d6535edc5 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: https://github.com/apple/cups/issues/2935
Bug-Debian: https://bugs.debian.org/410171
Patch-Name install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From 791e507ec02342ee1fc12db929de2a2c7347fa9d Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://github.com/apple/cups/issues/4348
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From 5af93e4c5437f81d26fe3c61c651fd144132ca81 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From 6108c765b756a87b4b7994f819cff57eb15e8b04 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Patch-Name: tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From bae99aa64e460ae0b1cf890fb8e2c412332ed87d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 28d0f1e4ebc104a06e95ccf4fd1cb5e8438885cc Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From e38e58c396022046106cafa036e6ff13080faa2c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 9f845f337ea4c93308e63fef25d41afa5cd422f6 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: https://bugs.debian.org/662996
Patch-Name: test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 577759506c110a1305784784fa78c8791c0147d5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: https://bugs.debian.org/670878
Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..492982005 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From efa82f69c50d601a2a748258b9f903db5d5b2463 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From 2d37b159fe35e286e56a0a0fb8d682d1cf945802 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 492982005..3f0becde9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From 8e4b3d54764e839aa581f6754d0f016b4cda86ad Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 3f0becde9..baebdeec9 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From 307e10dc67f8e0b7b034a1bdf702f7df19a4e7bb Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: Tests: Do not test pdftourf

 Revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream
Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index baebdeec9..001e2f61f 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From 63260285d9d9c0d128c1d05e01b486e27d066764 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug-Debian: https://bugs.debian.org/640124
Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 83350f8387f6d8c45fcc802e3ab058157eb6d62f Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 80690397d..2fff84b60 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From a6cfaec1cecf2efa74b6119e35e5139e2dd44aa0 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://github.com/apple/cups/issues/3552
Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From de22cdbe159ff23a4462afbb0b17f3b7342a3609 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 2fff84b60..a729475a3 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 1e9f6595ec5912831f8114b53adde88d1dba1998 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: https://github.com/apple/cups/issues/2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From 69d9c50022bc179d8709e50742e6f5ee134b1d2d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From f21cd48b8a37575240f562d479d2b843bae1938b Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 19d5ed5905f4d6e1aad2465fd613d9dce44faa02 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 608d905969df449d793ecf94a3d51430830ba188 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From 8cb28f8c231a483deec648098e7f459ad9cbc1f1 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From 1ff8808d3538cb98e16650a11c1541aa91b62dff Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 028509e55926e94da29b0979edef34615987bdb0 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From cb1b17ef082fa8789366449b31f98a8a987bc8bf Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 928fec5075f12a05af3aa8156eae86fd0d6d8a94 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job"

It it is less confusing and a better default on most machines.
Amend documentation accordingly.

Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From fdd247a226d432166345ed7682cf4ea2f2597589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: https://bugs.debian.org/570157
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 776c456065ad90985402d0df89bd8ea4c374a8e2 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 8dbefc80bae2012ee313e9f63e6af150ba52cd27 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 23abe870e..04ac4ff50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From c8ee56f4dd5a41bf7b647e0b43f7ff8bf2913948 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From d946e5f6f91716c2f9ca9d3e9467bfb53a497eb2 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 30 Jan 2020 20:34:29 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...-hyphen-used-as-minus-sign-manpage-errors.patch | 571 +++++++++++++++++++++
 ...0002-Install-root-backends-world-readable.patch |  66 +++
 ...s-with-multiple-files-or-multiple-formats.patch |  27 +
 ...sts-Ignore-warnings-from-colord-and-Avahi.patch |  28 +
 ...ignore-usb-dnssd-backend-unexpected-exits.patch |  31 ++
 .../0006-Tests-ignore-loadFile-failures.patch      |  25 +
 ...e-errors-triggered-on-ipv6-deprived-hosts.patch |  24 +
 ...re-the-failure-to-write-uncompressed-data.patch |  24 +
 ...t-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch |  24 +
 ...sure-that-all-scheduled-jobs-are-finished.patch |  28 +
 ...-LC_-environment-variables-when-testing-n.patch |  31 ++
 ...27.0.0.1-instead-of-localhost-to-help-pbu.patch |  64 +++
 ...-LC_ALL-C-environment-variable-when-grepp.patch |  24 +
 .../patches/0014-Tests-Do-not-test-pdftourf.patch  |  68 +++
 ...d.conf.default-from-SERVERROOT-to-DATADIR.patch |  62 +++
 ...pport-Apple-AirPrint-printing-from-iPhone.patch |  91 ++++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  48 ++
 ...e-stamps-in-conffiles-to-avoid-ever-chang.patch |  67 +++
 ...t-write-VCS-tags-into-installed-conffiles.patch |  29 ++
 ...systemd-service-file-from-org.cups.cups.-.patch |  59 +++
 ...host-names-for-broadcasting-print-queues-.patch |  25 +
 ...s-the-recommended-comments-of-the-NickNam.patch |  39 ++
 ...og-files-readable-to-group-adm-if-present.patch |  60 +++
 ...CUPS-own-log-rotating-as-the-system-alrea.patch |  25 +
 ...t-mess-with-the-permissions-of-cupsd.conf.patch |  26 +
 .../patches/0026-Show-compile-command-lines.patch  |  23 +
 ...27-Set-the-default-for-SyncOnClose-to-Yes.patch |  64 +++
 ...Set-default-job-error-policy-to-retry-job.patch |  73 +++
 ...rop-dangling-references-from-cups-lpd.man.patch |  24 +
 ...chitecture-in-cups-config-to-make-it-arch.patch |  49 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 ...rastructure-and-translations-for-manpages.patch | 342 ++++++++++++
 debian/patches/series                              |  32 ++
 33 files changed, 2283 insertions(+)
 create mode 100644 debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
 create mode 100644 debian/patches/0002-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
 create mode 100644 debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
 create mode 100644 debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
 create mode 100644 debian/patches/0006-Tests-ignore-loadFile-failures.patch
 create mode 100644 debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
 create mode 100644 debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
 create mode 100644 debian/patches/0009-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
 create mode 100644 debian/patches/0010-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
 create mode 100644 debian/patches/0011-Tests-Force-LC_-environment-variables-when-testing-n.patch
 create mode 100644 debian/patches/0012-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
 create mode 100644 debian/patches/0013-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
 create mode 100644 debian/patches/0014-Tests-Do-not-test-pdftourf.patch
 create mode 100644 debian/patches/0015-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
 create mode 100644 debian/patches/0016-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
 create mode 100644 debian/patches/0017-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0018-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
 create mode 100644 debian/patches/0019-Do-not-write-VCS-tags-into-installed-conffiles.patch
 create mode 100644 debian/patches/0020-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
 create mode 100644 debian/patches/0021-Do-not-use-host-names-for-broadcasting-print-queues-.patch
 create mode 100644 debian/patches/0022-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
 create mode 100644 debian/patches/0023-Make-log-files-readable-to-group-adm-if-present.patch
 create mode 100644 debian/patches/0024-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
 create mode 100644 debian/patches/0025-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
 create mode 100644 debian/patches/0026-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0027-Set-the-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/0028-Set-default-job-error-policy-to-retry-job.patch
 create mode 100644 debian/patches/0029-Drop-dangling-references-from-cups-lpd.man.patch
 create mode 100644 debian/patches/0030-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
 create mode 100644 debian/patches/0031-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/0032-po4a-infrastructure-and-translations-for-manpages.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
new file mode 100644
index 000000000..ce9c33b51
--- /dev/null
+++ b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
@@ -0,0 +1,571 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://github.com/apple/cups/issues/4299
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/0002-Install-root-backends-world-readable.patch b/debian/patches/0002-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..def3900f7
--- /dev/null
+++ b/debian/patches/0002-Install-root-backends-world-readable.patch
@@ -0,0 +1,66 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: https://github.com/apple/cups/issues/2935
+Bug-Debian: https://bugs.debian.org/410171
+Patch-Name install-root-backends-world-readable.patch
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
new file mode 100644
index 000000000..07da4d2f7
--- /dev/null
+++ b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
@@ -0,0 +1,27 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://github.com/apple/cups/issues/4348
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch b/debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
new file mode 100644
index 000000000..a0c55e473
--- /dev/null
+++ b/debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch b/debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
new file mode 100644
index 000000000..21d84e708
--- /dev/null
+++ b/debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/0006-Tests-ignore-loadFile-failures.patch b/debian/patches/0006-Tests-ignore-loadFile-failures.patch
new file mode 100644
index 000000000..6f592d7e7
--- /dev/null
+++ b/debian/patches/0006-Tests-ignore-loadFile-failures.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch b/debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
new file mode 100644
index 000000000..8088de19f
--- /dev/null
+++ b/debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch b/debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
new file mode 100644
index 000000000..708c28dcf
--- /dev/null
+++ b/debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0009-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch b/debian/patches/0009-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
new file mode 100644
index 000000000..931feb799
--- /dev/null
+++ b/debian/patches/0009-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: https://bugs.debian.org/662996
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/0010-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch b/debian/patches/0010-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
new file mode 100644
index 000000000..92b506a73
--- /dev/null
+++ b/debian/patches/0010-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: https://bugs.debian.org/670878
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..4929820 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
diff --git a/debian/patches/0011-Tests-Force-LC_-environment-variables-when-testing-n.patch b/debian/patches/0011-Tests-Force-LC_-environment-variables-when-testing-n.patch
new file mode 100644
index 000000000..9c3a8463e
--- /dev/null
+++ b/debian/patches/0011-Tests-Force-LC_-environment-variables-when-testing-n.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/0012-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch b/debian/patches/0012-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
new file mode 100644
index 000000000..dd3c020e0
--- /dev/null
+++ b/debian/patches/0012-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 4929820..3f0becd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/0013-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch b/debian/patches/0013-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
new file mode 100644
index 000000000..2b9dbf9a0
--- /dev/null
+++ b/debian/patches/0013-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 3f0becd..baebdee 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/0014-Tests-Do-not-test-pdftourf.patch b/debian/patches/0014-Tests-Do-not-test-pdftourf.patch
new file mode 100644
index 000000000..8adf5d944
--- /dev/null
+++ b/debian/patches/0014-Tests-Do-not-test-pdftourf.patch
@@ -0,0 +1,68 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: Tests: Do not test pdftourf
+
+ Revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index baebdee..001e2f6 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/0015-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch b/debian/patches/0015-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
new file mode 100644
index 000000000..c785eb981
--- /dev/null
+++ b/debian/patches/0015-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug-Debian: https://bugs.debian.org/640124
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0016-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch b/debian/patches/0016-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
new file mode 100644
index 000000000..768134e37
--- /dev/null
+++ b/debian/patches/0016-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
@@ -0,0 +1,91 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 8069039..2fff84b 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0017-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0017-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..4389e274d
--- /dev/null
+++ b/debian/patches/0017-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,48 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://github.com/apple/cups/issues/3552
+Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0018-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch b/debian/patches/0018-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
new file mode 100644
index 000000000..1498c2db5
--- /dev/null
+++ b/debian/patches/0018-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
@@ -0,0 +1,67 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 2fff84b..a729475 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/0019-Do-not-write-VCS-tags-into-installed-conffiles.patch b/debian/patches/0019-Do-not-write-VCS-tags-into-installed-conffiles.patch
new file mode 100644
index 000000000..8ffa2bcb0
--- /dev/null
+++ b/debian/patches/0019-Do-not-write-VCS-tags-into-installed-conffiles.patch
@@ -0,0 +1,29 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: https://github.com/apple/cups/issues/2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/0020-Rename-the-systemd-service-file-from-org.cups.cups.-.patch b/debian/patches/0020-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/0020-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/0021-Do-not-use-host-names-for-broadcasting-print-queues-.patch b/debian/patches/0021-Do-not-use-host-names-for-broadcasting-print-queues-.patch
new file mode 100644
index 000000000..ef052d5ef
--- /dev/null
+++ b/debian/patches/0021-Do-not-use-host-names-for-broadcasting-print-queues-.patch
@@ -0,0 +1,25 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/0022-CUPS-removes-the-recommended-comments-of-the-NickNam.patch b/debian/patches/0022-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
new file mode 100644
index 000000000..f30429b4c
--- /dev/null
+++ b/debian/patches/0022-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
@@ -0,0 +1,39 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0023-Make-log-files-readable-to-group-adm-if-present.patch b/debian/patches/0023-Make-log-files-readable-to-group-adm-if-present.patch
new file mode 100644
index 000000000..7b93a2da1
--- /dev/null
+++ b/debian/patches/0023-Make-log-files-readable-to-group-adm-if-present.patch
@@ -0,0 +1,60 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/0024-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch b/debian/patches/0024-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
new file mode 100644
index 000000000..c5e7fb2a1
--- /dev/null
+++ b/debian/patches/0024-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/0025-Do-not-mess-with-the-permissions-of-cupsd.conf.patch b/debian/patches/0025-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
new file mode 100644
index 000000000..2057a4856
--- /dev/null
+++ b/debian/patches/0025-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
@@ -0,0 +1,26 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0026-Show-compile-command-lines.patch b/debian/patches/0026-Show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/0026-Show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/0027-Set-the-default-for-SyncOnClose-to-Yes.patch b/debian/patches/0027-Set-the-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..40b9bbdfe
--- /dev/null
+++ b/debian/patches/0027-Set-the-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,64 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/0028-Set-default-job-error-policy-to-retry-job.patch b/debian/patches/0028-Set-default-job-error-policy-to-retry-job.patch
new file mode 100644
index 000000000..80abeb3a8
--- /dev/null
+++ b/debian/patches/0028-Set-default-job-error-policy-to-retry-job.patch
@@ -0,0 +1,73 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job"
+
+It it is less confusing and a better default on most machines.
+Amend documentation accordingly.
+
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/0029-Drop-dangling-references-from-cups-lpd.man.patch b/debian/patches/0029-Drop-dangling-references-from-cups-lpd.man.patch
new file mode 100644
index 000000000..0853e7056
--- /dev/null
+++ b/debian/patches/0029-Drop-dangling-references-from-cups-lpd.man.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: https://bugs.debian.org/570157
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/0030-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch b/debian/patches/0030-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
new file mode 100644
index 000000000..142ad8a04
--- /dev/null
+++ b/debian/patches/0030-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0031-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0031-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..5bb407023
--- /dev/null
+++ b/debian/patches/0031-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+Bug-Debian: https://bugs.debian.org/837936
+Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 23abe87..04ac4ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0032-po4a-infrastructure-and-translations-for-manpages.patch b/debian/patches/0032-po4a-infrastructure-and-translations-for-manpages.patch
new file mode 100644
index 000000000..ecfe58203
--- /dev/null
+++ b/debian/patches/0032-po4a-infrastructure-and-translations-for-manpages.patch
@@ -0,0 +1,342 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..aada5de08
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,32 @@
+0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
+0002-Install-root-backends-world-readable.patch
+0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
+0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
+0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
+0006-Tests-ignore-loadFile-failures.patch
+0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
+0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
+0009-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
+0010-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
+0011-Tests-Force-LC_-environment-variables-when-testing-n.patch
+0012-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
+0013-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
+0014-Tests-Do-not-test-pdftourf.patch
+0015-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
+0016-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
+0017-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0018-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
+0019-Do-not-write-VCS-tags-into-installed-conffiles.patch
+0020-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
+0021-Do-not-use-host-names-for-broadcasting-print-queues-.patch
+0022-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
+0023-Make-log-files-readable-to-group-adm-if-present.patch
+0024-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
+0025-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
+0026-Show-compile-command-lines.patch
+0027-Set-the-default-for-SyncOnClose-to-Yes.patch
+0028-Set-default-job-error-policy-to-retry-job.patch
+0029-Drop-dangling-references-from-cups-lpd.man.patch
+0030-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
+0031-Build-mantohtml-with-the-build-architecture-compiler.patch
+0032-po4a-infrastructure-and-translations-for-manpages.patch
-- 
cgit v1.2.3


From 22eacb86876ec1666e358e8f50cfb483d3747e85 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 30 Jan 2020 20:35:47 +0100
Subject: cups 2.3.1-4 Debian release

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 707a9b218..429ddbfb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.1-4) unstable; urgency=medium
+
+  * Cleanup patch queue for cups' bts URLs and patch names
+  * Update README.Debian to remove leftover SystemdIdleExit references
+
+ -- Didier Raboud <odyx@debian.org>  Thu, 30 Jan 2020 20:35:47 +0100
+
 cups (2.3.1-2) unstable; urgency=medium
 
   * Drop pwg-raster-attributes.patch
-- 
cgit v1.2.3


From 257c4217012d97ca816b60623dea64d7dc439ae7 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 1 Feb 2020 12:45:15 +0100
Subject: Drop all printer-driver-* and hplip recommends/suggests

---
 debian/control | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/debian/control b/debian/control
index 854b27304..703bdfac9 100644
--- a/debian/control
+++ b/debian/control
@@ -96,12 +96,9 @@ Depends: ${shlibs:Depends},
 Recommends: avahi-daemon,
             colord,
             cups-filters (>= 1.0.42) | foomatic-filters,
-            printer-driver-gutenprint,
             cups-filters (>= 1.0.36) | ghostscript-cups
 Suggests: cups-bsd,
           foomatic-db-compressed-ppds | foomatic-db,
-          printer-driver-hpcups,
-          hplip,
           cups-pdf,
           udev,
           smbclient
@@ -165,9 +162,6 @@ Suggests: cups,
           ghostscript,
           cups-filters (>= 1.0.42) | foomatic-filters,
           foomatic-db-compressed-ppds | foomatic-db,
-          printer-driver-gutenprint,
-          printer-driver-hpcups,
-          hplip,
           cups-pdf,
           udev,
           smbclient
-- 
cgit v1.2.3


From 0de97aafcbe4213cfbc531305f1dbfe248de8fef Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 1 Feb 2020 12:49:29 +0100
Subject: Bump S-V to 4.5.0 without changes needed

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 703bdfac9..014d6bbc3 100644
--- a/debian/control
+++ b/debian/control
@@ -36,11 +36,11 @@ Build-Depends: debhelper-compat (= 12),
                zlib1g-dev
 # libgmp-dev is not GPL-2 compatible before it's 6 release, which makes it also GPL-2+
 Build-Conflicts: libgmp-dev (<< 2:6)
-Rules-Requires-Root: no
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/printing-team/cups
 Vcs-Git: https://salsa.debian.org/printing-team/cups.git
 Homepage: https://www.cups.org/
+Rules-Requires-Root: no
 
 Package: libcups2
 Architecture: any
-- 
cgit v1.2.3


From 9c789ea4566038c6ac924d832c1f5c29bf06fb36 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 1 Feb 2020 12:50:12 +0100
Subject: Cleanup all versions from pre- Debian stable

---
 debian/control | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/debian/control b/debian/control
index 014d6bbc3..1f277561e 100644
--- a/debian/control
+++ b/debian/control
@@ -92,19 +92,17 @@ Depends: ${shlibs:Depends},
          cups-client (>= ${binary:Version}),
          libcups2 (= ${binary:Version}),
          cups-ppdc,
-         cups-filters (>= 1.0.24-3~)
+         cups-filters
 Recommends: avahi-daemon,
             colord,
-            cups-filters (>= 1.0.42) | foomatic-filters,
-            cups-filters (>= 1.0.36) | ghostscript-cups
+            cups-filters | foomatic-filters,
+            cups-filters | ghostscript-cups
 Suggests: cups-bsd,
           foomatic-db-compressed-ppds | foomatic-db,
           cups-pdf,
           udev,
           smbclient
 Pre-Depends: ${misc:Pre-Depends}
-Breaks: cups-bsd (<< 1.7.2-3~)
-Replaces: cups-bsd (<< 1.7.2-3~)
 Description: Common UNIX Printing System(tm) - PPD/driver support, web interface
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -124,10 +122,8 @@ Depends: ${shlibs:Depends},
          cups-filters-core-drivers
 Recommends: avahi-daemon
 Pre-Depends: ${misc:Pre-Depends}
-Breaks: cups (<< 1.7.1-4~),
-        cups-server-common (<< 2.1.0-7~)
-Replaces: cups (<< 1.7.1-4~),
-          cups-server-common (<< 2.1.0-7~)
+Breaks: cups-server-common (<< 2.1.0-7~)
+Replaces: cups-server-common (<< 2.1.0-7~)
 Description: Common UNIX Printing System(tm) - driverless printing
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -150,7 +146,7 @@ Depends: ${shlibs:Depends},
          bc
 Recommends: colord,
             cups-browsed,
-            avahi-daemon (>= 0.6.31-3~)
+            avahi-daemon
 Suggests: cups,
           cups-bsd,
           cups-common (>= ${source:Version}),
@@ -160,7 +156,7 @@ Suggests: cups,
           cups-filters,
           poppler-utils,
           ghostscript,
-          cups-filters (>= 1.0.42) | foomatic-filters,
+          cups-filters | foomatic-filters,
           foomatic-db-compressed-ppds | foomatic-db,
           cups-pdf,
           udev,
@@ -186,9 +182,7 @@ Depends: ${shlibs:Depends},
 Suggests: cups,
           cups-bsd,
           smbclient
-Breaks: cups (<< 1.7.3-5~)
 Conflicts: lprng
-Replaces: cups (<< 1.7.3-5~)
 Description: Common UNIX Printing System(tm) - client programs (SysV)
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -203,10 +197,8 @@ Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libcups2 (= ${binary:Version})
-Breaks: cups (<< 1.7.3-5~),
-        cups-client (<< 2.0.3-2~)
-Replaces: cups (<< 1.7.3-5~),
-          cups-client (<< 2.0.3-2~)
+Breaks: cups-client (<< 2.0.3-2~)
+Replaces: cups-client (<< 2.0.3-2~)
 Description: Common UNIX Printing System(tm) - IPP developer/admin utilities
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -300,10 +292,6 @@ Architecture: all
 Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Breaks: cups (<< 1.6.2-2~),
-        cups-common (<< 1.7.0)
-Replaces: cups (<< 1.6.2-2~),
-          cups-common (<< 1.7.0)
 Description: Common UNIX Printing System(tm) - server common files
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
-- 
cgit v1.2.3


From 43f9c48490084f3cf54d2f58a2f495f3d5302610 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 1 Feb 2020 13:50:33 +0100
Subject: cups 2.3.1-4+exp0 Debian release

---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 429ddbfb1..9d94e4343 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cups (2.3.1-4+exp0) experimental; urgency=medium
+
+  * Move towards driverless-centered installation:
+    - Drop all printer-driver-* and hplip recommends/suggests
+  * Cleanup all versions from pre- Debian stable
+  * Bump S-V to 4.5.0 without changes needed
+
+ -- Didier Raboud <odyx@debian.org>  Sat, 01 Feb 2020 13:50:33 +0100
+
 cups (2.3.1-4) unstable; urgency=medium
 
   * Cleanup patch queue for cups' bts URLs and patch names
-- 
cgit v1.2.3


From f4bb4f295b1e697f8aa930c7918f9293d11e54e3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 7 Feb 2020 17:08:48 +0100
Subject: cups 2.3.1-5 Debian release

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d94e4343..aa749a7a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-cups (2.3.1-4+exp0) experimental; urgency=medium
+cups (2.3.1-5) unstable; urgency=medium
 
   * Move towards driverless-centered installation:
     - Drop all printer-driver-* and hplip recommends/suggests
   * Cleanup all versions from pre- Debian stable
   * Bump S-V to 4.5.0 without changes needed
 
- -- Didier Raboud <odyx@debian.org>  Sat, 01 Feb 2020 13:50:33 +0100
+ -- Didier Raboud <odyx@debian.org>  Fri, 07 Feb 2020 17:08:48 +0100
 
 cups (2.3.1-4) unstable; urgency=medium
 
-- 
cgit v1.2.3


From d026ec3763c92b590a4e4c33fd6767677f598c33 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://github.com/apple/cups/issues/4299
Patch-Name: manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From a6a3de8f0a681e5d006552aef9eea146c8f78ab8 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: https://github.com/apple/cups/issues/2935
Bug-Debian: https://bugs.debian.org/410171
Patch-Name install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From 3bf4c6eb79082f384a0cc6efa7a5da54646c7331 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://github.com/apple/cups/issues/4348
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From b9fe880259a26b0673b9563eacbdcbea2aa44dcf Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From 5f6638b79db1556a6d677dc673268b0c609a74f5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Patch-Name: tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From 2d621039b56ed5be67162d0bd2de6ab415a52d4a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 0135068a2fd9007e007f92147a44660a58a72247 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 37d8b269f52a2432499904db85eee1743a34e26d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 977aa609ee68e5e50d424da0a15bdb5cf0ceaad2 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 8 Feb 2020 11:49:07 +0100
Subject: Tests: ignore 'job held' message

Origin: vendor
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..dfa7f6a5c 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+       $GREP -v 'Job held by' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 8769e464c95196af0601a0970f5d52fc64e39a65 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: https://bugs.debian.org/662996
Patch-Name: test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 3d42df2035fcb7c22cb4241164d4519862733775 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: https://bugs.debian.org/670878
Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index dfa7f6a5c..173fc86a7 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From ed4b85357c6f5019349c53ae18749cf40992bf5b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From 29507a10a7d33b63f177cd303903d6f7fce89d37 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 173fc86a7..88bafb1a6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From 305a6f63c30592bfc629fe980d9ecf808e8b47be Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 88bafb1a6..d9b398575 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From 1573a697de8e7bdef0c3f8c65de07918071de193 Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: Tests: Do not test pdftourf

 Revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream
Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index d9b398575..bc332fc61 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From aa999808e1eb1b2370f2a879af15b8c6fc9a02d3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug-Debian: https://bugs.debian.org/640124
Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 75f986581a12d6dda29e62fec8a519957bd9d420 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 80690397d..2fff84b60 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 6409f12fea7921afaf65de64119729feddc048fa Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://github.com/apple/cups/issues/3552
Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 4b5661c58d3df50fbda9a9cd1b404de2b9109ba0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 2fff84b60..a729475a3 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From ed589bd2ee48ec992c8d64f0b0f26ecb0aea2188 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: https://github.com/apple/cups/issues/2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From ff722a6d27502900d3660e9ec916bd0c4640859a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From b6e211dfd35a5be50c4ba8e03855e600ad1eb023 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 9fde5363484f7c0af88398a78ad1ae5af2a5fa72 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From dd6eff31481458a08d7b303a01047b26c55ee438 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From 6890e936ac7b863373c0a36f3faf383602cf8a91 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From 4f8d553548ed5eed25a74e8608e9c89fd258b8d5 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From f781707962bb4a985e48874ca4458cdc598b2d65 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From cd6fb62f9edbc130acfede0d1f1fc123c8a48988 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 08510ee5ae794cf5d29f388279b2c370f1cf767b Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job"

It it is less confusing and a better default on most machines.
Amend documentation accordingly.

Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From cfe1bf133edaf5eb911e9c9c7daa10cd7302ea34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: https://bugs.debian.org/570157
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 1471650c3d92a1fe91501837fa9920d6e12d1b64 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From e5ff774161424fb37e50869e9ac31fe873456ce3 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 23abe870e..04ac4ff50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From a8513204862d5a00cc99ee89e8fab4d0d28cf03c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 31adbc5e03c4e515329e35f91e396658f4deea87 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 8 Feb 2020 11:50:48 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...-hyphen-used-as-minus-sign-manpage-errors.patch | 571 +++++++++++++++++++++
 ...0002-Install-root-backends-world-readable.patch |  66 +++
 ...s-with-multiple-files-or-multiple-formats.patch |  27 +
 ...sts-Ignore-warnings-from-colord-and-Avahi.patch |  28 +
 ...ignore-usb-dnssd-backend-unexpected-exits.patch |  31 ++
 .../0006-Tests-ignore-loadFile-failures.patch      |  25 +
 ...e-errors-triggered-on-ipv6-deprived-hosts.patch |  24 +
 ...re-the-failure-to-write-uncompressed-data.patch |  24 +
 .../0009-Tests-ignore-job-held-message.patch       |  21 +
 ...t-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch |  24 +
 ...sure-that-all-scheduled-jobs-are-finished.patch |  28 +
 ...-LC_-environment-variables-when-testing-n.patch |  31 ++
 ...27.0.0.1-instead-of-localhost-to-help-pbu.patch |  64 +++
 ...-LC_ALL-C-environment-variable-when-grepp.patch |  24 +
 .../patches/0015-Tests-Do-not-test-pdftourf.patch  |  68 +++
 ...d.conf.default-from-SERVERROOT-to-DATADIR.patch |  62 +++
 ...pport-Apple-AirPrint-printing-from-iPhone.patch |  91 ++++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  48 ++
 ...e-stamps-in-conffiles-to-avoid-ever-chang.patch |  67 +++
 ...t-write-VCS-tags-into-installed-conffiles.patch |  29 ++
 ...systemd-service-file-from-org.cups.cups.-.patch |  59 +++
 ...host-names-for-broadcasting-print-queues-.patch |  25 +
 ...s-the-recommended-comments-of-the-NickNam.patch |  39 ++
 ...og-files-readable-to-group-adm-if-present.patch |  60 +++
 ...CUPS-own-log-rotating-as-the-system-alrea.patch |  25 +
 ...t-mess-with-the-permissions-of-cupsd.conf.patch |  26 +
 .../patches/0027-Show-compile-command-lines.patch  |  23 +
 ...28-Set-the-default-for-SyncOnClose-to-Yes.patch |  64 +++
 ...Set-default-job-error-policy-to-retry-job.patch |  73 +++
 ...rop-dangling-references-from-cups-lpd.man.patch |  24 +
 ...chitecture-in-cups-config-to-make-it-arch.patch |  49 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 ...rastructure-and-translations-for-manpages.patch | 342 ++++++++++++
 debian/patches/series                              |  33 ++
 34 files changed, 2305 insertions(+)
 create mode 100644 debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
 create mode 100644 debian/patches/0002-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
 create mode 100644 debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
 create mode 100644 debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
 create mode 100644 debian/patches/0006-Tests-ignore-loadFile-failures.patch
 create mode 100644 debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
 create mode 100644 debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
 create mode 100644 debian/patches/0009-Tests-ignore-job-held-message.patch
 create mode 100644 debian/patches/0010-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
 create mode 100644 debian/patches/0011-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
 create mode 100644 debian/patches/0012-Tests-Force-LC_-environment-variables-when-testing-n.patch
 create mode 100644 debian/patches/0013-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
 create mode 100644 debian/patches/0014-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
 create mode 100644 debian/patches/0015-Tests-Do-not-test-pdftourf.patch
 create mode 100644 debian/patches/0016-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
 create mode 100644 debian/patches/0017-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
 create mode 100644 debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0019-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
 create mode 100644 debian/patches/0020-Do-not-write-VCS-tags-into-installed-conffiles.patch
 create mode 100644 debian/patches/0021-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
 create mode 100644 debian/patches/0022-Do-not-use-host-names-for-broadcasting-print-queues-.patch
 create mode 100644 debian/patches/0023-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
 create mode 100644 debian/patches/0024-Make-log-files-readable-to-group-adm-if-present.patch
 create mode 100644 debian/patches/0025-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
 create mode 100644 debian/patches/0026-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
 create mode 100644 debian/patches/0027-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0028-Set-the-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/0029-Set-default-job-error-policy-to-retry-job.patch
 create mode 100644 debian/patches/0030-Drop-dangling-references-from-cups-lpd.man.patch
 create mode 100644 debian/patches/0031-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
 create mode 100644 debian/patches/0032-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/0033-po4a-infrastructure-and-translations-for-manpages.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
new file mode 100644
index 000000000..ce9c33b51
--- /dev/null
+++ b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
@@ -0,0 +1,571 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://github.com/apple/cups/issues/4299
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/0002-Install-root-backends-world-readable.patch b/debian/patches/0002-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..def3900f7
--- /dev/null
+++ b/debian/patches/0002-Install-root-backends-world-readable.patch
@@ -0,0 +1,66 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: https://github.com/apple/cups/issues/2935
+Bug-Debian: https://bugs.debian.org/410171
+Patch-Name install-root-backends-world-readable.patch
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
new file mode 100644
index 000000000..07da4d2f7
--- /dev/null
+++ b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
@@ -0,0 +1,27 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://github.com/apple/cups/issues/4348
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch b/debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
new file mode 100644
index 000000000..a0c55e473
--- /dev/null
+++ b/debian/patches/0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch b/debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
new file mode 100644
index 000000000..21d84e708
--- /dev/null
+++ b/debian/patches/0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/0006-Tests-ignore-loadFile-failures.patch b/debian/patches/0006-Tests-ignore-loadFile-failures.patch
new file mode 100644
index 000000000..6f592d7e7
--- /dev/null
+++ b/debian/patches/0006-Tests-ignore-loadFile-failures.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch b/debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
new file mode 100644
index 000000000..8088de19f
--- /dev/null
+++ b/debian/patches/0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch b/debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
new file mode 100644
index 000000000..708c28dcf
--- /dev/null
+++ b/debian/patches/0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0009-Tests-ignore-job-held-message.patch b/debian/patches/0009-Tests-ignore-job-held-message.patch
new file mode 100644
index 000000000..11f87ab7c
--- /dev/null
+++ b/debian/patches/0009-Tests-ignore-job-held-message.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 8 Feb 2020 11:49:07 +0100
+Subject: Tests: ignore 'job held' message
+
+Origin: vendor
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..dfa7f6a 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
++       $GREP -v 'Job held by' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0010-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch b/debian/patches/0010-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
new file mode 100644
index 000000000..931feb799
--- /dev/null
+++ b/debian/patches/0010-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: https://bugs.debian.org/662996
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/0011-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch b/debian/patches/0011-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
new file mode 100644
index 000000000..a677af5fb
--- /dev/null
+++ b/debian/patches/0011-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: https://bugs.debian.org/670878
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index dfa7f6a..173fc86 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
diff --git a/debian/patches/0012-Tests-Force-LC_-environment-variables-when-testing-n.patch b/debian/patches/0012-Tests-Force-LC_-environment-variables-when-testing-n.patch
new file mode 100644
index 000000000..9c3a8463e
--- /dev/null
+++ b/debian/patches/0012-Tests-Force-LC_-environment-variables-when-testing-n.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/0013-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch b/debian/patches/0013-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
new file mode 100644
index 000000000..56e9a0710
--- /dev/null
+++ b/debian/patches/0013-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 173fc86..88bafb1 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/0014-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch b/debian/patches/0014-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
new file mode 100644
index 000000000..1ba692070
--- /dev/null
+++ b/debian/patches/0014-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 88bafb1..d9b3985 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/0015-Tests-Do-not-test-pdftourf.patch b/debian/patches/0015-Tests-Do-not-test-pdftourf.patch
new file mode 100644
index 000000000..08c1c73ec
--- /dev/null
+++ b/debian/patches/0015-Tests-Do-not-test-pdftourf.patch
@@ -0,0 +1,68 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: Tests: Do not test pdftourf
+
+ Revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index d9b3985..bc332fc 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/0016-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch b/debian/patches/0016-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
new file mode 100644
index 000000000..c785eb981
--- /dev/null
+++ b/debian/patches/0016-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug-Debian: https://bugs.debian.org/640124
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0017-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch b/debian/patches/0017-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
new file mode 100644
index 000000000..768134e37
--- /dev/null
+++ b/debian/patches/0017-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
@@ -0,0 +1,91 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 8069039..2fff84b 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..4389e274d
--- /dev/null
+++ b/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,48 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://github.com/apple/cups/issues/3552
+Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0019-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch b/debian/patches/0019-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
new file mode 100644
index 000000000..1498c2db5
--- /dev/null
+++ b/debian/patches/0019-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
@@ -0,0 +1,67 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 2fff84b..a729475 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/0020-Do-not-write-VCS-tags-into-installed-conffiles.patch b/debian/patches/0020-Do-not-write-VCS-tags-into-installed-conffiles.patch
new file mode 100644
index 000000000..8ffa2bcb0
--- /dev/null
+++ b/debian/patches/0020-Do-not-write-VCS-tags-into-installed-conffiles.patch
@@ -0,0 +1,29 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: https://github.com/apple/cups/issues/2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/0021-Rename-the-systemd-service-file-from-org.cups.cups.-.patch b/debian/patches/0021-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/0021-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/0022-Do-not-use-host-names-for-broadcasting-print-queues-.patch b/debian/patches/0022-Do-not-use-host-names-for-broadcasting-print-queues-.patch
new file mode 100644
index 000000000..ef052d5ef
--- /dev/null
+++ b/debian/patches/0022-Do-not-use-host-names-for-broadcasting-print-queues-.patch
@@ -0,0 +1,25 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/0023-CUPS-removes-the-recommended-comments-of-the-NickNam.patch b/debian/patches/0023-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
new file mode 100644
index 000000000..f30429b4c
--- /dev/null
+++ b/debian/patches/0023-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
@@ -0,0 +1,39 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0024-Make-log-files-readable-to-group-adm-if-present.patch b/debian/patches/0024-Make-log-files-readable-to-group-adm-if-present.patch
new file mode 100644
index 000000000..7b93a2da1
--- /dev/null
+++ b/debian/patches/0024-Make-log-files-readable-to-group-adm-if-present.patch
@@ -0,0 +1,60 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/0025-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch b/debian/patches/0025-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
new file mode 100644
index 000000000..c5e7fb2a1
--- /dev/null
+++ b/debian/patches/0025-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/0026-Do-not-mess-with-the-permissions-of-cupsd.conf.patch b/debian/patches/0026-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
new file mode 100644
index 000000000..2057a4856
--- /dev/null
+++ b/debian/patches/0026-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
@@ -0,0 +1,26 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0027-Show-compile-command-lines.patch b/debian/patches/0027-Show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/0027-Show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/0028-Set-the-default-for-SyncOnClose-to-Yes.patch b/debian/patches/0028-Set-the-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..40b9bbdfe
--- /dev/null
+++ b/debian/patches/0028-Set-the-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,64 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/0029-Set-default-job-error-policy-to-retry-job.patch b/debian/patches/0029-Set-default-job-error-policy-to-retry-job.patch
new file mode 100644
index 000000000..80abeb3a8
--- /dev/null
+++ b/debian/patches/0029-Set-default-job-error-policy-to-retry-job.patch
@@ -0,0 +1,73 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job"
+
+It it is less confusing and a better default on most machines.
+Amend documentation accordingly.
+
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/0030-Drop-dangling-references-from-cups-lpd.man.patch b/debian/patches/0030-Drop-dangling-references-from-cups-lpd.man.patch
new file mode 100644
index 000000000..0853e7056
--- /dev/null
+++ b/debian/patches/0030-Drop-dangling-references-from-cups-lpd.man.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: https://bugs.debian.org/570157
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/0031-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch b/debian/patches/0031-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
new file mode 100644
index 000000000..142ad8a04
--- /dev/null
+++ b/debian/patches/0031-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0032-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0032-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..5bb407023
--- /dev/null
+++ b/debian/patches/0032-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+Bug-Debian: https://bugs.debian.org/837936
+Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 23abe87..04ac4ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0033-po4a-infrastructure-and-translations-for-manpages.patch b/debian/patches/0033-po4a-infrastructure-and-translations-for-manpages.patch
new file mode 100644
index 000000000..ecfe58203
--- /dev/null
+++ b/debian/patches/0033-po4a-infrastructure-and-translations-for-manpages.patch
@@ -0,0 +1,342 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..eb22fb49c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,33 @@
+0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
+0002-Install-root-backends-world-readable.patch
+0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
+0004-Tests-Ignore-warnings-from-colord-and-Avahi.patch
+0005-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
+0006-Tests-ignore-loadFile-failures.patch
+0007-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
+0008-Tests-ignore-the-failure-to-write-uncompressed-data.patch
+0009-Tests-ignore-job-held-message.patch
+0010-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
+0011-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
+0012-Tests-Force-LC_-environment-variables-when-testing-n.patch
+0013-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
+0014-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
+0015-Tests-Do-not-test-pdftourf.patch
+0016-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
+0017-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
+0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0019-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
+0020-Do-not-write-VCS-tags-into-installed-conffiles.patch
+0021-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
+0022-Do-not-use-host-names-for-broadcasting-print-queues-.patch
+0023-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
+0024-Make-log-files-readable-to-group-adm-if-present.patch
+0025-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
+0026-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
+0027-Show-compile-command-lines.patch
+0028-Set-the-default-for-SyncOnClose-to-Yes.patch
+0029-Set-default-job-error-policy-to-retry-job.patch
+0030-Drop-dangling-references-from-cups-lpd.man.patch
+0031-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
+0032-Build-mantohtml-with-the-build-architecture-compiler.patch
+0033-po4a-infrastructure-and-translations-for-manpages.patch
-- 
cgit v1.2.3


From 7bc218500c57734e5d883d581ce71664c0b12d14 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 8 Feb 2020 11:52:44 +0100
Subject: cups 2.3.1-6 Debian release

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index aa749a7a7..128bea11f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.1-6) unstable; urgency=medium
+
+  * Patch test suite to also ignore 'Job held' lines in error_log line
+    counting
+
+ -- Didier Raboud <odyx@debian.org>  Sat, 08 Feb 2020 11:52:44 +0100
+
 cups (2.3.1-5) unstable; urgency=medium
 
   * Move towards driverless-centered installation:
-- 
cgit v1.2.3


From 6d21a759cf33024c7feab62529be52a6eee5bbff Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://github.com/apple/cups/issues/4299
Patch-Name: manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From e4566106cfe038e842b1017b43c204eded0d3a64 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: https://github.com/apple/cups/issues/2935
Bug-Debian: https://bugs.debian.org/410171
Patch-Name install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From b2ad2b2984b5237ce67b8ac95ae99fe3f6f291f0 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://github.com/apple/cups/issues/4348
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From a0016bd0d5704a2c970def6eda4346db08817a32 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Mon, 17 Feb 2020 09:05:58 +0100
Subject: Fix conversion of PPD InputSlot choice names

When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
... in the InputSlot option CUPS translates these names to double-dashed IPP
attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
when passing a job to the printer with the IPP backend, making the printer
ignore the tray choice, and also when answering a get-printer-attributes IPP
request from a client. This happens when in the PPD a dash is followed by a
digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
names generally never have double-dashes and also no dashes in the beginning or
the end of the name, I have modified the pwg_unppdize_name() function
appropriately.

Bug: https://github.com/apple/cups/issues/5740
Bug-Debian: https://bugs.debian.org/949315
---
 cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 5965e382b..6609f53e5 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 {
   char	*ptr,				/* Pointer into name buffer */
 	*end;				/* End of name buffer */
+  int   nodash = 1;                     /* Next char in IPP name cannot be a
+                                           dash (first char or after a dash) */
 
 
   if (_cups_islower(*ppd))
@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
     const char *ppdptr;			/* Pointer into PPD keyword */
 
     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
+      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
+	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
+	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
         break;
 
     if (!*ppdptr)
@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 
   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
   {
-    if (_cups_isalnum(*ppd) || *ppd == '-')
+    if (_cups_isalnum(*ppd))
+    {
       *ptr++ = (char)tolower(*ppd & 255);
-    else if (strchr(dashchars, *ppd))
-      *ptr++ = '-';
+      nodash = 0;
+    }
+    else if (*ppd == '-' || strchr(dashchars, *ppd))
+    {
+      if (nodash == 0)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
     else
+    {
       *ptr++ = *ppd;
+      nodash = 0;
+    }
 
-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
-	_cups_isupper(ppd[1]) && ptr < end)
-      *ptr++ = '-';
-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
-      *ptr++ = '-';
+    if (nodash == 0)
+    {
+      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+	  _cups_isupper(ppd[1]) && ptr < end)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
   }
 
+  /* Remove trailing dashes */
+  while (ptr > name && *(ptr - 1) == '-')
+    ptr --;
+
   *ptr = '\0';
 }
-- 
cgit v1.2.3


From f420223d3f187b3473d9f24016d598fa7e04c856 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From faeb071f78520ea4a27242b604fca9a7f396675d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Patch-Name: tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From e771305d1e6017648e16f7e3d4e2758c2b735063 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 79bf35743de090c3c8354e147986a9d4cfa41623 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 88ad4f9881b718ef955c308d11645b2a64381b5a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 8e4b1fd30ac2327d01d131d06ddcb948529d1cfb Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 8 Feb 2020 11:49:07 +0100
Subject: Tests: ignore 'job held' message

Origin: vendor
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..dfa7f6a5c 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+       $GREP -v 'Job held by' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 6727317dedc207e85f110d9550a215b57d92bcd0 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: https://bugs.debian.org/662996
Patch-Name: test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From dbd96d5d33a12014caed94c74f0fdd641933176e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: https://bugs.debian.org/670878
Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index dfa7f6a5c..173fc86a7 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From f60c3667c747190dd676e5b44ef776db26d38a4b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From 73ec5d05af6f2a0e799a530d78090dfcc47256c3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 173fc86a7..88bafb1a6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From 7a928ef944e72c966b7824f6274ed80da2965ce2 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 88bafb1a6..d9b398575 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From 2ea30b95a6a1d07dec20be30d780c2baeb1e33f0 Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: Tests: Do not test pdftourf

 Revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream
Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index d9b398575..bc332fc61 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From 1fe7a975ac6e89fb6bd891ae4ae3a4a70d19d606 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug-Debian: https://bugs.debian.org/640124
Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 1ad23441886dad407eb0c6e7e3c1f6f6e52d5628 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 80690397d..2fff84b60 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From d6f971d6200bd5b7b658f179a17630a3582d8320 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://github.com/apple/cups/issues/3552
Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From c9eccf0ab057ea7a4c8456b546a9f65f9e493260 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 2fff84b60..a729475a3 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 2a2de890ca547ab4350f0af0a7416431ed546bbd Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: https://github.com/apple/cups/issues/2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From ff27146143d6db28738cae717a35b2498d66092a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From 2ca655f7cb8a44b235dff6f838a7f82c05ca916d Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 7de9a11f305d65930de1940643e8037c9b40d520 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From f9cbedaee31ea3af8cedec50f67bd682f827075e Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From 0ebeb0aff7c39890ed5e3b45f315626bda232fbe Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From ea9e22b7bc80c763597844c042fbbfa26222598c Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 32b17f61375416e4e6ddcf122c5762e026ad3273 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From 0e12d01cb03f3a052af2450e86f6ffdfd449e73a Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 0b7844e84f948e92763e825a4aaaf0811b0d22f8 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job"

It it is less confusing and a better default on most machines.
Amend documentation accordingly.

Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From 25af278b27ab17a0ac2a09bc0c2f1be15d17327b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: https://bugs.debian.org/570157
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 6dc40c9259c23f0fd624bb4eda9db6b59f8a48a6 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 1c777a974e0f80a813f2ba9aa91a13df8ba10f70 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 23abe870e..04ac4ff50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From a590c6dff9ad58da379aa62af8a785da8cffa172 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 3a7c1925502190a03322e4e020cf018c839db5ef Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 17 Feb 2020 09:11:49 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...-hyphen-used-as-minus-sign-manpage-errors.patch | 571 +++++++++++++++++++++
 ...0002-Install-root-backends-world-readable.patch |  66 +++
 ...s-with-multiple-files-or-multiple-formats.patch |  27 +
 ...-conversion-of-PPD-InputSlot-choice-names.patch |  99 ++++
 ...sts-Ignore-warnings-from-colord-and-Avahi.patch |  28 +
 ...ignore-usb-dnssd-backend-unexpected-exits.patch |  31 ++
 .../0007-Tests-ignore-loadFile-failures.patch      |  25 +
 ...e-errors-triggered-on-ipv6-deprived-hosts.patch |  24 +
 ...re-the-failure-to-write-uncompressed-data.patch |  24 +
 .../0010-Tests-ignore-job-held-message.patch       |  21 +
 ...t-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch |  24 +
 ...sure-that-all-scheduled-jobs-are-finished.patch |  28 +
 ...-LC_-environment-variables-when-testing-n.patch |  31 ++
 ...27.0.0.1-instead-of-localhost-to-help-pbu.patch |  64 +++
 ...-LC_ALL-C-environment-variable-when-grepp.patch |  24 +
 .../patches/0016-Tests-Do-not-test-pdftourf.patch  |  68 +++
 ...d.conf.default-from-SERVERROOT-to-DATADIR.patch |  62 +++
 ...pport-Apple-AirPrint-printing-from-iPhone.patch |  91 ++++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  48 ++
 ...e-stamps-in-conffiles-to-avoid-ever-chang.patch |  67 +++
 ...t-write-VCS-tags-into-installed-conffiles.patch |  29 ++
 ...systemd-service-file-from-org.cups.cups.-.patch |  59 +++
 ...host-names-for-broadcasting-print-queues-.patch |  25 +
 ...s-the-recommended-comments-of-the-NickNam.patch |  39 ++
 ...og-files-readable-to-group-adm-if-present.patch |  60 +++
 ...CUPS-own-log-rotating-as-the-system-alrea.patch |  25 +
 ...t-mess-with-the-permissions-of-cupsd.conf.patch |  26 +
 .../patches/0028-Show-compile-command-lines.patch  |  23 +
 ...29-Set-the-default-for-SyncOnClose-to-Yes.patch |  64 +++
 ...Set-default-job-error-policy-to-retry-job.patch |  73 +++
 ...rop-dangling-references-from-cups-lpd.man.patch |  24 +
 ...chitecture-in-cups-config-to-make-it-arch.patch |  49 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 ...rastructure-and-translations-for-manpages.patch | 342 ++++++++++++
 debian/patches/series                              |  34 ++
 35 files changed, 2405 insertions(+)
 create mode 100644 debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
 create mode 100644 debian/patches/0002-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
 create mode 100644 debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
 create mode 100644 debian/patches/0005-Tests-Ignore-warnings-from-colord-and-Avahi.patch
 create mode 100644 debian/patches/0006-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
 create mode 100644 debian/patches/0007-Tests-ignore-loadFile-failures.patch
 create mode 100644 debian/patches/0008-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
 create mode 100644 debian/patches/0009-Tests-ignore-the-failure-to-write-uncompressed-data.patch
 create mode 100644 debian/patches/0010-Tests-ignore-job-held-message.patch
 create mode 100644 debian/patches/0011-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
 create mode 100644 debian/patches/0012-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
 create mode 100644 debian/patches/0013-Tests-Force-LC_-environment-variables-when-testing-n.patch
 create mode 100644 debian/patches/0014-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
 create mode 100644 debian/patches/0015-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
 create mode 100644 debian/patches/0016-Tests-Do-not-test-pdftourf.patch
 create mode 100644 debian/patches/0017-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
 create mode 100644 debian/patches/0018-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
 create mode 100644 debian/patches/0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0020-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
 create mode 100644 debian/patches/0021-Do-not-write-VCS-tags-into-installed-conffiles.patch
 create mode 100644 debian/patches/0022-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
 create mode 100644 debian/patches/0023-Do-not-use-host-names-for-broadcasting-print-queues-.patch
 create mode 100644 debian/patches/0024-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
 create mode 100644 debian/patches/0025-Make-log-files-readable-to-group-adm-if-present.patch
 create mode 100644 debian/patches/0026-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
 create mode 100644 debian/patches/0027-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
 create mode 100644 debian/patches/0028-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0029-Set-the-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/0030-Set-default-job-error-policy-to-retry-job.patch
 create mode 100644 debian/patches/0031-Drop-dangling-references-from-cups-lpd.man.patch
 create mode 100644 debian/patches/0032-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
 create mode 100644 debian/patches/0033-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/0034-po4a-infrastructure-and-translations-for-manpages.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
new file mode 100644
index 000000000..ce9c33b51
--- /dev/null
+++ b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
@@ -0,0 +1,571 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://github.com/apple/cups/issues/4299
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/0002-Install-root-backends-world-readable.patch b/debian/patches/0002-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..def3900f7
--- /dev/null
+++ b/debian/patches/0002-Install-root-backends-world-readable.patch
@@ -0,0 +1,66 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: https://github.com/apple/cups/issues/2935
+Bug-Debian: https://bugs.debian.org/410171
+Patch-Name install-root-backends-world-readable.patch
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
new file mode 100644
index 000000000..07da4d2f7
--- /dev/null
+++ b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
@@ -0,0 +1,27 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://github.com/apple/cups/issues/4348
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
new file mode 100644
index 000000000..bc4db9fc9
--- /dev/null
+++ b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
@@ -0,0 +1,99 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Mon, 17 Feb 2020 09:05:58 +0100
+Subject: Fix conversion of PPD InputSlot choice names
+
+When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
+... in the InputSlot option CUPS translates these names to double-dashed IPP
+attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
+when passing a job to the printer with the IPP backend, making the printer
+ignore the tray choice, and also when answering a get-printer-attributes IPP
+request from a client. This happens when in the PPD a dash is followed by a
+digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
+whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
+names generally never have double-dashes and also no dashes in the beginning or
+the end of the name, I have modified the pwg_unppdize_name() function
+appropriately.
+
+Bug: https://github.com/apple/cups/issues/5740
+Bug-Debian: https://bugs.debian.org/949315
+---
+ cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 38 insertions(+), 9 deletions(-)
+
+diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
+index 5965e38..6609f53 100644
+--- a/cups/ppd-cache.c
++++ b/cups/ppd-cache.c
+@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ {
+   char	*ptr,				/* Pointer into name buffer */
+ 	*end;				/* End of name buffer */
++  int   nodash = 1;                     /* Next char in IPP name cannot be a
++                                           dash (first char or after a dash) */
+ 
+ 
+   if (_cups_islower(*ppd))
+@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+     const char *ppdptr;			/* Pointer into PPD keyword */
+ 
+     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
+-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
++      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
++	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
++	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
+         break;
+ 
+     if (!*ppdptr)
+@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ 
+   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
+   {
+-    if (_cups_isalnum(*ppd) || *ppd == '-')
++    if (_cups_isalnum(*ppd))
++    {
+       *ptr++ = (char)tolower(*ppd & 255);
+-    else if (strchr(dashchars, *ppd))
+-      *ptr++ = '-';
++      nodash = 0;
++    }
++    else if (*ppd == '-' || strchr(dashchars, *ppd))
++    {
++      if (nodash == 0)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+     else
++    {
+       *ptr++ = *ppd;
++      nodash = 0;
++    }
+ 
+-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+-	_cups_isupper(ppd[1]) && ptr < end)
+-      *ptr++ = '-';
+-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+-      *ptr++ = '-';
++    if (nodash == 0)
++    {
++      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
++	  _cups_isupper(ppd[1]) && ptr < end)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+   }
+ 
++  /* Remove trailing dashes */
++  while (ptr > name && *(ptr - 1) == '-')
++    ptr --;
++
+   *ptr = '\0';
+ }
diff --git a/debian/patches/0005-Tests-Ignore-warnings-from-colord-and-Avahi.patch b/debian/patches/0005-Tests-Ignore-warnings-from-colord-and-Avahi.patch
new file mode 100644
index 000000000..a0c55e473
--- /dev/null
+++ b/debian/patches/0005-Tests-Ignore-warnings-from-colord-and-Avahi.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/0006-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch b/debian/patches/0006-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
new file mode 100644
index 000000000..21d84e708
--- /dev/null
+++ b/debian/patches/0006-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/0007-Tests-ignore-loadFile-failures.patch b/debian/patches/0007-Tests-ignore-loadFile-failures.patch
new file mode 100644
index 000000000..6f592d7e7
--- /dev/null
+++ b/debian/patches/0007-Tests-ignore-loadFile-failures.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0008-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch b/debian/patches/0008-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
new file mode 100644
index 000000000..8088de19f
--- /dev/null
+++ b/debian/patches/0008-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0009-Tests-ignore-the-failure-to-write-uncompressed-data.patch b/debian/patches/0009-Tests-ignore-the-failure-to-write-uncompressed-data.patch
new file mode 100644
index 000000000..708c28dcf
--- /dev/null
+++ b/debian/patches/0009-Tests-ignore-the-failure-to-write-uncompressed-data.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0010-Tests-ignore-job-held-message.patch b/debian/patches/0010-Tests-ignore-job-held-message.patch
new file mode 100644
index 000000000..11f87ab7c
--- /dev/null
+++ b/debian/patches/0010-Tests-ignore-job-held-message.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 8 Feb 2020 11:49:07 +0100
+Subject: Tests: ignore 'job held' message
+
+Origin: vendor
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..dfa7f6a 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
++       $GREP -v 'Job held by' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0011-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch b/debian/patches/0011-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
new file mode 100644
index 000000000..931feb799
--- /dev/null
+++ b/debian/patches/0011-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: https://bugs.debian.org/662996
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/0012-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch b/debian/patches/0012-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
new file mode 100644
index 000000000..a677af5fb
--- /dev/null
+++ b/debian/patches/0012-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: https://bugs.debian.org/670878
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index dfa7f6a..173fc86 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
diff --git a/debian/patches/0013-Tests-Force-LC_-environment-variables-when-testing-n.patch b/debian/patches/0013-Tests-Force-LC_-environment-variables-when-testing-n.patch
new file mode 100644
index 000000000..9c3a8463e
--- /dev/null
+++ b/debian/patches/0013-Tests-Force-LC_-environment-variables-when-testing-n.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/0014-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch b/debian/patches/0014-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
new file mode 100644
index 000000000..56e9a0710
--- /dev/null
+++ b/debian/patches/0014-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 173fc86..88bafb1 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/0015-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch b/debian/patches/0015-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
new file mode 100644
index 000000000..1ba692070
--- /dev/null
+++ b/debian/patches/0015-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 88bafb1..d9b3985 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/0016-Tests-Do-not-test-pdftourf.patch b/debian/patches/0016-Tests-Do-not-test-pdftourf.patch
new file mode 100644
index 000000000..08c1c73ec
--- /dev/null
+++ b/debian/patches/0016-Tests-Do-not-test-pdftourf.patch
@@ -0,0 +1,68 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: Tests: Do not test pdftourf
+
+ Revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index d9b3985..bc332fc 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/0017-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch b/debian/patches/0017-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
new file mode 100644
index 000000000..c785eb981
--- /dev/null
+++ b/debian/patches/0017-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug-Debian: https://bugs.debian.org/640124
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0018-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch b/debian/patches/0018-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
new file mode 100644
index 000000000..768134e37
--- /dev/null
+++ b/debian/patches/0018-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
@@ -0,0 +1,91 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 8069039..2fff84b 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..4389e274d
--- /dev/null
+++ b/debian/patches/0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,48 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://github.com/apple/cups/issues/3552
+Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0020-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch b/debian/patches/0020-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
new file mode 100644
index 000000000..1498c2db5
--- /dev/null
+++ b/debian/patches/0020-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
@@ -0,0 +1,67 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 2fff84b..a729475 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/0021-Do-not-write-VCS-tags-into-installed-conffiles.patch b/debian/patches/0021-Do-not-write-VCS-tags-into-installed-conffiles.patch
new file mode 100644
index 000000000..8ffa2bcb0
--- /dev/null
+++ b/debian/patches/0021-Do-not-write-VCS-tags-into-installed-conffiles.patch
@@ -0,0 +1,29 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: https://github.com/apple/cups/issues/2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/0022-Rename-the-systemd-service-file-from-org.cups.cups.-.patch b/debian/patches/0022-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/0022-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/0023-Do-not-use-host-names-for-broadcasting-print-queues-.patch b/debian/patches/0023-Do-not-use-host-names-for-broadcasting-print-queues-.patch
new file mode 100644
index 000000000..ef052d5ef
--- /dev/null
+++ b/debian/patches/0023-Do-not-use-host-names-for-broadcasting-print-queues-.patch
@@ -0,0 +1,25 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/0024-CUPS-removes-the-recommended-comments-of-the-NickNam.patch b/debian/patches/0024-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
new file mode 100644
index 000000000..f30429b4c
--- /dev/null
+++ b/debian/patches/0024-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
@@ -0,0 +1,39 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0025-Make-log-files-readable-to-group-adm-if-present.patch b/debian/patches/0025-Make-log-files-readable-to-group-adm-if-present.patch
new file mode 100644
index 000000000..7b93a2da1
--- /dev/null
+++ b/debian/patches/0025-Make-log-files-readable-to-group-adm-if-present.patch
@@ -0,0 +1,60 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/0026-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch b/debian/patches/0026-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
new file mode 100644
index 000000000..c5e7fb2a1
--- /dev/null
+++ b/debian/patches/0026-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/0027-Do-not-mess-with-the-permissions-of-cupsd.conf.patch b/debian/patches/0027-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
new file mode 100644
index 000000000..2057a4856
--- /dev/null
+++ b/debian/patches/0027-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
@@ -0,0 +1,26 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0028-Show-compile-command-lines.patch b/debian/patches/0028-Show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/0028-Show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/0029-Set-the-default-for-SyncOnClose-to-Yes.patch b/debian/patches/0029-Set-the-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..40b9bbdfe
--- /dev/null
+++ b/debian/patches/0029-Set-the-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,64 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/0030-Set-default-job-error-policy-to-retry-job.patch b/debian/patches/0030-Set-default-job-error-policy-to-retry-job.patch
new file mode 100644
index 000000000..80abeb3a8
--- /dev/null
+++ b/debian/patches/0030-Set-default-job-error-policy-to-retry-job.patch
@@ -0,0 +1,73 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job"
+
+It it is less confusing and a better default on most machines.
+Amend documentation accordingly.
+
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/0031-Drop-dangling-references-from-cups-lpd.man.patch b/debian/patches/0031-Drop-dangling-references-from-cups-lpd.man.patch
new file mode 100644
index 000000000..0853e7056
--- /dev/null
+++ b/debian/patches/0031-Drop-dangling-references-from-cups-lpd.man.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: https://bugs.debian.org/570157
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/0032-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch b/debian/patches/0032-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
new file mode 100644
index 000000000..142ad8a04
--- /dev/null
+++ b/debian/patches/0032-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0033-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0033-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..5bb407023
--- /dev/null
+++ b/debian/patches/0033-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+Bug-Debian: https://bugs.debian.org/837936
+Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 23abe87..04ac4ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0034-po4a-infrastructure-and-translations-for-manpages.patch b/debian/patches/0034-po4a-infrastructure-and-translations-for-manpages.patch
new file mode 100644
index 000000000..ecfe58203
--- /dev/null
+++ b/debian/patches/0034-po4a-infrastructure-and-translations-for-manpages.patch
@@ -0,0 +1,342 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..80f1dafb9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,34 @@
+0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
+0002-Install-root-backends-world-readable.patch
+0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
+0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
+0005-Tests-Ignore-warnings-from-colord-and-Avahi.patch
+0006-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
+0007-Tests-ignore-loadFile-failures.patch
+0008-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
+0009-Tests-ignore-the-failure-to-write-uncompressed-data.patch
+0010-Tests-ignore-job-held-message.patch
+0011-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
+0012-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
+0013-Tests-Force-LC_-environment-variables-when-testing-n.patch
+0014-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
+0015-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
+0016-Tests-Do-not-test-pdftourf.patch
+0017-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
+0018-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
+0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0020-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
+0021-Do-not-write-VCS-tags-into-installed-conffiles.patch
+0022-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
+0023-Do-not-use-host-names-for-broadcasting-print-queues-.patch
+0024-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
+0025-Make-log-files-readable-to-group-adm-if-present.patch
+0026-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
+0027-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
+0028-Show-compile-command-lines.patch
+0029-Set-the-default-for-SyncOnClose-to-Yes.patch
+0030-Set-default-job-error-policy-to-retry-job.patch
+0031-Drop-dangling-references-from-cups-lpd.man.patch
+0032-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
+0033-Build-mantohtml-with-the-build-architecture-compiler.patch
+0034-po4a-infrastructure-and-translations-for-manpages.patch
-- 
cgit v1.2.3


From e1f33000411e0434e06c6f15e7e0920b7180927a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 17 Feb 2020 09:18:55 +0100
Subject: Wrap long lines in changelog entries: 1.5.3-1, 1.5.2-1, 1.5.0-15,
 1.5.0-11, 1.5.0-9, 1.5.0-2, 1.5.0-1, 1.4.5-3, 1.3.11-1, 1.3.10-5, 1.3.8-6,
 1.3.5-1, 1.3.4-3, 1.1.23-8, 1.1.20candidate6-5, 1.1.6-0.1.

Fixes: lintian: debian-changelog-line-too-long
See-also: https://lintian.debian.org/tags/debian-changelog-line-too-long.html
---
 debian/changelog | 99 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 128bea11f..f9ec53fbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3018,8 +3018,7 @@ cups (1.5.3-1) unstable; urgency=low
   * debian/patches/cups-avahi.patch: Manually regenerated to adapt to upstream
     changes.
   * debian/patches/ppd-poll-with-client-conf.patch,
-    debian/patches/colord-support.patch,
-    debian/patches/airprint-support.patch,
+    debian/patches/colord-support.patch, debian/patches/airprint-support.patch,
     debian/patches/no-conffile-timestamp.patch,
     debian/patches/drop_unnecessary_dependencies.patch,
     debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch,
@@ -3251,8 +3250,7 @@ cups (1.5.2-1) unstable; urgency=low
     Manually regenerated to adapt to upstream changes.
   * debian/patches/pidfile.patch,
     debian/patches/rootbackends-worldreadable.patch,
-    debian/patches/colord-support.patch,
-    debian/patches/airprint-support.patch,
+    debian/patches/colord-support.patch, debian/patches/airprint-support.patch,
     debian/patches/no-conffile-timestamp.patch,
     debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch,
     debian/patches/do-not-broadcast-with-hostnames.patch,
@@ -3260,14 +3258,13 @@ cups (1.5.2-1) unstable; urgency=low
     debian/patches/confdirperms.patch,
     debian/patches/show-compile-command-lines.patch,
     debian/patches/log-debug-history-nearly-unlimited.patch,
-    debian/patches/dnssd-reg-array-linear-search.patch:
-    Refreshed using quilt.
+    debian/patches/dnssd-reg-array-linear-search.patch: Refreshed using quilt.
   * debian/patches/fix-supply-level-computation-for-percent-supply-unit.patch,
     debian/patches/fix-supply-levels-for-enumerated-prtmarkersupplieslevel.patch,
-    debian/patches/fix-status-reports-when-supply-levels-grow.patch:
-    The printer supply levels reported via SNMP, according to the printer MIB
-    were not correctly interpreted (LP: #925086, CUPS STR #4016, thanks to
-    Peter Hurley, peter at hurleysoftware dot com, for the patches).
+    debian/patches/fix-status-reports-when-supply-levels-grow.patch: The printer
+    supply levels reported via SNMP, according to the printer MIB were not
+    correctly interpreted (LP: #925086, CUPS STR #4016, thanks to Peter Hurley,
+    peter at hurleysoftware dot com, for the patches).
   * debian/patches/add-status-reports-for-full-waste-trays-and-cleaner-unit-eol.patch:
     Added status reports for waste tray status and cleaner unit end-of-life
     (LP: #925086, CUPS STR #4017, thanks to Peter Hurley, peter at
@@ -3353,10 +3350,10 @@ cups (1.5.0-15) unstable; urgency=low
   * debian/patches/series,
     debian/patches/usb-backend-gracefully-fail-on-more-cases-of-bad-device-id.patch,
     debian/patches/usb-backend-libusb-1.0.patch,
-    debian/patches/usb-backend-skip-set-configuration-set-interface.patch:
-    Added references to the upstream bugs under which these patches got
-    submitted upstream as header comments. Also moved the entries in the series
-    file to the section of patches submitted upstream.
+    debian/patches/usb-backend-skip-set-configuration-set-interface.patch: Added
+    references to the upstream bugs under which these patches got submitted
+    upstream as header comments. Also moved the entries in the series file to
+    the section of patches submitted upstream.
   * debian/patches/usb-backend-libusb-1.0.patch: Updated the patch to correctly
     generate the make/model string if no device ID could be found. Before,
     arbitrary memory content was picked up, not only giving an ugly listing
@@ -3483,8 +3480,8 @@ cups (1.5.0-9) unstable; urgency=low
   * debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch:
     CUPS adds the option setting "AP_D_InputSlot=" to every job. This overrides
     the InputSlot option and so the InputSlot setting and even the default
-    setting for InputSlot in the PPD get never used, rendering InputSlot
-    useless (LP: #872527).
+    setting for InputSlot in the PPD get never used, rendering InputSlot useless
+    (LP: #872527).
   * debian/patches/cups-avahi.patch: Updated patch from upstream (Red Hat)
     to fix crashes of the CUPS daemon when using the timeout function call
     functionality (LP: #860691, LP: #860498).
@@ -3660,11 +3657,10 @@ cups (1.5.0-1) experimental; urgency=low
     debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch,
     debian/patches/configure-default-browse-protocols.patch,
     debian/patches/logfiles_adm_readable.patch,
-    debian/patches/confdirperms.patch,
-    debian/patches/printer-filtering.patch,
+    debian/patches/confdirperms.patch, debian/patches/printer-filtering.patch,
     debian/patches/show-compile-command-lines.patch,
-    debian/patches/log-debug-history-nearly-unlimited.patch:
-    Refreshed using quilt.
+    debian/patches/log-debug-history-nearly-unlimited.patch: Refreshed using
+    quilt.
   * debian/patches/default-ripcache-size-auto.patch: Dropped, as once,
     Ghostscript 9.04 is ignoring the cache size value as it crashes easily
     otherwise (Ghostscript upstream bug #691586) and second, CUPS defaults to
@@ -4030,12 +4026,11 @@ cups (1.4.5-3) unstable; urgency=low
     debian/local/filters/pdf-filters/addtocups
     debian/local/filters/pdf-filters/conf/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd,
     debian/local/filters/pdf-filters/config-scripts/cups-pdf-filters.m4,
-    debian/local/filters/pdf-filters/removefromcups: Upstream changes of
-    the PDF filter add-on package:
-     o Added the Poppler-based pdftoraster filter. This filter is much faster
-       than the Ghostscript-based filter (LP: #668800).
-     o Cleaned up the sample PPD file for pdftoijs (does not go into the
-       Debian/Ubuntu package of CUPS).
+    debian/local/filters/pdf-filters/removefromcups: Upstream changes of the PDF
+    filter add-on package:  o Added the Poppler-based pdftoraster filter. This
+    filter is much faster    than the Ghostscript-based filter (LP: #668800).  o
+    Cleaned up the sample PPD file for pdftoijs (does not go into the
+    Debian/Ubuntu package of CUPS).
   * debian/rules: Rename the newly added Poppler-based pdftoraster filter
     to pdftoraster-poppler to not conflict with Ghostscript's pdftoraster
     and lower its cost factor so that it is prioritized against Ghostscript's
@@ -5041,9 +5036,9 @@ cups (1.3.11-1) unstable; urgency=low
     the PDF output with a blank line. This made some filters misbehave.
   * debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.dpatch:
     Make CUPS read the number of copies out of Windows print jobs reliably by
-    also considering lines like "%%BeginNonPPDFeature: NumCopies 2". Thanks
-    to Dan Sheridan from Adelard (djs at adelard dot com) for this improvement
-    of the patch.
+    also considering lines like "%%BeginNonPPDFeature: NumCopies 2". Thanks to
+    Dan Sheridan from Adelard (djs at adelard dot com) for this improvement of
+    the patch.
 
   [ Stéphane Graber ]
   * Add printer-filtering.dpatch: Add support for printer filtering.
@@ -5062,12 +5057,12 @@ cups (1.3.11-1) unstable; urgency=low
 cups (1.3.10-5) unstable; urgency=low
 
   * debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.dpatch:
-    Make CUPS reading all option settings in PostScript print jobs and add
-    the option settings to the filter command line before starting the filter
-    chain. This fixes the problem that in the PDF printing workflow (where
-    incoming PostScript gets converted to PDF by pstopdf) option settings
-    embedded in the incoming PostScript code do not get obeyed. Especially
-    the options of jobs from Windows clients get ignored.
+    Make CUPS reading all option settings in PostScript print jobs and add the
+    option settings to the filter command line before starting the filter chain.
+    This fixes the problem that in the PDF printing workflow (where incoming
+    PostScript gets converted to PDF by pstopdf) option settings embedded in the
+    incoming PostScript code do not get obeyed. Especially the options of jobs
+    from Windows clients get ignored.
   * debian/filters/pstopdf: Do not let Ghostscript generate multiple copies
     of the job if the filter command line from CUPS already supplies the
     correct number of copies.
@@ -5664,8 +5659,8 @@ cups (1.3.8-6) experimental; urgency=low
     debian/local/filters/pdf-filters/addtocups,
     debian/local/filters/pdf-filters/config-scripts/cups-pdf-filters.m4,
     debian/local/filters/pdf-filters/removefromcups,
-    debian/local/filters/pdf-filters/README,
-    debian/control, debian/rules: Added pdftoijs filter.
+    debian/local/filters/pdf-filters/README, debian/control, debian/rules: Added
+    pdftoijs filter.
 
   [ Johan Kiviniemi ]
   * debian/filters/pstopdf:
@@ -6104,10 +6099,10 @@ cupsys (1.3.5-1) unstable; urgency=high
     via symlink attack. (CVE-2007-6358, closes: #456960)
 
   [ Till Kamppeter ]
-  * debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch :
-    Fix a regression in upstream code that has removed the network interface
-    update poll (CUPS STR #2631, LP: #177075). Thanks to Hugues Fournier
-    (hugues dot fournier at gmail dot com) for the patch.
+  * debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch
+    : Fix a regression in upstream code that has removed the network interface
+    update poll (CUPS STR #2631, LP: #177075). Thanks to Hugues Fournier (hugues
+    dot fournier at gmail dot com) for the patch.
 
  -- Kenshi Muto <kmuto@debian.org>  Wed, 19 Dec 2007 17:07:05 +0900
 
@@ -6127,8 +6122,8 @@ cupsys (1.3.4-3) unstable; urgency=high
 
   [ Till Kamppeter ]
   * debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch:
-    CUPS stopped broadcasting on a HUP signal when using a fixed
-    BrowseAddress (CUPS STR #2618, Ubuntu LP: #173470).
+    CUPS stopped broadcasting on a HUP signal when using a fixed BrowseAddress
+    (CUPS STR #2618, Ubuntu LP: #173470).
   * debian/local/backends/dnssd: Updated dnssd to support Mac OS X servers
     which broadcast their print queues only via DNS-SD and require clients
     to create raw IPP queues pointing to the server's queues manually.
@@ -7222,17 +7217,19 @@ cupsys (1.1.23-8) unstable; urgency=medium
   * Included Spanish man pages.
   * 43_filtercost: Applied a patch for wrong computation of cost
     (closes: #304205)
-  * Applied many part of ubuntu patch, http://people.ubuntu.com/~scott/patches/cupsys/cupsys_1.1.23-7ubuntu1.patch.
+  * Applied many part of ubuntu patch,
+    http://people.ubuntu.com/~scott/patches/cupsys/cupsys_1.1.23-7ubuntu1.patch.
     (User 'cupsys' feature and Browsing feature aren't applied at this time.
-     They are post-Sarge things)
+    They are post-Sarge things)
   * Applied improved dvifilter patch. (Although you need to modify
     /etc/cups/mime.convs and some other files to use it) (closes: #198100)
   * Provides /var/run/cups/cupsd.pid. (closes: #301804)
   * Added cupsys documentation to doc-base structure. (closes: #171396, #304333)
   * Included filter for PostScript from Windows PostScript driver, created by
-    Matt Swift <swift@alum.mit.edu>.
-    If you want to use, put /usr/share/doc/cupsys/examples/filters/samba-postscript.* to /etc/cups,
-    and put /usr/share/doc/cupsys/examples/filters/samba-ps-to-ps to /usr/lib/cups/filter. (closes: #246577)
+    Matt Swift <swift@alum.mit.edu>. If you want to use, put
+    /usr/share/doc/cupsys/examples/filters/samba-postscript.* to /etc/cups, and
+    put /usr/share/doc/cupsys/examples/filters/samba-ps-to-ps to
+    /usr/lib/cups/filter. (closes: #246577)
 
  -- Kenshi Muto <kmuto@debian.org>  Wed, 16 Mar 2005 10:01:57 +0900
 
@@ -7722,7 +7719,8 @@ cupsys (1.1.20candidate6-6) unstable; urgency=low
 
 cupsys (1.1.20candidate6-5) unstable; urgency=high
 
-  * I'm sorry but openssl license conflicts. I use libgnutls (closes: Bug#220902).
+  * I'm sorry but openssl license conflicts. I use libgnutls (closes:
+    Bug#220902).
   * Add euc-jp text.
 
  -- Kenshi Muto <kmuto@debian.org>  Sat, 15 Nov 2003 23:55:06 +0900
@@ -8277,7 +8275,8 @@ cupsys (1.1.6-0.1) unstable; urgency=low
 
   * Non-maintainer upload
   * New upstream release, fixing multiple vulnerabilities (Closes: Bug#88932)
-  * cupsys removes only its own configuration files upon purge (Closes: Bug#84341)
+  * cupsys removes only its own configuration files upon purge (Closes:
+    Bug#84341)
   * fixed postinst, so it does not fail when the lpadmin group
   already exists (Closes: Bug#84443)
   * added a helpful URL to README.Debian (Closes: Bug#63590)
-- 
cgit v1.2.3


From be49b35b2b99e1b74e229c95db0e4c5d2fcb43c7 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 17 Feb 2020 09:18:57 +0100
Subject: Set upstream metadata fields: Bug-Database, Repository,
 Repository-Browse.

---
 debian/upstream/metadata | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index d81ac7b77..7087296d2 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,2 +1,4 @@
+Bug-Database: https://github.com/apple/cups/issues
 Bug-Submit: https://github.com/apple/cups/issues
-Repository: https://github.com/apple/cups
+Repository: https://github.com/apple/cups.git
+Repository-Browse: https://github.com/apple/cups
-- 
cgit v1.2.3


From 22bf8dfcb6901623598ede92f17b312d13e010c3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 17 Feb 2020 09:19:56 +0100
Subject: cups 2.3.1-7 Debian release

---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f9ec53fbf..93fd13283 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cups (2.3.1-7) unstable; urgency=medium
+
+  * Add patch to fix conversion of PPD InputSlot choice names; this should fix
+    printers ignoring the paper tray selection (Issue: #5740, Closes: #949315)
+  * lintian-brush:
+    - Set upstream metadata fields: Bug-Database, Repository, Repository-Browse
+    - Rewrap some d/changelog entries
+
+ -- Didier Raboud <odyx@debian.org>  Mon, 17 Feb 2020 09:19:56 +0100
+
 cups (2.3.1-6) unstable; urgency=medium
 
   * Patch test suite to also ignore 'Job held' lines in error_log line
-- 
cgit v1.2.3


From c32c4fa4ba937084de36d00087e8e9f253b12422 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://github.com/apple/cups/issues/4299
Patch-Name: manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From 98b27d4f2b88313db6901cc9dd806eecb6d78c8b Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: https://github.com/apple/cups/issues/2935
Bug-Debian: https://bugs.debian.org/410171
Patch-Name install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From 9b6e65a84e8ed04bb8b27e4fec448bc930a8079b Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://github.com/apple/cups/issues/4348
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From f064b17e479fbace2064db6de3a294b56156e3f2 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Mon, 17 Feb 2020 09:05:58 +0100
Subject: Fix conversion of PPD InputSlot choice names

When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
... in the InputSlot option CUPS translates these names to double-dashed IPP
attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
when passing a job to the printer with the IPP backend, making the printer
ignore the tray choice, and also when answering a get-printer-attributes IPP
request from a client. This happens when in the PPD a dash is followed by a
digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
names generally never have double-dashes and also no dashes in the beginning or
the end of the name, I have modified the pwg_unppdize_name() function
appropriately.

Bug: https://github.com/apple/cups/issues/5740
Bug-Debian: https://bugs.debian.org/949315
---
 cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 5965e382b..6609f53e5 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 {
   char	*ptr,				/* Pointer into name buffer */
 	*end;				/* End of name buffer */
+  int   nodash = 1;                     /* Next char in IPP name cannot be a
+                                           dash (first char or after a dash) */
 
 
   if (_cups_islower(*ppd))
@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
     const char *ppdptr;			/* Pointer into PPD keyword */
 
     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
+      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
+	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
+	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
         break;
 
     if (!*ppdptr)
@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 
   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
   {
-    if (_cups_isalnum(*ppd) || *ppd == '-')
+    if (_cups_isalnum(*ppd))
+    {
       *ptr++ = (char)tolower(*ppd & 255);
-    else if (strchr(dashchars, *ppd))
-      *ptr++ = '-';
+      nodash = 0;
+    }
+    else if (*ppd == '-' || strchr(dashchars, *ppd))
+    {
+      if (nodash == 0)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
     else
+    {
       *ptr++ = *ppd;
+      nodash = 0;
+    }
 
-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
-	_cups_isupper(ppd[1]) && ptr < end)
-      *ptr++ = '-';
-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
-      *ptr++ = '-';
+    if (nodash == 0)
+    {
+      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+	  _cups_isupper(ppd[1]) && ptr < end)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
   }
 
+  /* Remove trailing dashes */
+  while (ptr > name && *(ptr - 1) == '-')
+    ptr --;
+
   *ptr = '\0';
 }
-- 
cgit v1.2.3


From 644ca41c072d0596f5e30994df846b68b6d81410 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Sat, 22 Feb 2020 14:28:58 +0100
Subject: Fix scheduler cupsd.conf load

When running it without arguments it is supposed to read the local CUPS's
cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
with a lot of HTML inside and this is due to the fact that when loading the
file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
admin.cgi program which returns the admin front page of the web admin
interface. cupsctl then tries to interpret that as the config file and displays
garbage. Even worse is if you run cupsctl with command line argument (one of
the five switches or a key=value pair) to change a setting. It seems to load
cupsd.conf again and gets again the HTML code of the web interface page.
cupsctl tries to interpret this again, producing garbage, adds the
user-supplied setting and writes all this back into cupsd.conf. Then it tries
to restart the scheduler which fails due to the broken config file.
The problem is that in the file scheduler/client.conf, in the function
get_file() the URI from the client is at first checked whether it begins with
"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
that the check for "/admin/conf/cupsd.conf" comes and is never reached.
I have changed the order now appropriately and this way cupsctl works again.
Note that the problem only occurs if the web interface is active and the
cupsctl command is issued by a non-root user.
This is a regression caused by issue #5652.

Bug: https://github.com/apple/cups/issues/5744
---
 scheduler/client.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/scheduler/client.c b/scheduler/client.c
index c2ee8f12a..54b841bc1 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
+  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+  {
+    strlcpy(filename, ConfigurationFile, len);
+
+    perm_check = 0;
+  }
+  else if (!strncmp(con->uri, "/admin/log/", 11))
+  {
+    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+      strlcpy(filename, AccessLog, len);
+    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+      strlcpy(filename, ErrorLog, len);
+    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+      strlcpy(filename, PageLog, len);
+    else
+      return (NULL);
+
+    perm_check = 0;
+  }
   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
   {
    /*
@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
-  {
-    strlcpy(filename, ConfigurationFile, len);
-
-    perm_check = 0;
-  }
-  else if (!strncmp(con->uri, "/admin/log/", 11))
-  {
-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
-      strlcpy(filename, AccessLog, len);
-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
-      strlcpy(filename, ErrorLog, len);
-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
-      strlcpy(filename, PageLog, len);
-    else
-      return (NULL);
-
-    perm_check = 0;
-  }
   else if (con->language)
   {
     snprintf(language, sizeof(language), "/%s", con->language->language);
-- 
cgit v1.2.3


From 9b690af6e1cffc9d63610942901bc9d715dfa10f Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From 8fffffc1eee985fd34a267c449d4e61d3732860c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Patch-Name: tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From 30e18457a8a52fc10894c4d47d24dcf7585994eb Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From bb059978bdbde5e0e570436d4da451eb92b2a09d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From c90d1740b4502ef0f6626b70867bdf10c60eb1e6 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 828a455971da6d8d087dd0f59ba1fed8a44e59a0 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 8 Feb 2020 11:49:07 +0100
Subject: Tests: ignore 'job held' message

Origin: vendor
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..dfa7f6a5c 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+       $GREP -v 'Job held by' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 2ae701497b29e2530b87f6ea4e6ea15e2124d534 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: https://bugs.debian.org/662996
Patch-Name: test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 6094e5e5426ee0351426cbfeb476bfc47e6d45bd Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: https://bugs.debian.org/670878
Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index dfa7f6a5c..173fc86a7 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From 0020a7547034aa236c564c3541028f6f483cf36a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From 07392d8e8e60a2aaed597e80c94b2d6287639cf9 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 173fc86a7..88bafb1a6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From 3c8208a0c501ce9f186cf98ad656577b02d9de12 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 88bafb1a6..d9b398575 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From db77d6e0e5a92b9a6dee440eebf02c9ab36ac7c1 Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: Tests: Do not test pdftourf

 Revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream
Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index d9b398575..bc332fc61 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From 3dda0408b453ace37b3adb62c1000707714aa67b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug-Debian: https://bugs.debian.org/640124
Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 4aa5708b6b8f0e1455475d6726b068b91545ac1f Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 80690397d..2fff84b60 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 1586d9ce78bbf747548dd4758f694df3fed991da Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://github.com/apple/cups/issues/3552
Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From e389c5f929d44ff6eeca5b14787f5fc746c99bd4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 2fff84b60..a729475a3 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 9c12daf357771878e78b12a1bfc33620c02573d8 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: https://github.com/apple/cups/issues/2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From 403997ee21df560d8e277c4ccf2a324346eb9873 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From 4e41c0c1331f22cbca23433ebbb2bc4d10ad53dc Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 0f7754ada3fa9ef0b6c0c55d4c98b22f057bfd42 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 65763265fe99516476208941265fce2f065556f2 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From 9245cefecbdf80060fc4477049b4db016326380e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From b567b418310fe0fce44f357fb08ea195e882ea99 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From b89a235bc8a6c5bfabcc3d6a4f95f913d0dbef84 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From 2f8377db1f995723b709d7df01feb3886f3d01d6 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From ba04bd801b3f7a456f63b52e123337f2fdd6cc4a Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job"

It it is less confusing and a better default on most machines.
Amend documentation accordingly.

Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From 5b01e38a2de02f556741daa4f3c4aeb99de49485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: https://bugs.debian.org/570157
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 796905c086a077988d80f619a8d66c92808a4b63 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 32416adc217496d622830f9e0e936c0a63569546 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 23abe870e..04ac4ff50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 708fc357c679db7432087ada363ab670783587fc Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From c718f8ff969329f091d3d51ada01448a3db96f4e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 22 Feb 2020 14:33:16 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...-hyphen-used-as-minus-sign-manpage-errors.patch | 571 +++++++++++++++++++++
 ...0002-Install-root-backends-world-readable.patch |  66 +++
 ...s-with-multiple-files-or-multiple-formats.patch |  27 +
 ...-conversion-of-PPD-InputSlot-choice-names.patch |  99 ++++
 .../0005-Fix-scheduler-cupsd.conf-load.patch       |  86 ++++
 ...sts-Ignore-warnings-from-colord-and-Avahi.patch |  28 +
 ...ignore-usb-dnssd-backend-unexpected-exits.patch |  31 ++
 .../0008-Tests-ignore-loadFile-failures.patch      |  25 +
 ...e-errors-triggered-on-ipv6-deprived-hosts.patch |  24 +
 ...re-the-failure-to-write-uncompressed-data.patch |  24 +
 .../0011-Tests-ignore-job-held-message.patch       |  21 +
 ...t-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch |  24 +
 ...sure-that-all-scheduled-jobs-are-finished.patch |  28 +
 ...-LC_-environment-variables-when-testing-n.patch |  31 ++
 ...27.0.0.1-instead-of-localhost-to-help-pbu.patch |  64 +++
 ...-LC_ALL-C-environment-variable-when-grepp.patch |  24 +
 .../patches/0017-Tests-Do-not-test-pdftourf.patch  |  68 +++
 ...d.conf.default-from-SERVERROOT-to-DATADIR.patch |  62 +++
 ...pport-Apple-AirPrint-printing-from-iPhone.patch |  91 ++++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  48 ++
 ...e-stamps-in-conffiles-to-avoid-ever-chang.patch |  67 +++
 ...t-write-VCS-tags-into-installed-conffiles.patch |  29 ++
 ...systemd-service-file-from-org.cups.cups.-.patch |  59 +++
 ...host-names-for-broadcasting-print-queues-.patch |  25 +
 ...s-the-recommended-comments-of-the-NickNam.patch |  39 ++
 ...og-files-readable-to-group-adm-if-present.patch |  60 +++
 ...CUPS-own-log-rotating-as-the-system-alrea.patch |  25 +
 ...t-mess-with-the-permissions-of-cupsd.conf.patch |  26 +
 .../patches/0029-Show-compile-command-lines.patch  |  23 +
 ...30-Set-the-default-for-SyncOnClose-to-Yes.patch |  64 +++
 ...Set-default-job-error-policy-to-retry-job.patch |  73 +++
 ...rop-dangling-references-from-cups-lpd.man.patch |  24 +
 ...chitecture-in-cups-config-to-make-it-arch.patch |  49 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 ...rastructure-and-translations-for-manpages.patch | 342 ++++++++++++
 debian/patches/series                              |  35 ++
 36 files changed, 2492 insertions(+)
 create mode 100644 debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
 create mode 100644 debian/patches/0002-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
 create mode 100644 debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
 create mode 100644 debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
 create mode 100644 debian/patches/0006-Tests-Ignore-warnings-from-colord-and-Avahi.patch
 create mode 100644 debian/patches/0007-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
 create mode 100644 debian/patches/0008-Tests-ignore-loadFile-failures.patch
 create mode 100644 debian/patches/0009-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
 create mode 100644 debian/patches/0010-Tests-ignore-the-failure-to-write-uncompressed-data.patch
 create mode 100644 debian/patches/0011-Tests-ignore-job-held-message.patch
 create mode 100644 debian/patches/0012-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
 create mode 100644 debian/patches/0013-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
 create mode 100644 debian/patches/0014-Tests-Force-LC_-environment-variables-when-testing-n.patch
 create mode 100644 debian/patches/0015-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
 create mode 100644 debian/patches/0016-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
 create mode 100644 debian/patches/0017-Tests-Do-not-test-pdftourf.patch
 create mode 100644 debian/patches/0018-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
 create mode 100644 debian/patches/0019-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
 create mode 100644 debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0021-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
 create mode 100644 debian/patches/0022-Do-not-write-VCS-tags-into-installed-conffiles.patch
 create mode 100644 debian/patches/0023-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
 create mode 100644 debian/patches/0024-Do-not-use-host-names-for-broadcasting-print-queues-.patch
 create mode 100644 debian/patches/0025-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
 create mode 100644 debian/patches/0026-Make-log-files-readable-to-group-adm-if-present.patch
 create mode 100644 debian/patches/0027-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
 create mode 100644 debian/patches/0028-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
 create mode 100644 debian/patches/0029-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0030-Set-the-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/0031-Set-default-job-error-policy-to-retry-job.patch
 create mode 100644 debian/patches/0032-Drop-dangling-references-from-cups-lpd.man.patch
 create mode 100644 debian/patches/0033-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
 create mode 100644 debian/patches/0034-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/0035-po4a-infrastructure-and-translations-for-manpages.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
new file mode 100644
index 000000000..ce9c33b51
--- /dev/null
+++ b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
@@ -0,0 +1,571 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://github.com/apple/cups/issues/4299
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/0002-Install-root-backends-world-readable.patch b/debian/patches/0002-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..def3900f7
--- /dev/null
+++ b/debian/patches/0002-Install-root-backends-world-readable.patch
@@ -0,0 +1,66 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: https://github.com/apple/cups/issues/2935
+Bug-Debian: https://bugs.debian.org/410171
+Patch-Name install-root-backends-world-readable.patch
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
new file mode 100644
index 000000000..07da4d2f7
--- /dev/null
+++ b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
@@ -0,0 +1,27 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://github.com/apple/cups/issues/4348
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
new file mode 100644
index 000000000..bc4db9fc9
--- /dev/null
+++ b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
@@ -0,0 +1,99 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Mon, 17 Feb 2020 09:05:58 +0100
+Subject: Fix conversion of PPD InputSlot choice names
+
+When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
+... in the InputSlot option CUPS translates these names to double-dashed IPP
+attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
+when passing a job to the printer with the IPP backend, making the printer
+ignore the tray choice, and also when answering a get-printer-attributes IPP
+request from a client. This happens when in the PPD a dash is followed by a
+digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
+whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
+names generally never have double-dashes and also no dashes in the beginning or
+the end of the name, I have modified the pwg_unppdize_name() function
+appropriately.
+
+Bug: https://github.com/apple/cups/issues/5740
+Bug-Debian: https://bugs.debian.org/949315
+---
+ cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 38 insertions(+), 9 deletions(-)
+
+diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
+index 5965e38..6609f53 100644
+--- a/cups/ppd-cache.c
++++ b/cups/ppd-cache.c
+@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ {
+   char	*ptr,				/* Pointer into name buffer */
+ 	*end;				/* End of name buffer */
++  int   nodash = 1;                     /* Next char in IPP name cannot be a
++                                           dash (first char or after a dash) */
+ 
+ 
+   if (_cups_islower(*ppd))
+@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+     const char *ppdptr;			/* Pointer into PPD keyword */
+ 
+     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
+-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
++      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
++	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
++	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
+         break;
+ 
+     if (!*ppdptr)
+@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ 
+   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
+   {
+-    if (_cups_isalnum(*ppd) || *ppd == '-')
++    if (_cups_isalnum(*ppd))
++    {
+       *ptr++ = (char)tolower(*ppd & 255);
+-    else if (strchr(dashchars, *ppd))
+-      *ptr++ = '-';
++      nodash = 0;
++    }
++    else if (*ppd == '-' || strchr(dashchars, *ppd))
++    {
++      if (nodash == 0)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+     else
++    {
+       *ptr++ = *ppd;
++      nodash = 0;
++    }
+ 
+-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+-	_cups_isupper(ppd[1]) && ptr < end)
+-      *ptr++ = '-';
+-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+-      *ptr++ = '-';
++    if (nodash == 0)
++    {
++      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
++	  _cups_isupper(ppd[1]) && ptr < end)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+   }
+ 
++  /* Remove trailing dashes */
++  while (ptr > name && *(ptr - 1) == '-')
++    ptr --;
++
+   *ptr = '\0';
+ }
diff --git a/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch b/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
new file mode 100644
index 000000000..d43601064
--- /dev/null
+++ b/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
@@ -0,0 +1,86 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Sat, 22 Feb 2020 14:28:58 +0100
+Subject: Fix scheduler cupsd.conf load
+
+When running it without arguments it is supposed to read the local CUPS's
+cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
+with a lot of HTML inside and this is due to the fact that when loading the
+file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
+admin.cgi program which returns the admin front page of the web admin
+interface. cupsctl then tries to interpret that as the config file and displays
+garbage. Even worse is if you run cupsctl with command line argument (one of
+the five switches or a key=value pair) to change a setting. It seems to load
+cupsd.conf again and gets again the HTML code of the web interface page.
+cupsctl tries to interpret this again, producing garbage, adds the
+user-supplied setting and writes all this back into cupsd.conf. Then it tries
+to restart the scheduler which fails due to the broken config file.
+The problem is that in the file scheduler/client.conf, in the function
+get_file() the URI from the client is at first checked whether it begins with
+"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
+that the check for "/admin/conf/cupsd.conf" comes and is never reached.
+I have changed the order now appropriately and this way cupsctl works again.
+Note that the problem only occurs if the web interface is active and the
+cupsctl command is issued by a non-root user.
+This is a regression caused by issue #5652.
+
+Bug: https://github.com/apple/cups/issues/5744
+---
+ scheduler/client.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/scheduler/client.c b/scheduler/client.c
+index c2ee8f1..54b841b 100644
+--- a/scheduler/client.c
++++ b/scheduler/client.c
+@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
++  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
++  {
++    strlcpy(filename, ConfigurationFile, len);
++
++    perm_check = 0;
++  }
++  else if (!strncmp(con->uri, "/admin/log/", 11))
++  {
++    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
++      strlcpy(filename, AccessLog, len);
++    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
++      strlcpy(filename, ErrorLog, len);
++    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
++      strlcpy(filename, PageLog, len);
++    else
++      return (NULL);
++
++    perm_check = 0;
++  }
+   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
+   {
+    /*
+@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
+-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+-  {
+-    strlcpy(filename, ConfigurationFile, len);
+-
+-    perm_check = 0;
+-  }
+-  else if (!strncmp(con->uri, "/admin/log/", 11))
+-  {
+-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+-      strlcpy(filename, AccessLog, len);
+-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+-      strlcpy(filename, ErrorLog, len);
+-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+-      strlcpy(filename, PageLog, len);
+-    else
+-      return (NULL);
+-
+-    perm_check = 0;
+-  }
+   else if (con->language)
+   {
+     snprintf(language, sizeof(language), "/%s", con->language->language);
diff --git a/debian/patches/0006-Tests-Ignore-warnings-from-colord-and-Avahi.patch b/debian/patches/0006-Tests-Ignore-warnings-from-colord-and-Avahi.patch
new file mode 100644
index 000000000..a0c55e473
--- /dev/null
+++ b/debian/patches/0006-Tests-Ignore-warnings-from-colord-and-Avahi.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/0007-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch b/debian/patches/0007-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
new file mode 100644
index 000000000..21d84e708
--- /dev/null
+++ b/debian/patches/0007-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/0008-Tests-ignore-loadFile-failures.patch b/debian/patches/0008-Tests-ignore-loadFile-failures.patch
new file mode 100644
index 000000000..6f592d7e7
--- /dev/null
+++ b/debian/patches/0008-Tests-ignore-loadFile-failures.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0009-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch b/debian/patches/0009-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
new file mode 100644
index 000000000..8088de19f
--- /dev/null
+++ b/debian/patches/0009-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0010-Tests-ignore-the-failure-to-write-uncompressed-data.patch b/debian/patches/0010-Tests-ignore-the-failure-to-write-uncompressed-data.patch
new file mode 100644
index 000000000..708c28dcf
--- /dev/null
+++ b/debian/patches/0010-Tests-ignore-the-failure-to-write-uncompressed-data.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0011-Tests-ignore-job-held-message.patch b/debian/patches/0011-Tests-ignore-job-held-message.patch
new file mode 100644
index 000000000..11f87ab7c
--- /dev/null
+++ b/debian/patches/0011-Tests-ignore-job-held-message.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 8 Feb 2020 11:49:07 +0100
+Subject: Tests: ignore 'job held' message
+
+Origin: vendor
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..dfa7f6a 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
++       $GREP -v 'Job held by' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0012-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch b/debian/patches/0012-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
new file mode 100644
index 000000000..931feb799
--- /dev/null
+++ b/debian/patches/0012-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: https://bugs.debian.org/662996
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/0013-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch b/debian/patches/0013-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
new file mode 100644
index 000000000..a677af5fb
--- /dev/null
+++ b/debian/patches/0013-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: https://bugs.debian.org/670878
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index dfa7f6a..173fc86 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
diff --git a/debian/patches/0014-Tests-Force-LC_-environment-variables-when-testing-n.patch b/debian/patches/0014-Tests-Force-LC_-environment-variables-when-testing-n.patch
new file mode 100644
index 000000000..9c3a8463e
--- /dev/null
+++ b/debian/patches/0014-Tests-Force-LC_-environment-variables-when-testing-n.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/0015-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch b/debian/patches/0015-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
new file mode 100644
index 000000000..56e9a0710
--- /dev/null
+++ b/debian/patches/0015-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 173fc86..88bafb1 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/0016-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch b/debian/patches/0016-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
new file mode 100644
index 000000000..1ba692070
--- /dev/null
+++ b/debian/patches/0016-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 88bafb1..d9b3985 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/0017-Tests-Do-not-test-pdftourf.patch b/debian/patches/0017-Tests-Do-not-test-pdftourf.patch
new file mode 100644
index 000000000..08c1c73ec
--- /dev/null
+++ b/debian/patches/0017-Tests-Do-not-test-pdftourf.patch
@@ -0,0 +1,68 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: Tests: Do not test pdftourf
+
+ Revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index d9b3985..bc332fc 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/0018-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch b/debian/patches/0018-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
new file mode 100644
index 000000000..c785eb981
--- /dev/null
+++ b/debian/patches/0018-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug-Debian: https://bugs.debian.org/640124
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0019-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch b/debian/patches/0019-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
new file mode 100644
index 000000000..768134e37
--- /dev/null
+++ b/debian/patches/0019-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
@@ -0,0 +1,91 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 8069039..2fff84b 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..4389e274d
--- /dev/null
+++ b/debian/patches/0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,48 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://github.com/apple/cups/issues/3552
+Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0021-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch b/debian/patches/0021-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
new file mode 100644
index 000000000..1498c2db5
--- /dev/null
+++ b/debian/patches/0021-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
@@ -0,0 +1,67 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 2fff84b..a729475 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/0022-Do-not-write-VCS-tags-into-installed-conffiles.patch b/debian/patches/0022-Do-not-write-VCS-tags-into-installed-conffiles.patch
new file mode 100644
index 000000000..8ffa2bcb0
--- /dev/null
+++ b/debian/patches/0022-Do-not-write-VCS-tags-into-installed-conffiles.patch
@@ -0,0 +1,29 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: https://github.com/apple/cups/issues/2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/0023-Rename-the-systemd-service-file-from-org.cups.cups.-.patch b/debian/patches/0023-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/0023-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/0024-Do-not-use-host-names-for-broadcasting-print-queues-.patch b/debian/patches/0024-Do-not-use-host-names-for-broadcasting-print-queues-.patch
new file mode 100644
index 000000000..ef052d5ef
--- /dev/null
+++ b/debian/patches/0024-Do-not-use-host-names-for-broadcasting-print-queues-.patch
@@ -0,0 +1,25 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/0025-CUPS-removes-the-recommended-comments-of-the-NickNam.patch b/debian/patches/0025-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
new file mode 100644
index 000000000..f30429b4c
--- /dev/null
+++ b/debian/patches/0025-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
@@ -0,0 +1,39 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0026-Make-log-files-readable-to-group-adm-if-present.patch b/debian/patches/0026-Make-log-files-readable-to-group-adm-if-present.patch
new file mode 100644
index 000000000..7b93a2da1
--- /dev/null
+++ b/debian/patches/0026-Make-log-files-readable-to-group-adm-if-present.patch
@@ -0,0 +1,60 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/0027-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch b/debian/patches/0027-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
new file mode 100644
index 000000000..c5e7fb2a1
--- /dev/null
+++ b/debian/patches/0027-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/0028-Do-not-mess-with-the-permissions-of-cupsd.conf.patch b/debian/patches/0028-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
new file mode 100644
index 000000000..2057a4856
--- /dev/null
+++ b/debian/patches/0028-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
@@ -0,0 +1,26 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0029-Show-compile-command-lines.patch b/debian/patches/0029-Show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/0029-Show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/0030-Set-the-default-for-SyncOnClose-to-Yes.patch b/debian/patches/0030-Set-the-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..40b9bbdfe
--- /dev/null
+++ b/debian/patches/0030-Set-the-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,64 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/0031-Set-default-job-error-policy-to-retry-job.patch b/debian/patches/0031-Set-default-job-error-policy-to-retry-job.patch
new file mode 100644
index 000000000..80abeb3a8
--- /dev/null
+++ b/debian/patches/0031-Set-default-job-error-policy-to-retry-job.patch
@@ -0,0 +1,73 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job"
+
+It it is less confusing and a better default on most machines.
+Amend documentation accordingly.
+
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/0032-Drop-dangling-references-from-cups-lpd.man.patch b/debian/patches/0032-Drop-dangling-references-from-cups-lpd.man.patch
new file mode 100644
index 000000000..0853e7056
--- /dev/null
+++ b/debian/patches/0032-Drop-dangling-references-from-cups-lpd.man.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: https://bugs.debian.org/570157
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/0033-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch b/debian/patches/0033-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
new file mode 100644
index 000000000..142ad8a04
--- /dev/null
+++ b/debian/patches/0033-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0034-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0034-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..5bb407023
--- /dev/null
+++ b/debian/patches/0034-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+Bug-Debian: https://bugs.debian.org/837936
+Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 23abe87..04ac4ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0035-po4a-infrastructure-and-translations-for-manpages.patch b/debian/patches/0035-po4a-infrastructure-and-translations-for-manpages.patch
new file mode 100644
index 000000000..ecfe58203
--- /dev/null
+++ b/debian/patches/0035-po4a-infrastructure-and-translations-for-manpages.patch
@@ -0,0 +1,342 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..236ccc261
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,35 @@
+0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
+0002-Install-root-backends-world-readable.patch
+0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
+0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
+0005-Fix-scheduler-cupsd.conf-load.patch
+0006-Tests-Ignore-warnings-from-colord-and-Avahi.patch
+0007-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
+0008-Tests-ignore-loadFile-failures.patch
+0009-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
+0010-Tests-ignore-the-failure-to-write-uncompressed-data.patch
+0011-Tests-ignore-job-held-message.patch
+0012-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
+0013-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
+0014-Tests-Force-LC_-environment-variables-when-testing-n.patch
+0015-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
+0016-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
+0017-Tests-Do-not-test-pdftourf.patch
+0018-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
+0019-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
+0020-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0021-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
+0022-Do-not-write-VCS-tags-into-installed-conffiles.patch
+0023-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
+0024-Do-not-use-host-names-for-broadcasting-print-queues-.patch
+0025-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
+0026-Make-log-files-readable-to-group-adm-if-present.patch
+0027-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
+0028-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
+0029-Show-compile-command-lines.patch
+0030-Set-the-default-for-SyncOnClose-to-Yes.patch
+0031-Set-default-job-error-policy-to-retry-job.patch
+0032-Drop-dangling-references-from-cups-lpd.man.patch
+0033-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
+0034-Build-mantohtml-with-the-build-architecture-compiler.patch
+0035-po4a-infrastructure-and-translations-for-manpages.patch
-- 
cgit v1.2.3


From 54bdd3fcf00b4141fb68d54f78f7a3fc560b7fc6 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 22 Feb 2020 14:34:48 +0100
Subject: cups 2.3.1-8 Debian release

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 93fd13283..8c99346cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cups (2.3.1-8) unstable; urgency=medium
+
+  * Add patch to fix cupsctl when loading cupsd.conf (Issue: #5744)
+
+ -- Didier Raboud <odyx@debian.org>  Sat, 22 Feb 2020 14:34:48 +0100
+
 cups (2.3.1-7) unstable; urgency=medium
 
   * Add patch to fix conversion of PPD InputSlot choice names; this should fix
-- 
cgit v1.2.3


From 36d8755d47b3fcdc3e9e32ac727349a82c503cc5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 22 Feb 2020 16:47:45 +0100
Subject: CI Tests: Ensure the resulting files are non-empty

---
 debian/tests/utils/test-drivers | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/tests/utils/test-drivers b/debian/tests/utils/test-drivers
index 1185a263d..c8a997274 100755
--- a/debian/tests/utils/test-drivers
+++ b/debian/tests/utils/test-drivers
@@ -29,13 +29,19 @@ cleanup() {
     # Delete it
     echo -n " - Interrupted (or finished), delete test printer:"
     rm -f ${DUMMY_PRINTER_STDERR_FILE}
+    rm -f ${DUMMY_PRINTER_PRINT_FILE}
     /usr/sbin/lpadmin -x $DUMMY_PRINTER_NAME 2>/dev/null || :
     echo " done."
 }
 
 trap cleanup EXIT INT
 
+# Configure the running CUPS server to set FileDevice to Yes
+sed -e 's/^#.*FileDevice.*$/FileDevice Yes/g' -i /etc/cups/cups-files.conf
+service cups restart
+
 DUMMY_PRINTER_STDERR_FILE=`mktemp`
+DUMMY_PRINTER_PRINT_FILE=`mktemp`
 
 for driver in $DRIVERS_LIST; do
 
@@ -43,7 +49,7 @@ for driver in $DRIVERS_LIST; do
 
     echo -n " - Create test printer:"
     # Create dummy printer
-    /usr/sbin/lpadmin -p $DUMMY_PRINTER_NAME -E -m $driver -v file:///dev/null 2> $DUMMY_PRINTER_STDERR_FILE
+    /usr/sbin/lpadmin -p $DUMMY_PRINTER_NAME -E -m $driver -v file://${DUMMY_PRINTER_PRINT_FILE} 2> $DUMMY_PRINTER_STDERR_FILE
     echo " done."
     # Tell stderr whether some unknown lines have been seen
     # Filter out the deprecation messages
@@ -54,7 +60,7 @@ for driver in $DRIVERS_LIST; do
         1>&2
     
     for file in $(find $PDFS_PATH -name '*.pdf') ; do
-        echo -n " - Print test job with $file: "
+        echo -n " - Print $file: "
         # Print the default testprint to it, get request id
         rid=$(/usr/bin/lp -d $DUMMY_PRINTER_NAME $file | sed -e 's/^.*request id is \(.*\) (.*)$/\1/g')
     
@@ -74,6 +80,12 @@ for driver in $DRIVERS_LIST; do
             /bin/sleep 1s
             echo -n "."
         done
+        # Make sure the resulting data is not empty
+        if [ ! -s "${DUMMY_PRINTER_PRINT_FILE}" ]; then
+            echo " Filter succeeded but resulting file is empty; aborting!"
+            false
+        fi
+        rm -f ${DUMMY_PRINTER_PRINT_FILE}
         echo " done."
     done
 
-- 
cgit v1.2.3


From 0cd0b19b49a8f50ea97062e78e3037ab1a8d234a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 22 Feb 2020 17:19:46 +0100
Subject: cups 2.3.1-9 Debian release

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8c99346cf..4114a2150 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.1-9) unstable; urgency=medium
+
+  * CI Tests: Ensure the job files are non-empty; should detect more
+    regressions
+
+ -- Didier Raboud <odyx@debian.org>  Sat, 22 Feb 2020 17:19:46 +0100
+
 cups (2.3.1-8) unstable; urgency=medium
 
   * Add patch to fix cupsctl when loading cupsd.conf (Issue: #5744)
-- 
cgit v1.2.3


From e4226f55a66718381680bed151a9cede1c1481a5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://github.com/apple/cups/issues/4299
Patch-Name: manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From ec34581b7111b128fdce7e9f301d694731971710 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: https://github.com/apple/cups/issues/2935
Bug-Debian: https://bugs.debian.org/410171
Patch-Name install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From 4a9d02df4783027ca7f01d73025af443624f0033 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://github.com/apple/cups/issues/4348
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From efe1f700acd36a563d875069c56c1c31a3d5fbeb Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Mon, 17 Feb 2020 09:05:58 +0100
Subject: Fix conversion of PPD InputSlot choice names

When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
... in the InputSlot option CUPS translates these names to double-dashed IPP
attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
when passing a job to the printer with the IPP backend, making the printer
ignore the tray choice, and also when answering a get-printer-attributes IPP
request from a client. This happens when in the PPD a dash is followed by a
digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
names generally never have double-dashes and also no dashes in the beginning or
the end of the name, I have modified the pwg_unppdize_name() function
appropriately.

Bug: https://github.com/apple/cups/issues/5740
Bug-Debian: https://bugs.debian.org/949315
---
 cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 5965e382b..6609f53e5 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 {
   char	*ptr,				/* Pointer into name buffer */
 	*end;				/* End of name buffer */
+  int   nodash = 1;                     /* Next char in IPP name cannot be a
+                                           dash (first char or after a dash) */
 
 
   if (_cups_islower(*ppd))
@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
     const char *ppdptr;			/* Pointer into PPD keyword */
 
     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
+      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
+	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
+	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
         break;
 
     if (!*ppdptr)
@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 
   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
   {
-    if (_cups_isalnum(*ppd) || *ppd == '-')
+    if (_cups_isalnum(*ppd))
+    {
       *ptr++ = (char)tolower(*ppd & 255);
-    else if (strchr(dashchars, *ppd))
-      *ptr++ = '-';
+      nodash = 0;
+    }
+    else if (*ppd == '-' || strchr(dashchars, *ppd))
+    {
+      if (nodash == 0)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
     else
+    {
       *ptr++ = *ppd;
+      nodash = 0;
+    }
 
-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
-	_cups_isupper(ppd[1]) && ptr < end)
-      *ptr++ = '-';
-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
-      *ptr++ = '-';
+    if (nodash == 0)
+    {
+      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+	  _cups_isupper(ppd[1]) && ptr < end)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
   }
 
+  /* Remove trailing dashes */
+  while (ptr > name && *(ptr - 1) == '-')
+    ptr --;
+
   *ptr = '\0';
 }
-- 
cgit v1.2.3


From 5b60c3f3887c8bd9a64299babf9d18d2466a5d82 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Sat, 22 Feb 2020 14:28:58 +0100
Subject: Fix scheduler cupsd.conf load

When running it without arguments it is supposed to read the local CUPS's
cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
with a lot of HTML inside and this is due to the fact that when loading the
file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
admin.cgi program which returns the admin front page of the web admin
interface. cupsctl then tries to interpret that as the config file and displays
garbage. Even worse is if you run cupsctl with command line argument (one of
the five switches or a key=value pair) to change a setting. It seems to load
cupsd.conf again and gets again the HTML code of the web interface page.
cupsctl tries to interpret this again, producing garbage, adds the
user-supplied setting and writes all this back into cupsd.conf. Then it tries
to restart the scheduler which fails due to the broken config file.
The problem is that in the file scheduler/client.conf, in the function
get_file() the URI from the client is at first checked whether it begins with
"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
that the check for "/admin/conf/cupsd.conf" comes and is never reached.
I have changed the order now appropriately and this way cupsctl works again.
Note that the problem only occurs if the web interface is active and the
cupsctl command is issued by a non-root user.
This is a regression caused by issue #5652.

Bug: https://github.com/apple/cups/issues/5744
---
 scheduler/client.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/scheduler/client.c b/scheduler/client.c
index c2ee8f12a..54b841bc1 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
+  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+  {
+    strlcpy(filename, ConfigurationFile, len);
+
+    perm_check = 0;
+  }
+  else if (!strncmp(con->uri, "/admin/log/", 11))
+  {
+    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+      strlcpy(filename, AccessLog, len);
+    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+      strlcpy(filename, ErrorLog, len);
+    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+      strlcpy(filename, PageLog, len);
+    else
+      return (NULL);
+
+    perm_check = 0;
+  }
   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
   {
    /*
@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
-  {
-    strlcpy(filename, ConfigurationFile, len);
-
-    perm_check = 0;
-  }
-  else if (!strncmp(con->uri, "/admin/log/", 11))
-  {
-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
-      strlcpy(filename, AccessLog, len);
-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
-      strlcpy(filename, ErrorLog, len);
-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
-      strlcpy(filename, PageLog, len);
-    else
-      return (NULL);
-
-    perm_check = 0;
-  }
   else if (con->language)
   {
     snprintf(language, sizeof(language), "/%s", con->language->language);
-- 
cgit v1.2.3


From 4cccb63bf34ef9398b82c3d6564c6ab74d3fdaf0 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Fri, 14 Feb 2020 16:48:49 +0100
Subject: Fix leakage of ppd

---
 ppdc/ppdc-import.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
index 04b587d7f..b4a834138 100644
--- a/ppdc/ppdc-import.cxx
+++ b/ppdc/ppdc-import.cxx
@@ -323,5 +323,8 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
     }
   }
 
+  if (ppd)
+    ppdClose(ppd);
+
   return (1);
 }
-- 
cgit v1.2.3


From 2cd019e19e24844f476a13f1fce79d32cf1a5c43 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From c271daa82ea821eaa54529d9c5e3081e66c22c9c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Patch-Name: tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From 2d82815c112d34f7047da37101b3e779b2c13602 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From c433505ccf1978008c0f3f8b0766676d6ec963fb Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 3c8bc981aa7c095ecd094e1beeb1402f3a5c039a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From b48ec4fb6fd5e0e99edc38c67bfc60b27364fe0c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 8 Feb 2020 11:49:07 +0100
Subject: Tests: ignore 'job held' message

Origin: vendor
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..dfa7f6a5c 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+       $GREP -v 'Job held by' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From e5adbc32916c1c3ec36bd45b7e005ca4e06c0883 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: https://bugs.debian.org/662996
Patch-Name: test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 2c9de84db06b7a87d5a962371e9a7e5c70c5f9ae Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: https://bugs.debian.org/670878
Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index dfa7f6a5c..173fc86a7 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From ad9c619a33779cdc3763e9433326e1fbad1fb9ce Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From b2a1658fdf52e87ffd3fb39314421280309567c7 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 173fc86a7..88bafb1a6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From d21bd0d2ab8cd98a9d1284c83df9f96ac6e9fd54 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 88bafb1a6..d9b398575 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From 450894c818bf27e4cd0559297f751a2735515139 Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: Tests: Do not test pdftourf

 Revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream
Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index d9b398575..bc332fc61 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From 91a74fd9a38b3996a0eba92e17f3bd23f40e547f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug-Debian: https://bugs.debian.org/640124
Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 4e536dd77432d85bc1fcf34a3211a4be225fd129 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 80690397d..2fff84b60 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 40056a63934c41229c1f970083434068da64d064 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://github.com/apple/cups/issues/3552
Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 7afaf6500570585bbcffa5e9ddaf5d4e15033045 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 2fff84b60..a729475a3 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 538c4212920241e032bfed97805ae2a67e17e001 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: https://github.com/apple/cups/issues/2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From 446d17726958c72409762e68392cc400a8e723e4 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From 2c107a51d125b4555be83228cef477dcd2b5f516 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 11:46:49 +0100
Subject: Add Requires=cups.socket to cups.service, to make sure they start in
 the right order

---
 scheduler/org.cups.cupsd.service.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index cd2334396..79d2c403e 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -2,6 +2,7 @@
 Description=CUPS Scheduler
 Documentation=man:cupsd(8)
 After=sssd.service
+Requires=cups.socket
 
 [Service]
 ExecStart=@sbindir@/cupsd -l
-- 
cgit v1.2.3


From 808c55c27275a29d65faf8bba37e55157207d974 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 6d70dc3fddf314afb474c036d5ca7396a17be4cb Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 798ac3ceecf9283f60e120e3fb1b7ac8abaa12f1 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From 182d0b700bd0ed5205780ddc7a46d96658f9d877 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From c550916a03bee74ee2a17807d33071c42fc020fa Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 5cf70dbaca450beb68e1c643bd45e08a04dfa34e Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From 9a651bb2d82461b8696a28c421e8a2a77616103b Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 28c4d62bfef0d539d8d426df71cefc78b3025652 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job"

It it is less confusing and a better default on most machines.
Amend documentation accordingly.

Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From 2b473ae06624369f39960d8b30695abbbf67049b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: https://bugs.debian.org/570157
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 3e6b2a861e0b4f9be6f08c8223b59f36f5164aca Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 369da1a9e28feb65aca83cffb44fe78bc1df23bc Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 23abe870e..04ac4ff50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 890c26909d4cf46611b81e56712abb64ea4ee4fd Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 9495f729eaf7aa740a23135520cbf2b199a0dd08 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 11:47:38 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...-hyphen-used-as-minus-sign-manpage-errors.patch | 571 +++++++++++++++++++++
 ...0002-Install-root-backends-world-readable.patch |  66 +++
 ...s-with-multiple-files-or-multiple-formats.patch |  27 +
 ...-conversion-of-PPD-InputSlot-choice-names.patch |  99 ++++
 .../0005-Fix-scheduler-cupsd.conf-load.patch       |  86 ++++
 debian/patches/0006-Fix-leakage-of-ppd.patch       |  21 +
 ...sts-Ignore-warnings-from-colord-and-Avahi.patch |  28 +
 ...ignore-usb-dnssd-backend-unexpected-exits.patch |  31 ++
 .../0009-Tests-ignore-loadFile-failures.patch      |  25 +
 ...e-errors-triggered-on-ipv6-deprived-hosts.patch |  24 +
 ...re-the-failure-to-write-uncompressed-data.patch |  24 +
 .../0012-Tests-ignore-job-held-message.patch       |  21 +
 ...t-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch |  24 +
 ...sure-that-all-scheduled-jobs-are-finished.patch |  28 +
 ...-LC_-environment-variables-when-testing-n.patch |  31 ++
 ...27.0.0.1-instead-of-localhost-to-help-pbu.patch |  64 +++
 ...-LC_ALL-C-environment-variable-when-grepp.patch |  24 +
 .../patches/0018-Tests-Do-not-test-pdftourf.patch  |  68 +++
 ...d.conf.default-from-SERVERROOT-to-DATADIR.patch |  62 +++
 ...pport-Apple-AirPrint-printing-from-iPhone.patch |  91 ++++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  48 ++
 ...e-stamps-in-conffiles-to-avoid-ever-chang.patch |  67 +++
 ...t-write-VCS-tags-into-installed-conffiles.patch |  29 ++
 ...systemd-service-file-from-org.cups.cups.-.patch |  59 +++
 ...s-cups.socket-to-cups.service-to-make-sur.patch |  21 +
 ...host-names-for-broadcasting-print-queues-.patch |  25 +
 ...s-the-recommended-comments-of-the-NickNam.patch |  39 ++
 ...og-files-readable-to-group-adm-if-present.patch |  60 +++
 ...CUPS-own-log-rotating-as-the-system-alrea.patch |  25 +
 ...t-mess-with-the-permissions-of-cupsd.conf.patch |  26 +
 .../patches/0031-Show-compile-command-lines.patch  |  23 +
 ...32-Set-the-default-for-SyncOnClose-to-Yes.patch |  64 +++
 ...Set-default-job-error-policy-to-retry-job.patch |  73 +++
 ...rop-dangling-references-from-cups-lpd.man.patch |  24 +
 ...chitecture-in-cups-config-to-make-it-arch.patch |  49 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 ...rastructure-and-translations-for-manpages.patch | 342 ++++++++++++
 debian/patches/series                              |  37 ++
 38 files changed, 2536 insertions(+)
 create mode 100644 debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
 create mode 100644 debian/patches/0002-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
 create mode 100644 debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
 create mode 100644 debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
 create mode 100644 debian/patches/0006-Fix-leakage-of-ppd.patch
 create mode 100644 debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
 create mode 100644 debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
 create mode 100644 debian/patches/0009-Tests-ignore-loadFile-failures.patch
 create mode 100644 debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
 create mode 100644 debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
 create mode 100644 debian/patches/0012-Tests-ignore-job-held-message.patch
 create mode 100644 debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
 create mode 100644 debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
 create mode 100644 debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
 create mode 100644 debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
 create mode 100644 debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
 create mode 100644 debian/patches/0018-Tests-Do-not-test-pdftourf.patch
 create mode 100644 debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
 create mode 100644 debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
 create mode 100644 debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
 create mode 100644 debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
 create mode 100644 debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
 create mode 100644 debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
 create mode 100644 debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
 create mode 100644 debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
 create mode 100644 debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
 create mode 100644 debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
 create mode 100644 debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
 create mode 100644 debian/patches/0031-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
 create mode 100644 debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
 create mode 100644 debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
 create mode 100644 debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
new file mode 100644
index 000000000..ce9c33b51
--- /dev/null
+++ b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
@@ -0,0 +1,571 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://github.com/apple/cups/issues/4299
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/0002-Install-root-backends-world-readable.patch b/debian/patches/0002-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..def3900f7
--- /dev/null
+++ b/debian/patches/0002-Install-root-backends-world-readable.patch
@@ -0,0 +1,66 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: https://github.com/apple/cups/issues/2935
+Bug-Debian: https://bugs.debian.org/410171
+Patch-Name install-root-backends-world-readable.patch
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
new file mode 100644
index 000000000..07da4d2f7
--- /dev/null
+++ b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
@@ -0,0 +1,27 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://github.com/apple/cups/issues/4348
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
new file mode 100644
index 000000000..bc4db9fc9
--- /dev/null
+++ b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
@@ -0,0 +1,99 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Mon, 17 Feb 2020 09:05:58 +0100
+Subject: Fix conversion of PPD InputSlot choice names
+
+When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
+... in the InputSlot option CUPS translates these names to double-dashed IPP
+attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
+when passing a job to the printer with the IPP backend, making the printer
+ignore the tray choice, and also when answering a get-printer-attributes IPP
+request from a client. This happens when in the PPD a dash is followed by a
+digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
+whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
+names generally never have double-dashes and also no dashes in the beginning or
+the end of the name, I have modified the pwg_unppdize_name() function
+appropriately.
+
+Bug: https://github.com/apple/cups/issues/5740
+Bug-Debian: https://bugs.debian.org/949315
+---
+ cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 38 insertions(+), 9 deletions(-)
+
+diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
+index 5965e38..6609f53 100644
+--- a/cups/ppd-cache.c
++++ b/cups/ppd-cache.c
+@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ {
+   char	*ptr,				/* Pointer into name buffer */
+ 	*end;				/* End of name buffer */
++  int   nodash = 1;                     /* Next char in IPP name cannot be a
++                                           dash (first char or after a dash) */
+ 
+ 
+   if (_cups_islower(*ppd))
+@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+     const char *ppdptr;			/* Pointer into PPD keyword */
+ 
+     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
+-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
++      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
++	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
++	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
+         break;
+ 
+     if (!*ppdptr)
+@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ 
+   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
+   {
+-    if (_cups_isalnum(*ppd) || *ppd == '-')
++    if (_cups_isalnum(*ppd))
++    {
+       *ptr++ = (char)tolower(*ppd & 255);
+-    else if (strchr(dashchars, *ppd))
+-      *ptr++ = '-';
++      nodash = 0;
++    }
++    else if (*ppd == '-' || strchr(dashchars, *ppd))
++    {
++      if (nodash == 0)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+     else
++    {
+       *ptr++ = *ppd;
++      nodash = 0;
++    }
+ 
+-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+-	_cups_isupper(ppd[1]) && ptr < end)
+-      *ptr++ = '-';
+-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+-      *ptr++ = '-';
++    if (nodash == 0)
++    {
++      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
++	  _cups_isupper(ppd[1]) && ptr < end)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+   }
+ 
++  /* Remove trailing dashes */
++  while (ptr > name && *(ptr - 1) == '-')
++    ptr --;
++
+   *ptr = '\0';
+ }
diff --git a/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch b/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
new file mode 100644
index 000000000..d43601064
--- /dev/null
+++ b/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
@@ -0,0 +1,86 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Sat, 22 Feb 2020 14:28:58 +0100
+Subject: Fix scheduler cupsd.conf load
+
+When running it without arguments it is supposed to read the local CUPS's
+cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
+with a lot of HTML inside and this is due to the fact that when loading the
+file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
+admin.cgi program which returns the admin front page of the web admin
+interface. cupsctl then tries to interpret that as the config file and displays
+garbage. Even worse is if you run cupsctl with command line argument (one of
+the five switches or a key=value pair) to change a setting. It seems to load
+cupsd.conf again and gets again the HTML code of the web interface page.
+cupsctl tries to interpret this again, producing garbage, adds the
+user-supplied setting and writes all this back into cupsd.conf. Then it tries
+to restart the scheduler which fails due to the broken config file.
+The problem is that in the file scheduler/client.conf, in the function
+get_file() the URI from the client is at first checked whether it begins with
+"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
+that the check for "/admin/conf/cupsd.conf" comes and is never reached.
+I have changed the order now appropriately and this way cupsctl works again.
+Note that the problem only occurs if the web interface is active and the
+cupsctl command is issued by a non-root user.
+This is a regression caused by issue #5652.
+
+Bug: https://github.com/apple/cups/issues/5744
+---
+ scheduler/client.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/scheduler/client.c b/scheduler/client.c
+index c2ee8f1..54b841b 100644
+--- a/scheduler/client.c
++++ b/scheduler/client.c
+@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
++  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
++  {
++    strlcpy(filename, ConfigurationFile, len);
++
++    perm_check = 0;
++  }
++  else if (!strncmp(con->uri, "/admin/log/", 11))
++  {
++    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
++      strlcpy(filename, AccessLog, len);
++    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
++      strlcpy(filename, ErrorLog, len);
++    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
++      strlcpy(filename, PageLog, len);
++    else
++      return (NULL);
++
++    perm_check = 0;
++  }
+   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
+   {
+    /*
+@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
+-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+-  {
+-    strlcpy(filename, ConfigurationFile, len);
+-
+-    perm_check = 0;
+-  }
+-  else if (!strncmp(con->uri, "/admin/log/", 11))
+-  {
+-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+-      strlcpy(filename, AccessLog, len);
+-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+-      strlcpy(filename, ErrorLog, len);
+-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+-      strlcpy(filename, PageLog, len);
+-    else
+-      return (NULL);
+-
+-    perm_check = 0;
+-  }
+   else if (con->language)
+   {
+     snprintf(language, sizeof(language), "/%s", con->language->language);
diff --git a/debian/patches/0006-Fix-leakage-of-ppd.patch b/debian/patches/0006-Fix-leakage-of-ppd.patch
new file mode 100644
index 000000000..665395c3b
--- /dev/null
+++ b/debian/patches/0006-Fix-leakage-of-ppd.patch
@@ -0,0 +1,21 @@
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 14 Feb 2020 16:48:49 +0100
+Subject: Fix leakage of ppd
+
+---
+ ppdc/ppdc-import.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
+index 04b587d..b4a8341 100644
+--- a/ppdc/ppdc-import.cxx
++++ b/ppdc/ppdc-import.cxx
+@@ -323,5 +323,8 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
+     }
+   }
+ 
++  if (ppd)
++    ppdClose(ppd);
++
+   return (1);
+ }
diff --git a/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch b/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
new file mode 100644
index 000000000..a0c55e473
--- /dev/null
+++ b/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch b/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
new file mode 100644
index 000000000..21d84e708
--- /dev/null
+++ b/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/0009-Tests-ignore-loadFile-failures.patch b/debian/patches/0009-Tests-ignore-loadFile-failures.patch
new file mode 100644
index 000000000..6f592d7e7
--- /dev/null
+++ b/debian/patches/0009-Tests-ignore-loadFile-failures.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch b/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
new file mode 100644
index 000000000..8088de19f
--- /dev/null
+++ b/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch b/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
new file mode 100644
index 000000000..708c28dcf
--- /dev/null
+++ b/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0012-Tests-ignore-job-held-message.patch b/debian/patches/0012-Tests-ignore-job-held-message.patch
new file mode 100644
index 000000000..11f87ab7c
--- /dev/null
+++ b/debian/patches/0012-Tests-ignore-job-held-message.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 8 Feb 2020 11:49:07 +0100
+Subject: Tests: ignore 'job held' message
+
+Origin: vendor
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..dfa7f6a 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
++       $GREP -v 'Job held by' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch b/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
new file mode 100644
index 000000000..931feb799
--- /dev/null
+++ b/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: https://bugs.debian.org/662996
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch b/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
new file mode 100644
index 000000000..a677af5fb
--- /dev/null
+++ b/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: https://bugs.debian.org/670878
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index dfa7f6a..173fc86 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
diff --git a/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch b/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
new file mode 100644
index 000000000..9c3a8463e
--- /dev/null
+++ b/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch b/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
new file mode 100644
index 000000000..56e9a0710
--- /dev/null
+++ b/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 173fc86..88bafb1 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch b/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
new file mode 100644
index 000000000..1ba692070
--- /dev/null
+++ b/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 88bafb1..d9b3985 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/0018-Tests-Do-not-test-pdftourf.patch b/debian/patches/0018-Tests-Do-not-test-pdftourf.patch
new file mode 100644
index 000000000..08c1c73ec
--- /dev/null
+++ b/debian/patches/0018-Tests-Do-not-test-pdftourf.patch
@@ -0,0 +1,68 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: Tests: Do not test pdftourf
+
+ Revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index d9b3985..bc332fc 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch b/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
new file mode 100644
index 000000000..c785eb981
--- /dev/null
+++ b/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug-Debian: https://bugs.debian.org/640124
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch b/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
new file mode 100644
index 000000000..768134e37
--- /dev/null
+++ b/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
@@ -0,0 +1,91 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 8069039..2fff84b 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..4389e274d
--- /dev/null
+++ b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,48 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://github.com/apple/cups/issues/3552
+Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch b/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
new file mode 100644
index 000000000..1498c2db5
--- /dev/null
+++ b/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
@@ -0,0 +1,67 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 2fff84b..a729475 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch b/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
new file mode 100644
index 000000000..8ffa2bcb0
--- /dev/null
+++ b/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
@@ -0,0 +1,29 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: https://github.com/apple/cups/issues/2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch b/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch b/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
new file mode 100644
index 000000000..c7df689e2
--- /dev/null
+++ b/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Mon, 24 Feb 2020 11:46:49 +0100
+Subject: Add Requires=cups.socket to cups.service,
+ to make sure they start in the right order
+
+---
+ scheduler/org.cups.cupsd.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index cd23343..79d2c40 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -2,6 +2,7 @@
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+ After=sssd.service
++Requires=cups.socket
+ 
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
diff --git a/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch b/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
new file mode 100644
index 000000000..ef052d5ef
--- /dev/null
+++ b/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
@@ -0,0 +1,25 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch b/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
new file mode 100644
index 000000000..f30429b4c
--- /dev/null
+++ b/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
@@ -0,0 +1,39 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch b/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
new file mode 100644
index 000000000..7b93a2da1
--- /dev/null
+++ b/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
@@ -0,0 +1,60 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch b/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
new file mode 100644
index 000000000..c5e7fb2a1
--- /dev/null
+++ b/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch b/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
new file mode 100644
index 000000000..2057a4856
--- /dev/null
+++ b/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
@@ -0,0 +1,26 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0031-Show-compile-command-lines.patch b/debian/patches/0031-Show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/0031-Show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch b/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..40b9bbdfe
--- /dev/null
+++ b/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,64 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch b/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
new file mode 100644
index 000000000..80abeb3a8
--- /dev/null
+++ b/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
@@ -0,0 +1,73 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job"
+
+It it is less confusing and a better default on most machines.
+Amend documentation accordingly.
+
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch b/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
new file mode 100644
index 000000000..0853e7056
--- /dev/null
+++ b/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: https://bugs.debian.org/570157
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch b/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
new file mode 100644
index 000000000..142ad8a04
--- /dev/null
+++ b/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..5bb407023
--- /dev/null
+++ b/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+Bug-Debian: https://bugs.debian.org/837936
+Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 23abe87..04ac4ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch b/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
new file mode 100644
index 000000000..ecfe58203
--- /dev/null
+++ b/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
@@ -0,0 +1,342 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..c0f691d53
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,37 @@
+0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
+0002-Install-root-backends-world-readable.patch
+0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
+0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
+0005-Fix-scheduler-cupsd.conf-load.patch
+0006-Fix-leakage-of-ppd.patch
+0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
+0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
+0009-Tests-ignore-loadFile-failures.patch
+0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
+0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
+0012-Tests-ignore-job-held-message.patch
+0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
+0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
+0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
+0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
+0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
+0018-Tests-Do-not-test-pdftourf.patch
+0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
+0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
+0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
+0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
+0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
+0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
+0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
+0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
+0028-Make-log-files-readable-to-group-adm-if-present.patch
+0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
+0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
+0031-Show-compile-command-lines.patch
+0032-Set-the-default-for-SyncOnClose-to-Yes.patch
+0033-Set-default-job-error-policy-to-retry-job.patch
+0034-Drop-dangling-references-from-cups-lpd.man.patch
+0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
+0036-Build-mantohtml-with-the-build-architecture-compiler.patch
+0037-po4a-infrastructure-and-translations-for-manpages.patch
-- 
cgit v1.2.3


From 7d38ad22020da6ade1a0eeddcd02626cd0c5a52c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 12:03:01 +0100
Subject: Add Pre-Depends: ${misc:Pre-Depends} to cups-daemon to fix
 skip-systemd-native-flag-missing-pre-depends

---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 1f277561e..487703f61 100644
--- a/debian/control
+++ b/debian/control
@@ -136,6 +136,7 @@ Description: Common UNIX Printing System(tm) - driverless printing
 Package: cups-daemon
 Architecture: any
 Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          procps,
-- 
cgit v1.2.3


From 551c9af70ed230a9604e89ecc7ccc3292a8f30a3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 12:25:25 +0100
Subject: CI Tests: Add a test for all CUPS' basic commands

Thanks to RedHat for the neat test script from https://src.fedoraproject.org/rpms/cups/blob/master/f/tests/basic-commands/runtest.sh
---
 debian/tests/control            |   4 ++
 debian/tests/cups-basiccommands | 121 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100755 debian/tests/cups-basiccommands

diff --git a/debian/tests/control b/debian/tests/control
index 178bdc130..bcbd90214 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -5,3 +5,7 @@ Depends: cups-core-drivers, cups-client
 Tests: cups
 Restrictions: needs-root
 Depends: cups, cups-client
+
+Tests: cups-basiccommands
+Restrictions: needs-root
+Depends: cups, cups-client
diff --git a/debian/tests/cups-basiccommands b/debian/tests/cups-basiccommands
new file mode 100755
index 000000000..ad6601c8c
--- /dev/null
+++ b/debian/tests/cups-basiccommands
@@ -0,0 +1,121 @@
+#!/bin/bash
+
+set -e -u
+
+# What follows is widely taken from https://src.fedoraproject.org/rpms/cups/blob/master/f/tests/basic-commands/runtest.sh , with small adaptations for Debian
+# runtest.sh - basic commands
+# Author: Yulia Kopkova <ykopkova@redhat.com>
+# Location: /CoreOS/cups/Sanity/basic_commands/Makefile
+# Description: Test for basic CUPS commands
+# Copyright (c) 2008 Red Hat, Inc. This copyrighted material
+# is made available to anyone wishing to use, modify, copy, or
+# redistribute it subject to the terms and conditions of the GNU General
+# Public License v.2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Make sure we can print to Files
+sed -e 's/^#.*FileDevice.*$/FileDevice Yes/g' -i /etc/cups/cups-files.conf
+service cups restart
+
+FILEPDF=/usr/share/cups/data/default-testpage.pdf
+FILEJPG=/usr/share/cups/doc-root/images/smiley.jpg
+NUMJOBS=50
+TIMEOUT=30
+TPRN1="test-printer1"
+TPRN2="test-printer2"
+ML="drv:///sample.drv/deskjet.ppd"
+
+cleanup() {
+    # Delete it
+    echo -n " - Interrupted (or finished), delete test printers:"
+    lpadmin -x $TPRN1 2>/dev/null || :
+    lpadmin -x $TPRN2 2>/dev/null || :
+    echo " done."
+}
+
+trap cleanup EXIT INT
+
+echo " - Create printer $TPRN1"
+lpadmin -p $TPRN1 -v file:/dev/null -E -m $ML 
+echo " - Set $TPRN1 default"
+lpadmin -d $TPRN1 
+echo " - Create printer $TPRN2"
+lpadmin -p $TPRN2 -v file:/dev/null -E -m $ML 
+echo " - Print $FILEPDF with lp and default printer"
+lp $FILEPDF 
+echo " - Print $FILEJPG with lp and $TPRN2"
+lp -d $TPRN2 $FILEJPG 
+echo " - Print $FILEPDF with lp and $TPRN1"
+lp -d $TPRN1 -P 1-2 -o job-sheets=classified,classified $FILEPDF 
+
+for ((i=0; i < $NUMJOBS; i++)); do
+    lp -d $TPRN1 $FILEJPG &
+    sleep 0.02s
+    lp -d $TPRN2 $FILEJPG &
+    sleep 0.02s
+    lppid=$!
+done
+echo " - $NUMJOBS jobs queued"
+wait $lppid
+
+for ((i=$TIMEOUT; i>0; i-=5 )); do
+        jobs=$(lpstat)
+    [ "x$jobs" = "x" ] && break
+    sleep 5
+done
+echo " - Print $FILEPDF with lpr and default printer"
+lpr $FILEPDF 
+echo " - Print $FILEJPG with lpr and $TPRN2"
+lpr -P $TPRN2 $FILEJPG 
+echo " - Print $FILEPDF with lpr and $TPRN1"
+lpr -P $TPRN1 -o number-up=2 -o job-sheets=standard,none $FILEPDF 
+for ((i=0; i < $NUMJOBS ; i++)); do
+    lpr -P $TPRN1 $FILEJPG &
+    sleep 0.02s
+    lpr -P $TPRN2 $FILEJPG &
+    sleep 0.02s
+    lprpid=$!
+done
+echo " - $NUMJOBS jobs queued"
+wait $lprpid 
+for ((i=$TIMEOUT; i>0 ; i-=5)); do
+    jobs=$(lpstat)
+    [ "x$jobs" = "x" ] && break
+    sleep 5
+done
+job_id=$(lp -d $TPRN1 -o job-hold-until=indefinite $FILEJPG | awk "{ match(\$0, /$TPRN1-([0-9]+)/, arr); print arr[1] }")
+echo " - Cancel $TPRN1-$job_id job"
+cancel $TPRN1-$job_id 
+echo " - Hold job on $TPRN1"
+lp -d $TPRN1 -o job-hold-until=indefinite $FILEJPG 
+echo " - Hold job on $TPRN2"
+lp -d $TPRN2 -o job-hold-until=indefinite $FILEJPG 
+echo " - Cancel all jobs"
+cancel -a 
+echo " - Show printers status"
+lpc status 
+echo " - Show printer queue status"
+lpq 
+echo " - Show all status information"
+lpstat -t 
+echo " - Show list of available drivers"
+lpinfo -m 
+echo " - Show list of available devices"
+lpinfo -v 
+echo " - Hold test file"
+lpr -o job-hold-until=indefinite $FILEJPG 
+echo " - Cancel current job on default printer"
+lprm 
+echo " - Hold test file"
+lpr -P $TPRN1 -o job-hold-until=indefinite $FILEJPG 
+echo " - Cancel current job on $TPRN1"
+lprm $TPRN1 
+echo " - Modify $TPRN1"
+lpadmin -p $TPRN1 -v file:/tmp/$TPRN1 -o PageSize=A4 
-- 
cgit v1.2.3


From 9e72d51b187950a9bcb80aa3ae79a2912c129bde Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 12:25:39 +0100
Subject: cups 2.3.1-10 Debian release

---
 debian/changelog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4114a2150..35a9ecc19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cups (2.3.1-10) unstable; urgency=medium
+
+  * Add Requires=cups.socket to cups.service, to make sure they start in
+    the right order
+  * CI Tests: Add a test for all CUPS' basic commands, thanks to RedHat
+  * Add Pre-Depends: ${misc:Pre-Depends} to cups-daemon to fix
+    skip-systemd-native-flag-missing-pre-depends lintian flag
+  * Add patch proposal from RedHat to fix leakage of ppd (Issue: #5738)
+
+ -- Didier Raboud <odyx@debian.org>  Mon, 24 Feb 2020 12:25:39 +0100
+
 cups (2.3.1-9) unstable; urgency=medium
 
   * CI Tests: Ensure the job files are non-empty; should detect more
-- 
cgit v1.2.3


From 2f2fa6952ec0fbdf2c81488076074934111478ac Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 18:05:08 +0100
Subject: CI Tests: Add missing cups-bsd depends to cups-basiccommands

---
 debian/tests/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/control b/debian/tests/control
index bcbd90214..b6ddf35bc 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -8,4 +8,4 @@ Depends: cups, cups-client
 
 Tests: cups-basiccommands
 Restrictions: needs-root
-Depends: cups, cups-client
+Depends: cups, cups-client, cups-bsd
-- 
cgit v1.2.3


From 255a4768e25da94050bef1b3ff2e32ed7e7ce18e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 18:43:50 +0100
Subject: CI Tests: filter stderr away from known errors

---
 debian/tests/cups-basiccommands | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/tests/cups-basiccommands b/debian/tests/cups-basiccommands
index ad6601c8c..158b8a4ec 100755
--- a/debian/tests/cups-basiccommands
+++ b/debian/tests/cups-basiccommands
@@ -2,6 +2,13 @@
 
 set -e -u
 
+filter_stderr_from_file() {
+    cat $1 | \
+        grep -v -E "lpadmin: (Raw queues|Printer drivers) are deprecated and will stop working in a future version of CUPS." \
+        || true \
+        1>&2
+}
+
 # What follows is widely taken from https://src.fedoraproject.org/rpms/cups/blob/master/f/tests/basic-commands/runtest.sh , with small adaptations for Debian
 # runtest.sh - basic commands
 # Author: Yulia Kopkova <ykopkova@redhat.com>
@@ -31,23 +38,25 @@ TIMEOUT=30
 TPRN1="test-printer1"
 TPRN2="test-printer2"
 ML="drv:///sample.drv/deskjet.ppd"
+STDERR_FILE=`mktemp`
 
 cleanup() {
     # Delete it
     echo -n " - Interrupted (or finished), delete test printers:"
     lpadmin -x $TPRN1 2>/dev/null || :
     lpadmin -x $TPRN2 2>/dev/null || :
+    rm -f $STDERR_FILE
     echo " done."
 }
 
 trap cleanup EXIT INT
 
 echo " - Create printer $TPRN1"
-lpadmin -p $TPRN1 -v file:/dev/null -E -m $ML 
+lpadmin -p $TPRN1 -v file:/dev/null -E -m $ML 2> $STDERR_FILE; filter_stderr_from_file $STDERR_FILE
 echo " - Set $TPRN1 default"
 lpadmin -d $TPRN1 
 echo " - Create printer $TPRN2"
-lpadmin -p $TPRN2 -v file:/dev/null -E -m $ML 
+lpadmin -p $TPRN2 -v file:/dev/null -E -m $ML 2> $STDERR_FILE; filter_stderr_from_file $STDERR_FILE
 echo " - Print $FILEPDF with lp and default printer"
 lp $FILEPDF 
 echo " - Print $FILEJPG with lp and $TPRN2"
-- 
cgit v1.2.3


From ea97f29c5d6a38496b86879ab59d7242662aed33 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 18:49:06 +0100
Subject: CI Tests: replace awk with sed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… as I'm way more comfortable with sed than awk
---
 debian/tests/cups-basiccommands | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/tests/cups-basiccommands b/debian/tests/cups-basiccommands
index 158b8a4ec..083dd76a4 100755
--- a/debian/tests/cups-basiccommands
+++ b/debian/tests/cups-basiccommands
@@ -99,7 +99,7 @@ for ((i=$TIMEOUT; i>0 ; i-=5)); do
     [ "x$jobs" = "x" ] && break
     sleep 5
 done
-job_id=$(lp -d $TPRN1 -o job-hold-until=indefinite $FILEJPG | awk "{ match(\$0, /$TPRN1-([0-9]+)/, arr); print arr[1] }")
+job_id=$(lp -d $TPRN1 -o job-hold-until=indefinite $FILEJPG | sed "s/^.*$TPRN1-\([[:digit:]]*\).*/\1/g")
 echo " - Cancel $TPRN1-$job_id job"
 cancel $TPRN1-$job_id 
 echo " - Hold job on $TPRN1"
-- 
cgit v1.2.3


From 392859a8e72a141cb77ff088316e1d3e71264898 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 19:40:39 +0100
Subject: cups 2.3.1-11 Debian release

---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 35a9ecc19..51cdca77c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cups (2.3.1-11) unstable; urgency=medium
+
+  * CI Tests: fix cups-basiccommands:
+    - swap awk with sed;
+    - filter stderr away from known errors
+    - add missing cups-bsd depends to test lpr commands
+
+ -- Didier Raboud <odyx@debian.org>  Mon, 24 Feb 2020 19:40:39 +0100
+
 cups (2.3.1-10) unstable; urgency=medium
 
   * Add Requires=cups.socket to cups.service, to make sure they start in
-- 
cgit v1.2.3


From 9933d5a42a4fb41bb9577dd78afd0384f1894f46 Mon Sep 17 00:00:00 2001
From: Stephan Zeisberg <stephan.zeisberg@splone.com>
Date: Fri, 10 Apr 2020 17:14:34 +0200
Subject: =?UTF-8?q?CVE-2020-3898=20-=20heap-buffer-overflow=20in=20libcups?=
 =?UTF-8?q?=E2=80=99s=20ppdFindOption()=20function=20in=20ppd-mark.c?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cups/ppd.c           |  3 +--
 ppdc/ppdc-source.cxx | 14 ++++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cups/ppd.c b/cups/ppd.c
index ff52df2e1..199cf0348 100644
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1719,8 +1719,7 @@ _ppdOpen(
                      constraint->choice1, constraint->option2,
 		     constraint->choice2))
       {
-        case 0 : /* Error */
-	case 1 : /* Error */
+        default : /* Error */
 	    pg->ppd_status = PPD_BAD_UI_CONSTRAINTS;
 	    goto error;
 
diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
index c25d49668..236c00dbe 100644
--- a/ppdc/ppdc-source.cxx
+++ b/ppdc/ppdc-source.cxx
@@ -1743,15 +1743,17 @@ ppdcSource::get_resolution(ppdcFile *fp)// I - File to read
 
   switch (sscanf(name, "%dx%d", &xdpi, &ydpi))
   {
-    case 0 :
-        _cupsLangPrintf(stderr,
-	                _("ppdc: Bad resolution name \"%s\" on line %d of "
-			  "%s."), name, fp->line, fp->filename);
-        break;
     case 1 :
         ydpi = xdpi;
 	break;
-  }
+    case 2 :
+        break;
+    default :
+        _cupsLangPrintf(stderr,
+                  _("ppdc: Bad resolution name \"%s\" on line %d of "
+        "%s."), name, fp->line, fp->filename);
+        break;
+}
 
   // Create the necessary PS commands...
   snprintf(command, sizeof(command),
-- 
cgit v1.2.3


From 4985460c1aab1fdcbbf90dba3607765df3212a40 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 25 Apr 2020 16:02:12 +0200
Subject: CVE-2019-8842: The `ippReadIO` function may under-read an extension
 field

---
 cups/ipp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/ipp.c b/cups/ipp.c
index 1595b8b61..3d529346c 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -2956,7 +2956,7 @@ ippReadIO(void       *src,		/* I - Data source */
             * Read 32-bit "extension" tag...
             */
 
-	    if ((*cb)(src, buffer, 4) < 1)
+	    if ((*cb)(src, buffer, 4) < 4)
 	    {
 	      DEBUG_puts("1ippReadIO: Callback returned EOF/error");
 	      _cupsBufferRelease((char *)buffer);
-- 
cgit v1.2.3


From 22cef771ef65196e69a7c0e20bcf76516b7fbc76 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://github.com/apple/cups/issues/4299
Patch-Name: manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From 1dd7a38656ffd1560319d1c7c5f4095f3ca598fb Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: https://github.com/apple/cups/issues/2935
Bug-Debian: https://bugs.debian.org/410171
Patch-Name install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From ecc18df5bf2edd2f6fc8b59f4802b01133f0e2ee Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://github.com/apple/cups/issues/4348
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From 54057d27610c6e106ada297abdf720d1a6f597f9 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Mon, 17 Feb 2020 09:05:58 +0100
Subject: Fix conversion of PPD InputSlot choice names

When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
... in the InputSlot option CUPS translates these names to double-dashed IPP
attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
when passing a job to the printer with the IPP backend, making the printer
ignore the tray choice, and also when answering a get-printer-attributes IPP
request from a client. This happens when in the PPD a dash is followed by a
digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
names generally never have double-dashes and also no dashes in the beginning or
the end of the name, I have modified the pwg_unppdize_name() function
appropriately.

Bug: https://github.com/apple/cups/issues/5740
Bug-Debian: https://bugs.debian.org/949315
---
 cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 5965e382b..6609f53e5 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 {
   char	*ptr,				/* Pointer into name buffer */
 	*end;				/* End of name buffer */
+  int   nodash = 1;                     /* Next char in IPP name cannot be a
+                                           dash (first char or after a dash) */
 
 
   if (_cups_islower(*ppd))
@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
     const char *ppdptr;			/* Pointer into PPD keyword */
 
     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
+      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
+	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
+	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
         break;
 
     if (!*ppdptr)
@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 
   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
   {
-    if (_cups_isalnum(*ppd) || *ppd == '-')
+    if (_cups_isalnum(*ppd))
+    {
       *ptr++ = (char)tolower(*ppd & 255);
-    else if (strchr(dashchars, *ppd))
-      *ptr++ = '-';
+      nodash = 0;
+    }
+    else if (*ppd == '-' || strchr(dashchars, *ppd))
+    {
+      if (nodash == 0)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
     else
+    {
       *ptr++ = *ppd;
+      nodash = 0;
+    }
 
-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
-	_cups_isupper(ppd[1]) && ptr < end)
-      *ptr++ = '-';
-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
-      *ptr++ = '-';
+    if (nodash == 0)
+    {
+      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+	  _cups_isupper(ppd[1]) && ptr < end)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
   }
 
+  /* Remove trailing dashes */
+  while (ptr > name && *(ptr - 1) == '-')
+    ptr --;
+
   *ptr = '\0';
 }
-- 
cgit v1.2.3


From 938c2fd5de585db77a0500441f6e0ed979316f4b Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Sat, 22 Feb 2020 14:28:58 +0100
Subject: Fix scheduler cupsd.conf load

When running it without arguments it is supposed to read the local CUPS's
cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
with a lot of HTML inside and this is due to the fact that when loading the
file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
admin.cgi program which returns the admin front page of the web admin
interface. cupsctl then tries to interpret that as the config file and displays
garbage. Even worse is if you run cupsctl with command line argument (one of
the five switches or a key=value pair) to change a setting. It seems to load
cupsd.conf again and gets again the HTML code of the web interface page.
cupsctl tries to interpret this again, producing garbage, adds the
user-supplied setting and writes all this back into cupsd.conf. Then it tries
to restart the scheduler which fails due to the broken config file.
The problem is that in the file scheduler/client.conf, in the function
get_file() the URI from the client is at first checked whether it begins with
"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
that the check for "/admin/conf/cupsd.conf" comes and is never reached.
I have changed the order now appropriately and this way cupsctl works again.
Note that the problem only occurs if the web interface is active and the
cupsctl command is issued by a non-root user.
This is a regression caused by issue #5652.

Bug: https://github.com/apple/cups/issues/5744
---
 scheduler/client.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/scheduler/client.c b/scheduler/client.c
index c2ee8f12a..54b841bc1 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
+  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+  {
+    strlcpy(filename, ConfigurationFile, len);
+
+    perm_check = 0;
+  }
+  else if (!strncmp(con->uri, "/admin/log/", 11))
+  {
+    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+      strlcpy(filename, AccessLog, len);
+    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+      strlcpy(filename, ErrorLog, len);
+    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+      strlcpy(filename, PageLog, len);
+    else
+      return (NULL);
+
+    perm_check = 0;
+  }
   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
   {
    /*
@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
-  {
-    strlcpy(filename, ConfigurationFile, len);
-
-    perm_check = 0;
-  }
-  else if (!strncmp(con->uri, "/admin/log/", 11))
-  {
-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
-      strlcpy(filename, AccessLog, len);
-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
-      strlcpy(filename, ErrorLog, len);
-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
-      strlcpy(filename, PageLog, len);
-    else
-      return (NULL);
-
-    perm_check = 0;
-  }
   else if (con->language)
   {
     snprintf(language, sizeof(language), "/%s", con->language->language);
-- 
cgit v1.2.3


From 7ecf00b3a0c3089dd18f9b8f1273edc2c97ee4ee Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Fri, 14 Feb 2020 16:48:49 +0100
Subject: Fix leakage of ppd

---
 ppdc/ppdc-import.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
index 04b587d7f..b4a834138 100644
--- a/ppdc/ppdc-import.cxx
+++ b/ppdc/ppdc-import.cxx
@@ -323,5 +323,8 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
     }
   }
 
+  if (ppd)
+    ppdClose(ppd);
+
   return (1);
 }
-- 
cgit v1.2.3


From fc4bf998923ea530f4f5b3ce9f1005b875b35c87 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From 69932f10497fe39b6ed519c3973bdf441ae48ccf Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Patch-Name: tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From e304b83d2b39168e32adefbfe1d75fd1748c1fc1 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 81db2fc175c49134455cd8c7f6d6a7612faf57c4 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 5df6344470a302c21fdeed3e2915325cce852e7f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From d671277ada55830968d116aba58a12f4404ffc77 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 8 Feb 2020 11:49:07 +0100
Subject: Tests: ignore 'job held' message

Origin: vendor
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..dfa7f6a5c 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+       $GREP -v 'Job held by' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 932b9aba382ce4ae85c8ed7a0a2b63f04590fa73 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: https://bugs.debian.org/662996
Patch-Name: test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 3aaf53dfec3834a84e02a2234657aa0062c3c710 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: https://bugs.debian.org/670878
Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index dfa7f6a5c..173fc86a7 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From f8c6397fef5d8c7c9edb07a8a1933df2f19f267c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From f9b001628231ab8e655c631e100f256c620db65e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 173fc86a7..88bafb1a6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From af1d4ebbd83f6c2017ed1239dd04317f50e99b0a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 88bafb1a6..d9b398575 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From bf1026e6f265e88dbf1855b1fcba30570f9e0e8a Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: Tests: Do not test pdftourf

 Revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream
Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index d9b398575..bc332fc61 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From 4d8bdc4a99108fd66946440f34baa4fbb6c85c73 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug-Debian: https://bugs.debian.org/640124
Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 9382da7f1de819664ce13ee1cec0183a6df45f6e Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 80690397d..2fff84b60 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From b15cb99d5ed1acc2ac4387644e92087afdad9cb2 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://github.com/apple/cups/issues/3552
Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 18be9740b65259208cadb520762f093825451e4f Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 2fff84b60..a729475a3 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From ed9c42afd28276c72ffb202a63db79698b940a5b Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: https://github.com/apple/cups/issues/2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From 1072fdaf3bf2405c6ceaeef93d15bc9a2762b7ae Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From d180d8042b2221ca23a7eb89f3cab5e7e6da1dd7 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 11:46:49 +0100
Subject: Add Requires=cups.socket to cups.service, to make sure they start in
 the right order

---
 scheduler/org.cups.cupsd.service.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index cd2334396..79d2c403e 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -2,6 +2,7 @@
 Description=CUPS Scheduler
 Documentation=man:cupsd(8)
 After=sssd.service
+Requires=cups.socket
 
 [Service]
 ExecStart=@sbindir@/cupsd -l
-- 
cgit v1.2.3


From 4a56c64a25050b31548009c0bc18aaecbdecc092 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From a8047866afbf2e0893fc14201d875f759e00eb25 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From eb2a776df9e98372bfa9b832c2e8dbeecd45f5a1 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From b5b7484b241169b9bc2dc149943bc9b2015832af Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From 3f2f411e7f739f9cc813f0c92022c70e77e767b0 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 69ade9cbb433b08dcc8f2f6d46ea2173310eab15 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From fff7734292cdb835563d301eea22236d3219e17f Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 9337bbbd2eb65e243d5e8e9de75568b7c64b08cb Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job"

It it is less confusing and a better default on most machines.
Amend documentation accordingly.

Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From ce751856b3061bd90bf7584d966104ddeac1c710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: https://bugs.debian.org/570157
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 13258f2840929e3263e552684413cdf48c30d2a6 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From a7d86a4fed8627622590fb5f38b0fe8a89c439b6 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 23abe870e..04ac4ff50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 642e70197fc32d80f94fcc1b8aed0006a723b2a0 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 28afcbd0e77162599b6981b00847441a7e5fdbb5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 25 Apr 2020 16:04:07 +0200
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...98-heap-buffer-overflow-in-libcups-s-ppdF.patch |  52 ++
 ...42-The-ippReadIO-function-may-under-read-.patch |  22 +
 ...-hyphen-used-as-minus-sign-manpage-errors.patch | 571 +++++++++++++++++++++
 ...0004-Install-root-backends-world-readable.patch |  66 +++
 ...s-with-multiple-files-or-multiple-formats.patch |  27 +
 ...-conversion-of-PPD-InputSlot-choice-names.patch |  99 ++++
 .../0007-Fix-scheduler-cupsd.conf-load.patch       |  86 ++++
 debian/patches/0008-Fix-leakage-of-ppd.patch       |  21 +
 ...sts-Ignore-warnings-from-colord-and-Avahi.patch |  28 +
 ...ignore-usb-dnssd-backend-unexpected-exits.patch |  31 ++
 .../0011-Tests-ignore-loadFile-failures.patch      |  25 +
 ...e-errors-triggered-on-ipv6-deprived-hosts.patch |  24 +
 ...re-the-failure-to-write-uncompressed-data.patch |  24 +
 .../0014-Tests-ignore-job-held-message.patch       |  21 +
 ...t-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch |  24 +
 ...sure-that-all-scheduled-jobs-are-finished.patch |  28 +
 ...-LC_-environment-variables-when-testing-n.patch |  31 ++
 ...27.0.0.1-instead-of-localhost-to-help-pbu.patch |  64 +++
 ...-LC_ALL-C-environment-variable-when-grepp.patch |  24 +
 .../patches/0020-Tests-Do-not-test-pdftourf.patch  |  68 +++
 ...d.conf.default-from-SERVERROOT-to-DATADIR.patch |  62 +++
 ...pport-Apple-AirPrint-printing-from-iPhone.patch |  91 ++++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  48 ++
 ...e-stamps-in-conffiles-to-avoid-ever-chang.patch |  67 +++
 ...t-write-VCS-tags-into-installed-conffiles.patch |  29 ++
 ...systemd-service-file-from-org.cups.cups.-.patch |  59 +++
 ...s-cups.socket-to-cups.service-to-make-sur.patch |  21 +
 ...host-names-for-broadcasting-print-queues-.patch |  25 +
 ...s-the-recommended-comments-of-the-NickNam.patch |  39 ++
 ...og-files-readable-to-group-adm-if-present.patch |  60 +++
 ...CUPS-own-log-rotating-as-the-system-alrea.patch |  25 +
 ...t-mess-with-the-permissions-of-cupsd.conf.patch |  26 +
 .../patches/0033-Show-compile-command-lines.patch  |  23 +
 ...34-Set-the-default-for-SyncOnClose-to-Yes.patch |  64 +++
 ...Set-default-job-error-policy-to-retry-job.patch |  73 +++
 ...rop-dangling-references-from-cups-lpd.man.patch |  24 +
 ...chitecture-in-cups-config-to-make-it-arch.patch |  49 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 ...rastructure-and-translations-for-manpages.patch | 342 ++++++++++++
 debian/patches/series                              |  39 ++
 40 files changed, 2612 insertions(+)
 create mode 100644 debian/patches/0001-CVE-2020-3898-heap-buffer-overflow-in-libcups-s-ppdF.patch
 create mode 100644 debian/patches/0002-CVE-2019-8842-The-ippReadIO-function-may-under-read-.patch
 create mode 100644 debian/patches/0003-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
 create mode 100644 debian/patches/0004-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0005-Fix-jobs-with-multiple-files-or-multiple-formats.patch
 create mode 100644 debian/patches/0006-Fix-conversion-of-PPD-InputSlot-choice-names.patch
 create mode 100644 debian/patches/0007-Fix-scheduler-cupsd.conf-load.patch
 create mode 100644 debian/patches/0008-Fix-leakage-of-ppd.patch
 create mode 100644 debian/patches/0009-Tests-Ignore-warnings-from-colord-and-Avahi.patch
 create mode 100644 debian/patches/0010-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
 create mode 100644 debian/patches/0011-Tests-ignore-loadFile-failures.patch
 create mode 100644 debian/patches/0012-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
 create mode 100644 debian/patches/0013-Tests-ignore-the-failure-to-write-uncompressed-data.patch
 create mode 100644 debian/patches/0014-Tests-ignore-job-held-message.patch
 create mode 100644 debian/patches/0015-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
 create mode 100644 debian/patches/0016-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
 create mode 100644 debian/patches/0017-Tests-Force-LC_-environment-variables-when-testing-n.patch
 create mode 100644 debian/patches/0018-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
 create mode 100644 debian/patches/0019-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
 create mode 100644 debian/patches/0020-Tests-Do-not-test-pdftourf.patch
 create mode 100644 debian/patches/0021-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
 create mode 100644 debian/patches/0022-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
 create mode 100644 debian/patches/0023-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0024-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
 create mode 100644 debian/patches/0025-Do-not-write-VCS-tags-into-installed-conffiles.patch
 create mode 100644 debian/patches/0026-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
 create mode 100644 debian/patches/0027-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
 create mode 100644 debian/patches/0028-Do-not-use-host-names-for-broadcasting-print-queues-.patch
 create mode 100644 debian/patches/0029-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
 create mode 100644 debian/patches/0030-Make-log-files-readable-to-group-adm-if-present.patch
 create mode 100644 debian/patches/0031-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
 create mode 100644 debian/patches/0032-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
 create mode 100644 debian/patches/0033-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0034-Set-the-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/0035-Set-default-job-error-policy-to-retry-job.patch
 create mode 100644 debian/patches/0036-Drop-dangling-references-from-cups-lpd.man.patch
 create mode 100644 debian/patches/0037-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
 create mode 100644 debian/patches/0038-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/0039-po4a-infrastructure-and-translations-for-manpages.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-CVE-2020-3898-heap-buffer-overflow-in-libcups-s-ppdF.patch b/debian/patches/0001-CVE-2020-3898-heap-buffer-overflow-in-libcups-s-ppdF.patch
new file mode 100644
index 000000000..c48ab31cd
--- /dev/null
+++ b/debian/patches/0001-CVE-2020-3898-heap-buffer-overflow-in-libcups-s-ppdF.patch
@@ -0,0 +1,52 @@
+From: Stephan Zeisberg <stephan.zeisberg@splone.com>
+Date: Fri, 10 Apr 2020 17:14:34 +0200
+Subject: =?utf-8?q?CVE-2020-3898_-_heap-buffer-overflow_in_libcups=E2=80=99?=
+ =?utf-8?q?s_ppdFindOption=28=29_function_in_ppd-mark=2Ec?=
+
+---
+ cups/ppd.c           |  3 +--
+ ppdc/ppdc-source.cxx | 14 ++++++++------
+ 2 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/cups/ppd.c b/cups/ppd.c
+index ff52df2..199cf03 100644
+--- a/cups/ppd.c
++++ b/cups/ppd.c
+@@ -1719,8 +1719,7 @@ _ppdOpen(
+                      constraint->choice1, constraint->option2,
+ 		     constraint->choice2))
+       {
+-        case 0 : /* Error */
+-	case 1 : /* Error */
++        default : /* Error */
+ 	    pg->ppd_status = PPD_BAD_UI_CONSTRAINTS;
+ 	    goto error;
+ 
+diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
+index c25d496..236c00d 100644
+--- a/ppdc/ppdc-source.cxx
++++ b/ppdc/ppdc-source.cxx
+@@ -1743,15 +1743,17 @@ ppdcSource::get_resolution(ppdcFile *fp)// I - File to read
+ 
+   switch (sscanf(name, "%dx%d", &xdpi, &ydpi))
+   {
+-    case 0 :
+-        _cupsLangPrintf(stderr,
+-	                _("ppdc: Bad resolution name \"%s\" on line %d of "
+-			  "%s."), name, fp->line, fp->filename);
+-        break;
+     case 1 :
+         ydpi = xdpi;
+ 	break;
+-  }
++    case 2 :
++        break;
++    default :
++        _cupsLangPrintf(stderr,
++                  _("ppdc: Bad resolution name \"%s\" on line %d of "
++        "%s."), name, fp->line, fp->filename);
++        break;
++}
+ 
+   // Create the necessary PS commands...
+   snprintf(command, sizeof(command),
diff --git a/debian/patches/0002-CVE-2019-8842-The-ippReadIO-function-may-under-read-.patch b/debian/patches/0002-CVE-2019-8842-The-ippReadIO-function-may-under-read-.patch
new file mode 100644
index 000000000..5f1572c5a
--- /dev/null
+++ b/debian/patches/0002-CVE-2019-8842-The-ippReadIO-function-may-under-read-.patch
@@ -0,0 +1,22 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 25 Apr 2020 16:02:12 +0200
+Subject: CVE-2019-8842: The `ippReadIO` function may under-read an extension
+ field
+
+---
+ cups/ipp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/ipp.c b/cups/ipp.c
+index 1595b8b..3d52934 100644
+--- a/cups/ipp.c
++++ b/cups/ipp.c
+@@ -2956,7 +2956,7 @@ ippReadIO(void       *src,		/* I - Data source */
+             * Read 32-bit "extension" tag...
+             */
+ 
+-	    if ((*cb)(src, buffer, 4) < 1)
++	    if ((*cb)(src, buffer, 4) < 4)
+ 	    {
+ 	      DEBUG_puts("1ippReadIO: Callback returned EOF/error");
+ 	      _cupsBufferRelease((char *)buffer);
diff --git a/debian/patches/0003-Fix-hyphen-used-as-minus-sign-manpage-errors.patch b/debian/patches/0003-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
new file mode 100644
index 000000000..ce9c33b51
--- /dev/null
+++ b/debian/patches/0003-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
@@ -0,0 +1,571 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://github.com/apple/cups/issues/4299
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/0004-Install-root-backends-world-readable.patch b/debian/patches/0004-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..def3900f7
--- /dev/null
+++ b/debian/patches/0004-Install-root-backends-world-readable.patch
@@ -0,0 +1,66 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: https://github.com/apple/cups/issues/2935
+Bug-Debian: https://bugs.debian.org/410171
+Patch-Name install-root-backends-world-readable.patch
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0005-Fix-jobs-with-multiple-files-or-multiple-formats.patch b/debian/patches/0005-Fix-jobs-with-multiple-files-or-multiple-formats.patch
new file mode 100644
index 000000000..07da4d2f7
--- /dev/null
+++ b/debian/patches/0005-Fix-jobs-with-multiple-files-or-multiple-formats.patch
@@ -0,0 +1,27 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://github.com/apple/cups/issues/4348
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/0006-Fix-conversion-of-PPD-InputSlot-choice-names.patch b/debian/patches/0006-Fix-conversion-of-PPD-InputSlot-choice-names.patch
new file mode 100644
index 000000000..bc4db9fc9
--- /dev/null
+++ b/debian/patches/0006-Fix-conversion-of-PPD-InputSlot-choice-names.patch
@@ -0,0 +1,99 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Mon, 17 Feb 2020 09:05:58 +0100
+Subject: Fix conversion of PPD InputSlot choice names
+
+When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
+... in the InputSlot option CUPS translates these names to double-dashed IPP
+attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
+when passing a job to the printer with the IPP backend, making the printer
+ignore the tray choice, and also when answering a get-printer-attributes IPP
+request from a client. This happens when in the PPD a dash is followed by a
+digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
+whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
+names generally never have double-dashes and also no dashes in the beginning or
+the end of the name, I have modified the pwg_unppdize_name() function
+appropriately.
+
+Bug: https://github.com/apple/cups/issues/5740
+Bug-Debian: https://bugs.debian.org/949315
+---
+ cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 38 insertions(+), 9 deletions(-)
+
+diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
+index 5965e38..6609f53 100644
+--- a/cups/ppd-cache.c
++++ b/cups/ppd-cache.c
+@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ {
+   char	*ptr,				/* Pointer into name buffer */
+ 	*end;				/* End of name buffer */
++  int   nodash = 1;                     /* Next char in IPP name cannot be a
++                                           dash (first char or after a dash) */
+ 
+ 
+   if (_cups_islower(*ppd))
+@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+     const char *ppdptr;			/* Pointer into PPD keyword */
+ 
+     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
+-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
++      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
++	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
++	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
+         break;
+ 
+     if (!*ppdptr)
+@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ 
+   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
+   {
+-    if (_cups_isalnum(*ppd) || *ppd == '-')
++    if (_cups_isalnum(*ppd))
++    {
+       *ptr++ = (char)tolower(*ppd & 255);
+-    else if (strchr(dashchars, *ppd))
+-      *ptr++ = '-';
++      nodash = 0;
++    }
++    else if (*ppd == '-' || strchr(dashchars, *ppd))
++    {
++      if (nodash == 0)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+     else
++    {
+       *ptr++ = *ppd;
++      nodash = 0;
++    }
+ 
+-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+-	_cups_isupper(ppd[1]) && ptr < end)
+-      *ptr++ = '-';
+-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+-      *ptr++ = '-';
++    if (nodash == 0)
++    {
++      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
++	  _cups_isupper(ppd[1]) && ptr < end)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+   }
+ 
++  /* Remove trailing dashes */
++  while (ptr > name && *(ptr - 1) == '-')
++    ptr --;
++
+   *ptr = '\0';
+ }
diff --git a/debian/patches/0007-Fix-scheduler-cupsd.conf-load.patch b/debian/patches/0007-Fix-scheduler-cupsd.conf-load.patch
new file mode 100644
index 000000000..d43601064
--- /dev/null
+++ b/debian/patches/0007-Fix-scheduler-cupsd.conf-load.patch
@@ -0,0 +1,86 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Sat, 22 Feb 2020 14:28:58 +0100
+Subject: Fix scheduler cupsd.conf load
+
+When running it without arguments it is supposed to read the local CUPS's
+cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
+with a lot of HTML inside and this is due to the fact that when loading the
+file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
+admin.cgi program which returns the admin front page of the web admin
+interface. cupsctl then tries to interpret that as the config file and displays
+garbage. Even worse is if you run cupsctl with command line argument (one of
+the five switches or a key=value pair) to change a setting. It seems to load
+cupsd.conf again and gets again the HTML code of the web interface page.
+cupsctl tries to interpret this again, producing garbage, adds the
+user-supplied setting and writes all this back into cupsd.conf. Then it tries
+to restart the scheduler which fails due to the broken config file.
+The problem is that in the file scheduler/client.conf, in the function
+get_file() the URI from the client is at first checked whether it begins with
+"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
+that the check for "/admin/conf/cupsd.conf" comes and is never reached.
+I have changed the order now appropriately and this way cupsctl works again.
+Note that the problem only occurs if the web interface is active and the
+cupsctl command is issued by a non-root user.
+This is a regression caused by issue #5652.
+
+Bug: https://github.com/apple/cups/issues/5744
+---
+ scheduler/client.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/scheduler/client.c b/scheduler/client.c
+index c2ee8f1..54b841b 100644
+--- a/scheduler/client.c
++++ b/scheduler/client.c
+@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
++  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
++  {
++    strlcpy(filename, ConfigurationFile, len);
++
++    perm_check = 0;
++  }
++  else if (!strncmp(con->uri, "/admin/log/", 11))
++  {
++    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
++      strlcpy(filename, AccessLog, len);
++    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
++      strlcpy(filename, ErrorLog, len);
++    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
++      strlcpy(filename, PageLog, len);
++    else
++      return (NULL);
++
++    perm_check = 0;
++  }
+   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
+   {
+    /*
+@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
+-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+-  {
+-    strlcpy(filename, ConfigurationFile, len);
+-
+-    perm_check = 0;
+-  }
+-  else if (!strncmp(con->uri, "/admin/log/", 11))
+-  {
+-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+-      strlcpy(filename, AccessLog, len);
+-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+-      strlcpy(filename, ErrorLog, len);
+-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+-      strlcpy(filename, PageLog, len);
+-    else
+-      return (NULL);
+-
+-    perm_check = 0;
+-  }
+   else if (con->language)
+   {
+     snprintf(language, sizeof(language), "/%s", con->language->language);
diff --git a/debian/patches/0008-Fix-leakage-of-ppd.patch b/debian/patches/0008-Fix-leakage-of-ppd.patch
new file mode 100644
index 000000000..665395c3b
--- /dev/null
+++ b/debian/patches/0008-Fix-leakage-of-ppd.patch
@@ -0,0 +1,21 @@
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 14 Feb 2020 16:48:49 +0100
+Subject: Fix leakage of ppd
+
+---
+ ppdc/ppdc-import.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
+index 04b587d..b4a8341 100644
+--- a/ppdc/ppdc-import.cxx
++++ b/ppdc/ppdc-import.cxx
+@@ -323,5 +323,8 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
+     }
+   }
+ 
++  if (ppd)
++    ppdClose(ppd);
++
+   return (1);
+ }
diff --git a/debian/patches/0009-Tests-Ignore-warnings-from-colord-and-Avahi.patch b/debian/patches/0009-Tests-Ignore-warnings-from-colord-and-Avahi.patch
new file mode 100644
index 000000000..a0c55e473
--- /dev/null
+++ b/debian/patches/0009-Tests-Ignore-warnings-from-colord-and-Avahi.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/0010-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch b/debian/patches/0010-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
new file mode 100644
index 000000000..21d84e708
--- /dev/null
+++ b/debian/patches/0010-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/0011-Tests-ignore-loadFile-failures.patch b/debian/patches/0011-Tests-ignore-loadFile-failures.patch
new file mode 100644
index 000000000..6f592d7e7
--- /dev/null
+++ b/debian/patches/0011-Tests-ignore-loadFile-failures.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0012-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch b/debian/patches/0012-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
new file mode 100644
index 000000000..8088de19f
--- /dev/null
+++ b/debian/patches/0012-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0013-Tests-ignore-the-failure-to-write-uncompressed-data.patch b/debian/patches/0013-Tests-ignore-the-failure-to-write-uncompressed-data.patch
new file mode 100644
index 000000000..708c28dcf
--- /dev/null
+++ b/debian/patches/0013-Tests-ignore-the-failure-to-write-uncompressed-data.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0014-Tests-ignore-job-held-message.patch b/debian/patches/0014-Tests-ignore-job-held-message.patch
new file mode 100644
index 000000000..11f87ab7c
--- /dev/null
+++ b/debian/patches/0014-Tests-ignore-job-held-message.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 8 Feb 2020 11:49:07 +0100
+Subject: Tests: ignore 'job held' message
+
+Origin: vendor
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..dfa7f6a 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
++       $GREP -v 'Job held by' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0015-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch b/debian/patches/0015-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
new file mode 100644
index 000000000..931feb799
--- /dev/null
+++ b/debian/patches/0015-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: https://bugs.debian.org/662996
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/0016-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch b/debian/patches/0016-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
new file mode 100644
index 000000000..a677af5fb
--- /dev/null
+++ b/debian/patches/0016-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: https://bugs.debian.org/670878
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index dfa7f6a..173fc86 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
diff --git a/debian/patches/0017-Tests-Force-LC_-environment-variables-when-testing-n.patch b/debian/patches/0017-Tests-Force-LC_-environment-variables-when-testing-n.patch
new file mode 100644
index 000000000..9c3a8463e
--- /dev/null
+++ b/debian/patches/0017-Tests-Force-LC_-environment-variables-when-testing-n.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/0018-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch b/debian/patches/0018-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
new file mode 100644
index 000000000..56e9a0710
--- /dev/null
+++ b/debian/patches/0018-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 173fc86..88bafb1 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/0019-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch b/debian/patches/0019-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
new file mode 100644
index 000000000..1ba692070
--- /dev/null
+++ b/debian/patches/0019-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 88bafb1..d9b3985 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/0020-Tests-Do-not-test-pdftourf.patch b/debian/patches/0020-Tests-Do-not-test-pdftourf.patch
new file mode 100644
index 000000000..08c1c73ec
--- /dev/null
+++ b/debian/patches/0020-Tests-Do-not-test-pdftourf.patch
@@ -0,0 +1,68 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: Tests: Do not test pdftourf
+
+ Revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index d9b3985..bc332fc 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/0021-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch b/debian/patches/0021-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
new file mode 100644
index 000000000..c785eb981
--- /dev/null
+++ b/debian/patches/0021-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug-Debian: https://bugs.debian.org/640124
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0022-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch b/debian/patches/0022-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
new file mode 100644
index 000000000..768134e37
--- /dev/null
+++ b/debian/patches/0022-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
@@ -0,0 +1,91 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 8069039..2fff84b 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0023-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0023-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..4389e274d
--- /dev/null
+++ b/debian/patches/0023-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,48 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://github.com/apple/cups/issues/3552
+Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0024-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch b/debian/patches/0024-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
new file mode 100644
index 000000000..1498c2db5
--- /dev/null
+++ b/debian/patches/0024-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
@@ -0,0 +1,67 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 2fff84b..a729475 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/0025-Do-not-write-VCS-tags-into-installed-conffiles.patch b/debian/patches/0025-Do-not-write-VCS-tags-into-installed-conffiles.patch
new file mode 100644
index 000000000..8ffa2bcb0
--- /dev/null
+++ b/debian/patches/0025-Do-not-write-VCS-tags-into-installed-conffiles.patch
@@ -0,0 +1,29 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: https://github.com/apple/cups/issues/2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/0026-Rename-the-systemd-service-file-from-org.cups.cups.-.patch b/debian/patches/0026-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/0026-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/0027-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch b/debian/patches/0027-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
new file mode 100644
index 000000000..c7df689e2
--- /dev/null
+++ b/debian/patches/0027-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Mon, 24 Feb 2020 11:46:49 +0100
+Subject: Add Requires=cups.socket to cups.service,
+ to make sure they start in the right order
+
+---
+ scheduler/org.cups.cupsd.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index cd23343..79d2c40 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -2,6 +2,7 @@
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+ After=sssd.service
++Requires=cups.socket
+ 
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
diff --git a/debian/patches/0028-Do-not-use-host-names-for-broadcasting-print-queues-.patch b/debian/patches/0028-Do-not-use-host-names-for-broadcasting-print-queues-.patch
new file mode 100644
index 000000000..ef052d5ef
--- /dev/null
+++ b/debian/patches/0028-Do-not-use-host-names-for-broadcasting-print-queues-.patch
@@ -0,0 +1,25 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/0029-CUPS-removes-the-recommended-comments-of-the-NickNam.patch b/debian/patches/0029-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
new file mode 100644
index 000000000..f30429b4c
--- /dev/null
+++ b/debian/patches/0029-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
@@ -0,0 +1,39 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0030-Make-log-files-readable-to-group-adm-if-present.patch b/debian/patches/0030-Make-log-files-readable-to-group-adm-if-present.patch
new file mode 100644
index 000000000..7b93a2da1
--- /dev/null
+++ b/debian/patches/0030-Make-log-files-readable-to-group-adm-if-present.patch
@@ -0,0 +1,60 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/0031-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch b/debian/patches/0031-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
new file mode 100644
index 000000000..c5e7fb2a1
--- /dev/null
+++ b/debian/patches/0031-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/0032-Do-not-mess-with-the-permissions-of-cupsd.conf.patch b/debian/patches/0032-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
new file mode 100644
index 000000000..2057a4856
--- /dev/null
+++ b/debian/patches/0032-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
@@ -0,0 +1,26 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0033-Show-compile-command-lines.patch b/debian/patches/0033-Show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/0033-Show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/0034-Set-the-default-for-SyncOnClose-to-Yes.patch b/debian/patches/0034-Set-the-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..40b9bbdfe
--- /dev/null
+++ b/debian/patches/0034-Set-the-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,64 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/0035-Set-default-job-error-policy-to-retry-job.patch b/debian/patches/0035-Set-default-job-error-policy-to-retry-job.patch
new file mode 100644
index 000000000..80abeb3a8
--- /dev/null
+++ b/debian/patches/0035-Set-default-job-error-policy-to-retry-job.patch
@@ -0,0 +1,73 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job"
+
+It it is less confusing and a better default on most machines.
+Amend documentation accordingly.
+
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/0036-Drop-dangling-references-from-cups-lpd.man.patch b/debian/patches/0036-Drop-dangling-references-from-cups-lpd.man.patch
new file mode 100644
index 000000000..0853e7056
--- /dev/null
+++ b/debian/patches/0036-Drop-dangling-references-from-cups-lpd.man.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: https://bugs.debian.org/570157
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/0037-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch b/debian/patches/0037-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
new file mode 100644
index 000000000..142ad8a04
--- /dev/null
+++ b/debian/patches/0037-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0038-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0038-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..5bb407023
--- /dev/null
+++ b/debian/patches/0038-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+Bug-Debian: https://bugs.debian.org/837936
+Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 23abe87..04ac4ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0039-po4a-infrastructure-and-translations-for-manpages.patch b/debian/patches/0039-po4a-infrastructure-and-translations-for-manpages.patch
new file mode 100644
index 000000000..ecfe58203
--- /dev/null
+++ b/debian/patches/0039-po4a-infrastructure-and-translations-for-manpages.patch
@@ -0,0 +1,342 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..836fc3f1a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,39 @@
+0001-CVE-2020-3898-heap-buffer-overflow-in-libcups-s-ppdF.patch
+0002-CVE-2019-8842-The-ippReadIO-function-may-under-read-.patch
+0003-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
+0004-Install-root-backends-world-readable.patch
+0005-Fix-jobs-with-multiple-files-or-multiple-formats.patch
+0006-Fix-conversion-of-PPD-InputSlot-choice-names.patch
+0007-Fix-scheduler-cupsd.conf-load.patch
+0008-Fix-leakage-of-ppd.patch
+0009-Tests-Ignore-warnings-from-colord-and-Avahi.patch
+0010-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
+0011-Tests-ignore-loadFile-failures.patch
+0012-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
+0013-Tests-ignore-the-failure-to-write-uncompressed-data.patch
+0014-Tests-ignore-job-held-message.patch
+0015-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
+0016-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
+0017-Tests-Force-LC_-environment-variables-when-testing-n.patch
+0018-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
+0019-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
+0020-Tests-Do-not-test-pdftourf.patch
+0021-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
+0022-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
+0023-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0024-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
+0025-Do-not-write-VCS-tags-into-installed-conffiles.patch
+0026-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
+0027-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
+0028-Do-not-use-host-names-for-broadcasting-print-queues-.patch
+0029-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
+0030-Make-log-files-readable-to-group-adm-if-present.patch
+0031-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
+0032-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
+0033-Show-compile-command-lines.patch
+0034-Set-the-default-for-SyncOnClose-to-Yes.patch
+0035-Set-default-job-error-policy-to-retry-job.patch
+0036-Drop-dangling-references-from-cups-lpd.man.patch
+0037-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
+0038-Build-mantohtml-with-the-build-architecture-compiler.patch
+0039-po4a-infrastructure-and-translations-for-manpages.patch
-- 
cgit v1.2.3


From 13a3def817bd658678619db980489bae8a11137d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 25 Apr 2020 16:13:13 +0200
Subject: cups 2.3.1-12 Debian release

---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 51cdca77c..7752e2eed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cups (2.3.1-12) unstable; urgency=medium
+
+  * Backport two security patches
+    - CVE-2020-3898: heap-buffer-overflow in libcups’s ppdFindOption()
+      function in ppd-mark.c
+    - CVE-2019-8842: The `ippReadIO` function may under-read an extension
+      field
+
+ -- Didier Raboud <odyx@debian.org>  Sat, 25 Apr 2020 16:13:13 +0200
+
 cups (2.3.1-11) unstable; urgency=medium
 
   * CI Tests: fix cups-basiccommands:
-- 
cgit v1.2.3


From 2e854e3583a5057c33ee68f8939c9694f39e2e95 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://github.com/apple/cups/issues/4299
Patch-Name: manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From 7066d7c3e6bb213747e106d4805f843b2680ff7d Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: https://github.com/apple/cups/issues/2935
Bug-Debian: https://bugs.debian.org/410171
Patch-Name install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From 84bf000ee7fb554c1033e76273d9df7c9565d3c7 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://github.com/apple/cups/issues/4348
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From fc7fe24e793df5e397071e7041cbadd62b14413b Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Mon, 17 Feb 2020 09:05:58 +0100
Subject: Fix conversion of PPD InputSlot choice names

When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
... in the InputSlot option CUPS translates these names to double-dashed IPP
attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
when passing a job to the printer with the IPP backend, making the printer
ignore the tray choice, and also when answering a get-printer-attributes IPP
request from a client. This happens when in the PPD a dash is followed by a
digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
names generally never have double-dashes and also no dashes in the beginning or
the end of the name, I have modified the pwg_unppdize_name() function
appropriately.

Bug: https://github.com/apple/cups/issues/5740
Bug-Debian: https://bugs.debian.org/949315
---
 cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 5965e382b..6609f53e5 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 {
   char	*ptr,				/* Pointer into name buffer */
 	*end;				/* End of name buffer */
+  int   nodash = 1;                     /* Next char in IPP name cannot be a
+                                           dash (first char or after a dash) */
 
 
   if (_cups_islower(*ppd))
@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
     const char *ppdptr;			/* Pointer into PPD keyword */
 
     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
+      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
+	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
+	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
         break;
 
     if (!*ppdptr)
@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 
   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
   {
-    if (_cups_isalnum(*ppd) || *ppd == '-')
+    if (_cups_isalnum(*ppd))
+    {
       *ptr++ = (char)tolower(*ppd & 255);
-    else if (strchr(dashchars, *ppd))
-      *ptr++ = '-';
+      nodash = 0;
+    }
+    else if (*ppd == '-' || strchr(dashchars, *ppd))
+    {
+      if (nodash == 0)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
     else
+    {
       *ptr++ = *ppd;
+      nodash = 0;
+    }
 
-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
-	_cups_isupper(ppd[1]) && ptr < end)
-      *ptr++ = '-';
-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
-      *ptr++ = '-';
+    if (nodash == 0)
+    {
+      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+	  _cups_isupper(ppd[1]) && ptr < end)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
   }
 
+  /* Remove trailing dashes */
+  while (ptr > name && *(ptr - 1) == '-')
+    ptr --;
+
   *ptr = '\0';
 }
-- 
cgit v1.2.3


From 9787cae41d35825c3c406dede09589972ac60145 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Sat, 22 Feb 2020 14:28:58 +0100
Subject: Fix scheduler cupsd.conf load

When running it without arguments it is supposed to read the local CUPS's
cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
with a lot of HTML inside and this is due to the fact that when loading the
file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
admin.cgi program which returns the admin front page of the web admin
interface. cupsctl then tries to interpret that as the config file and displays
garbage. Even worse is if you run cupsctl with command line argument (one of
the five switches or a key=value pair) to change a setting. It seems to load
cupsd.conf again and gets again the HTML code of the web interface page.
cupsctl tries to interpret this again, producing garbage, adds the
user-supplied setting and writes all this back into cupsd.conf. Then it tries
to restart the scheduler which fails due to the broken config file.
The problem is that in the file scheduler/client.conf, in the function
get_file() the URI from the client is at first checked whether it begins with
"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
that the check for "/admin/conf/cupsd.conf" comes and is never reached.
I have changed the order now appropriately and this way cupsctl works again.
Note that the problem only occurs if the web interface is active and the
cupsctl command is issued by a non-root user.
This is a regression caused by issue #5652.

Bug: https://github.com/apple/cups/issues/5744
---
 scheduler/client.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/scheduler/client.c b/scheduler/client.c
index c2ee8f12a..54b841bc1 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
+  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+  {
+    strlcpy(filename, ConfigurationFile, len);
+
+    perm_check = 0;
+  }
+  else if (!strncmp(con->uri, "/admin/log/", 11))
+  {
+    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+      strlcpy(filename, AccessLog, len);
+    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+      strlcpy(filename, ErrorLog, len);
+    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+      strlcpy(filename, PageLog, len);
+    else
+      return (NULL);
+
+    perm_check = 0;
+  }
   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
   {
    /*
@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
-  {
-    strlcpy(filename, ConfigurationFile, len);
-
-    perm_check = 0;
-  }
-  else if (!strncmp(con->uri, "/admin/log/", 11))
-  {
-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
-      strlcpy(filename, AccessLog, len);
-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
-      strlcpy(filename, ErrorLog, len);
-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
-      strlcpy(filename, PageLog, len);
-    else
-      return (NULL);
-
-    perm_check = 0;
-  }
   else if (con->language)
   {
     snprintf(language, sizeof(language), "/%s", con->language->language);
-- 
cgit v1.2.3


From 5107f08a070547d6edcda2a00a71274fab7b520c Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Fri, 14 Feb 2020 16:48:49 +0100
Subject: Fix leakage of ppd

---
 ppdc/ppdc-import.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
index 04b587d7f..b4a834138 100644
--- a/ppdc/ppdc-import.cxx
+++ b/ppdc/ppdc-import.cxx
@@ -323,5 +323,8 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
     }
   }
 
+  if (ppd)
+    ppdClose(ppd);
+
   return (1);
 }
-- 
cgit v1.2.3


From 2e49e3d4209f039baa862b284ca5d49f9fbe0f7b Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From 2be5984ffcc18f667d47b481ec96fad76994e1d3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Patch-Name: tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From befbeb65a77a4fdcf77d791429a14ae227826eaa Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 57c68154dec7be553debe8d740d7ac1a513c1a08 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 708ef43fd53b1d65cc33ca2d1d7dd6e2679d9737 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 018d8301097d7e4424bf37f20f3fd1da7548d2d0 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 8 Feb 2020 11:49:07 +0100
Subject: Tests: ignore 'job held' message

Origin: vendor
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..dfa7f6a5c 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+       $GREP -v 'Job held by' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From b784124b1edb3238f984934a9533669d20b792e3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: https://bugs.debian.org/662996
Patch-Name: test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From e91cacf2f9999eb38ee23d347e5837503285357b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: https://bugs.debian.org/670878
Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index dfa7f6a5c..173fc86a7 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From 9a639d5352d4abbf98135290a3eee985b6fb6168 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From 840ac9532444d6f53d3a8b12a555a4a155d31881 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 173fc86a7..88bafb1a6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From 092a8c050bab439848c346d86d0ae07ace535608 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 88bafb1a6..d9b398575 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From 894a9a3cb1104c3b84aea409ece7b057584581db Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: Tests: Do not test pdftourf

 Revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream
Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index d9b398575..bc332fc61 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From 54be8131d3ed48c81b546979c9aa2f5379f9f3f8 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug-Debian: https://bugs.debian.org/640124
Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From a0621a2de826ddb8372cab0d7dab6067d03654c3 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index e341bdb00..545e0de93 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 081e5ea931c5b9ec9eda5411887b1277d2667a77 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://github.com/apple/cups/issues/3552
Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 3b71487ea6684aaa30d424a03076a2feac1d61db Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 545e0de93..f28c64afe 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 06a1c598f71a2bc08d94e041f6e6434636b65598 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: https://github.com/apple/cups/issues/2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From 27c8573eb6ce25897edaa5c3de6dac73642aa27f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From a232c481b0aea608edcd5d790020672e32571692 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 11:46:49 +0100
Subject: Add Requires=cups.socket to cups.service, to make sure they start in
 the right order

---
 scheduler/org.cups.cupsd.service.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index cd2334396..79d2c403e 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -2,6 +2,7 @@
 Description=CUPS Scheduler
 Documentation=man:cupsd(8)
 After=sssd.service
+Requires=cups.socket
 
 [Service]
 ExecStart=@sbindir@/cupsd -l
-- 
cgit v1.2.3


From 58fd9dd2bdfbccacc182ba74436661ff7fa40a4e Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 482c0848c7dc5ce442e728def2380fe58e563969 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From c9c4fcfe03602c2ceaee8017781c9e358a305cf5 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From 2b4693749a390f2a826b37ef04dfeb2072a12e9f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From ff5e793598641774e484d15b727f8a2a2c0aad34 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 17406f033ea146ea4fa5b46572a749d63fb99e82 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From 6cf50387a1bacc31c1961a0eddbaf644adf90b76 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 61c726756b9d59e4fd41aecc2a97d4536d010d45 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job"

It it is less confusing and a better default on most machines.
Amend documentation accordingly.

Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From b2021b4ee1c40ac080d8a04d20335a7d9c36db52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: https://bugs.debian.org/570157
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 59f32da2d83eb0526c5c8cb444cdfceab46d0fc9 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From c25a65bd1780ee34621aedcdd5cb42fb18a8c5d9 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index dbf3bda38..535b0b973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From c5f4d7338809e2d6458d4ed97c88216f3e165c2b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From ab85c2f396b675704bae7962597a7aecc65cef00 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 1 May 2020 15:25:52 +0200
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...-hyphen-used-as-minus-sign-manpage-errors.patch | 571 +++++++++++++++++++++
 ...0002-Install-root-backends-world-readable.patch |  66 +++
 ...s-with-multiple-files-or-multiple-formats.patch |  27 +
 ...-conversion-of-PPD-InputSlot-choice-names.patch |  99 ++++
 .../0005-Fix-scheduler-cupsd.conf-load.patch       |  86 ++++
 debian/patches/0006-Fix-leakage-of-ppd.patch       |  21 +
 ...sts-Ignore-warnings-from-colord-and-Avahi.patch |  28 +
 ...ignore-usb-dnssd-backend-unexpected-exits.patch |  31 ++
 .../0009-Tests-ignore-loadFile-failures.patch      |  25 +
 ...e-errors-triggered-on-ipv6-deprived-hosts.patch |  24 +
 ...re-the-failure-to-write-uncompressed-data.patch |  24 +
 .../0012-Tests-ignore-job-held-message.patch       |  21 +
 ...t-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch |  24 +
 ...sure-that-all-scheduled-jobs-are-finished.patch |  28 +
 ...-LC_-environment-variables-when-testing-n.patch |  31 ++
 ...27.0.0.1-instead-of-localhost-to-help-pbu.patch |  64 +++
 ...-LC_ALL-C-environment-variable-when-grepp.patch |  24 +
 .../patches/0018-Tests-Do-not-test-pdftourf.patch  |  68 +++
 ...d.conf.default-from-SERVERROOT-to-DATADIR.patch |  62 +++
 ...pport-Apple-AirPrint-printing-from-iPhone.patch |  91 ++++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  48 ++
 ...e-stamps-in-conffiles-to-avoid-ever-chang.patch |  67 +++
 ...t-write-VCS-tags-into-installed-conffiles.patch |  29 ++
 ...systemd-service-file-from-org.cups.cups.-.patch |  59 +++
 ...s-cups.socket-to-cups.service-to-make-sur.patch |  21 +
 ...host-names-for-broadcasting-print-queues-.patch |  25 +
 ...s-the-recommended-comments-of-the-NickNam.patch |  39 ++
 ...og-files-readable-to-group-adm-if-present.patch |  60 +++
 ...CUPS-own-log-rotating-as-the-system-alrea.patch |  25 +
 ...t-mess-with-the-permissions-of-cupsd.conf.patch |  26 +
 .../patches/0031-Show-compile-command-lines.patch  |  23 +
 ...32-Set-the-default-for-SyncOnClose-to-Yes.patch |  64 +++
 ...Set-default-job-error-policy-to-retry-job.patch |  73 +++
 ...rop-dangling-references-from-cups-lpd.man.patch |  24 +
 ...chitecture-in-cups-config-to-make-it-arch.patch |  49 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 ...rastructure-and-translations-for-manpages.patch | 342 ++++++++++++
 debian/patches/series                              |  37 ++
 38 files changed, 2536 insertions(+)
 create mode 100644 debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
 create mode 100644 debian/patches/0002-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
 create mode 100644 debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
 create mode 100644 debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
 create mode 100644 debian/patches/0006-Fix-leakage-of-ppd.patch
 create mode 100644 debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
 create mode 100644 debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
 create mode 100644 debian/patches/0009-Tests-ignore-loadFile-failures.patch
 create mode 100644 debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
 create mode 100644 debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
 create mode 100644 debian/patches/0012-Tests-ignore-job-held-message.patch
 create mode 100644 debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
 create mode 100644 debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
 create mode 100644 debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
 create mode 100644 debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
 create mode 100644 debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
 create mode 100644 debian/patches/0018-Tests-Do-not-test-pdftourf.patch
 create mode 100644 debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
 create mode 100644 debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
 create mode 100644 debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
 create mode 100644 debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
 create mode 100644 debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
 create mode 100644 debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
 create mode 100644 debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
 create mode 100644 debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
 create mode 100644 debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
 create mode 100644 debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
 create mode 100644 debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
 create mode 100644 debian/patches/0031-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
 create mode 100644 debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
 create mode 100644 debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
 create mode 100644 debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
new file mode 100644
index 000000000..ce9c33b51
--- /dev/null
+++ b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
@@ -0,0 +1,571 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://github.com/apple/cups/issues/4299
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/0002-Install-root-backends-world-readable.patch b/debian/patches/0002-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..def3900f7
--- /dev/null
+++ b/debian/patches/0002-Install-root-backends-world-readable.patch
@@ -0,0 +1,66 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: https://github.com/apple/cups/issues/2935
+Bug-Debian: https://bugs.debian.org/410171
+Patch-Name install-root-backends-world-readable.patch
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
new file mode 100644
index 000000000..07da4d2f7
--- /dev/null
+++ b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
@@ -0,0 +1,27 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://github.com/apple/cups/issues/4348
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
new file mode 100644
index 000000000..bc4db9fc9
--- /dev/null
+++ b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
@@ -0,0 +1,99 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Mon, 17 Feb 2020 09:05:58 +0100
+Subject: Fix conversion of PPD InputSlot choice names
+
+When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
+... in the InputSlot option CUPS translates these names to double-dashed IPP
+attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
+when passing a job to the printer with the IPP backend, making the printer
+ignore the tray choice, and also when answering a get-printer-attributes IPP
+request from a client. This happens when in the PPD a dash is followed by a
+digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
+whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
+names generally never have double-dashes and also no dashes in the beginning or
+the end of the name, I have modified the pwg_unppdize_name() function
+appropriately.
+
+Bug: https://github.com/apple/cups/issues/5740
+Bug-Debian: https://bugs.debian.org/949315
+---
+ cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 38 insertions(+), 9 deletions(-)
+
+diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
+index 5965e38..6609f53 100644
+--- a/cups/ppd-cache.c
++++ b/cups/ppd-cache.c
+@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ {
+   char	*ptr,				/* Pointer into name buffer */
+ 	*end;				/* End of name buffer */
++  int   nodash = 1;                     /* Next char in IPP name cannot be a
++                                           dash (first char or after a dash) */
+ 
+ 
+   if (_cups_islower(*ppd))
+@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+     const char *ppdptr;			/* Pointer into PPD keyword */
+ 
+     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
+-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
++      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
++	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
++	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
+         break;
+ 
+     if (!*ppdptr)
+@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ 
+   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
+   {
+-    if (_cups_isalnum(*ppd) || *ppd == '-')
++    if (_cups_isalnum(*ppd))
++    {
+       *ptr++ = (char)tolower(*ppd & 255);
+-    else if (strchr(dashchars, *ppd))
+-      *ptr++ = '-';
++      nodash = 0;
++    }
++    else if (*ppd == '-' || strchr(dashchars, *ppd))
++    {
++      if (nodash == 0)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+     else
++    {
+       *ptr++ = *ppd;
++      nodash = 0;
++    }
+ 
+-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+-	_cups_isupper(ppd[1]) && ptr < end)
+-      *ptr++ = '-';
+-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+-      *ptr++ = '-';
++    if (nodash == 0)
++    {
++      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
++	  _cups_isupper(ppd[1]) && ptr < end)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+   }
+ 
++  /* Remove trailing dashes */
++  while (ptr > name && *(ptr - 1) == '-')
++    ptr --;
++
+   *ptr = '\0';
+ }
diff --git a/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch b/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
new file mode 100644
index 000000000..d43601064
--- /dev/null
+++ b/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
@@ -0,0 +1,86 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Sat, 22 Feb 2020 14:28:58 +0100
+Subject: Fix scheduler cupsd.conf load
+
+When running it without arguments it is supposed to read the local CUPS's
+cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
+with a lot of HTML inside and this is due to the fact that when loading the
+file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
+admin.cgi program which returns the admin front page of the web admin
+interface. cupsctl then tries to interpret that as the config file and displays
+garbage. Even worse is if you run cupsctl with command line argument (one of
+the five switches or a key=value pair) to change a setting. It seems to load
+cupsd.conf again and gets again the HTML code of the web interface page.
+cupsctl tries to interpret this again, producing garbage, adds the
+user-supplied setting and writes all this back into cupsd.conf. Then it tries
+to restart the scheduler which fails due to the broken config file.
+The problem is that in the file scheduler/client.conf, in the function
+get_file() the URI from the client is at first checked whether it begins with
+"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
+that the check for "/admin/conf/cupsd.conf" comes and is never reached.
+I have changed the order now appropriately and this way cupsctl works again.
+Note that the problem only occurs if the web interface is active and the
+cupsctl command is issued by a non-root user.
+This is a regression caused by issue #5652.
+
+Bug: https://github.com/apple/cups/issues/5744
+---
+ scheduler/client.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/scheduler/client.c b/scheduler/client.c
+index c2ee8f1..54b841b 100644
+--- a/scheduler/client.c
++++ b/scheduler/client.c
+@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
++  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
++  {
++    strlcpy(filename, ConfigurationFile, len);
++
++    perm_check = 0;
++  }
++  else if (!strncmp(con->uri, "/admin/log/", 11))
++  {
++    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
++      strlcpy(filename, AccessLog, len);
++    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
++      strlcpy(filename, ErrorLog, len);
++    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
++      strlcpy(filename, PageLog, len);
++    else
++      return (NULL);
++
++    perm_check = 0;
++  }
+   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
+   {
+    /*
+@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
+-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+-  {
+-    strlcpy(filename, ConfigurationFile, len);
+-
+-    perm_check = 0;
+-  }
+-  else if (!strncmp(con->uri, "/admin/log/", 11))
+-  {
+-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+-      strlcpy(filename, AccessLog, len);
+-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+-      strlcpy(filename, ErrorLog, len);
+-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+-      strlcpy(filename, PageLog, len);
+-    else
+-      return (NULL);
+-
+-    perm_check = 0;
+-  }
+   else if (con->language)
+   {
+     snprintf(language, sizeof(language), "/%s", con->language->language);
diff --git a/debian/patches/0006-Fix-leakage-of-ppd.patch b/debian/patches/0006-Fix-leakage-of-ppd.patch
new file mode 100644
index 000000000..665395c3b
--- /dev/null
+++ b/debian/patches/0006-Fix-leakage-of-ppd.patch
@@ -0,0 +1,21 @@
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 14 Feb 2020 16:48:49 +0100
+Subject: Fix leakage of ppd
+
+---
+ ppdc/ppdc-import.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
+index 04b587d..b4a8341 100644
+--- a/ppdc/ppdc-import.cxx
++++ b/ppdc/ppdc-import.cxx
+@@ -323,5 +323,8 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
+     }
+   }
+ 
++  if (ppd)
++    ppdClose(ppd);
++
+   return (1);
+ }
diff --git a/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch b/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
new file mode 100644
index 000000000..a0c55e473
--- /dev/null
+++ b/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch b/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
new file mode 100644
index 000000000..21d84e708
--- /dev/null
+++ b/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/0009-Tests-ignore-loadFile-failures.patch b/debian/patches/0009-Tests-ignore-loadFile-failures.patch
new file mode 100644
index 000000000..6f592d7e7
--- /dev/null
+++ b/debian/patches/0009-Tests-ignore-loadFile-failures.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch b/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
new file mode 100644
index 000000000..8088de19f
--- /dev/null
+++ b/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch b/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
new file mode 100644
index 000000000..708c28dcf
--- /dev/null
+++ b/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0012-Tests-ignore-job-held-message.patch b/debian/patches/0012-Tests-ignore-job-held-message.patch
new file mode 100644
index 000000000..11f87ab7c
--- /dev/null
+++ b/debian/patches/0012-Tests-ignore-job-held-message.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 8 Feb 2020 11:49:07 +0100
+Subject: Tests: ignore 'job held' message
+
+Origin: vendor
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..dfa7f6a 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
++       $GREP -v 'Job held by' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch b/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
new file mode 100644
index 000000000..931feb799
--- /dev/null
+++ b/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: https://bugs.debian.org/662996
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch b/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
new file mode 100644
index 000000000..a677af5fb
--- /dev/null
+++ b/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: https://bugs.debian.org/670878
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index dfa7f6a..173fc86 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
diff --git a/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch b/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
new file mode 100644
index 000000000..9c3a8463e
--- /dev/null
+++ b/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch b/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
new file mode 100644
index 000000000..56e9a0710
--- /dev/null
+++ b/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 173fc86..88bafb1 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch b/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
new file mode 100644
index 000000000..1ba692070
--- /dev/null
+++ b/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 88bafb1..d9b3985 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/0018-Tests-Do-not-test-pdftourf.patch b/debian/patches/0018-Tests-Do-not-test-pdftourf.patch
new file mode 100644
index 000000000..08c1c73ec
--- /dev/null
+++ b/debian/patches/0018-Tests-Do-not-test-pdftourf.patch
@@ -0,0 +1,68 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: Tests: Do not test pdftourf
+
+ Revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index d9b3985..bc332fc 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch b/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
new file mode 100644
index 000000000..c785eb981
--- /dev/null
+++ b/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug-Debian: https://bugs.debian.org/640124
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch b/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
new file mode 100644
index 000000000..439e3e94d
--- /dev/null
+++ b/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
@@ -0,0 +1,91 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index e341bdb..545e0de 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..4389e274d
--- /dev/null
+++ b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,48 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://github.com/apple/cups/issues/3552
+Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch b/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
new file mode 100644
index 000000000..4bede9adc
--- /dev/null
+++ b/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
@@ -0,0 +1,67 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 545e0de..f28c64a 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch b/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
new file mode 100644
index 000000000..8ffa2bcb0
--- /dev/null
+++ b/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
@@ -0,0 +1,29 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: https://github.com/apple/cups/issues/2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch b/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch b/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
new file mode 100644
index 000000000..c7df689e2
--- /dev/null
+++ b/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Mon, 24 Feb 2020 11:46:49 +0100
+Subject: Add Requires=cups.socket to cups.service,
+ to make sure they start in the right order
+
+---
+ scheduler/org.cups.cupsd.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index cd23343..79d2c40 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -2,6 +2,7 @@
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+ After=sssd.service
++Requires=cups.socket
+ 
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
diff --git a/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch b/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
new file mode 100644
index 000000000..ef052d5ef
--- /dev/null
+++ b/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
@@ -0,0 +1,25 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch b/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
new file mode 100644
index 000000000..f30429b4c
--- /dev/null
+++ b/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
@@ -0,0 +1,39 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch b/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
new file mode 100644
index 000000000..7b93a2da1
--- /dev/null
+++ b/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
@@ -0,0 +1,60 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch b/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
new file mode 100644
index 000000000..c5e7fb2a1
--- /dev/null
+++ b/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch b/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
new file mode 100644
index 000000000..2057a4856
--- /dev/null
+++ b/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
@@ -0,0 +1,26 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0031-Show-compile-command-lines.patch b/debian/patches/0031-Show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/0031-Show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch b/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..40b9bbdfe
--- /dev/null
+++ b/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,64 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch b/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
new file mode 100644
index 000000000..80abeb3a8
--- /dev/null
+++ b/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
@@ -0,0 +1,73 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job"
+
+It it is less confusing and a better default on most machines.
+Amend documentation accordingly.
+
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch b/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
new file mode 100644
index 000000000..0853e7056
--- /dev/null
+++ b/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: https://bugs.debian.org/570157
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch b/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
new file mode 100644
index 000000000..142ad8a04
--- /dev/null
+++ b/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..f28bdca18
--- /dev/null
+++ b/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+Bug-Debian: https://bugs.debian.org/837936
+Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index dbf3bda..535b0b9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch b/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
new file mode 100644
index 000000000..ecfe58203
--- /dev/null
+++ b/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
@@ -0,0 +1,342 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..c0f691d53
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,37 @@
+0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
+0002-Install-root-backends-world-readable.patch
+0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
+0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
+0005-Fix-scheduler-cupsd.conf-load.patch
+0006-Fix-leakage-of-ppd.patch
+0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
+0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
+0009-Tests-ignore-loadFile-failures.patch
+0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
+0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
+0012-Tests-ignore-job-held-message.patch
+0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
+0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
+0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
+0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
+0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
+0018-Tests-Do-not-test-pdftourf.patch
+0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
+0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
+0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
+0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
+0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
+0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
+0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
+0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
+0028-Make-log-files-readable-to-group-adm-if-present.patch
+0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
+0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
+0031-Show-compile-command-lines.patch
+0032-Set-the-default-for-SyncOnClose-to-Yes.patch
+0033-Set-default-job-error-policy-to-retry-job.patch
+0034-Drop-dangling-references-from-cups-lpd.man.patch
+0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
+0036-Build-mantohtml-with-the-build-architecture-compiler.patch
+0037-po4a-infrastructure-and-translations-for-manpages.patch
-- 
cgit v1.2.3


From b9e6310eb7c39307ac7b7de788bead30abf3b2b1 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 1 May 2020 15:28:22 +0200
Subject: cups 2.3.3-1 Debian release

---
 debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b131bd017..5ec801301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-cups (2.3.3-1) UNRELEASED; urgency=medium
+cups (2.3.3-1) unstable; urgency=medium
 
-  * Update to new upstream version 2.3.3.
+  * New 2.3.3 upstream release, with the two -12 security patches
 
- -- Didier Raboud <odyx@debian.org>  Fri, 01 May 2020 15:25:01 +0200
+ -- Didier Raboud <odyx@debian.org>  Fri, 01 May 2020 15:28:22 +0200
 
 cups (2.3.1-12) unstable; urgency=medium
 
-- 
cgit v1.2.3


From 7386efba97e90dbc52d4d783a96d3985de253e0c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 29 Jul 2020 09:16:36 +0200
Subject: cups-daemon: Add ipp-usb Recommends

---
 debian/control | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 487703f61..547427dc0 100644
--- a/debian/control
+++ b/debian/control
@@ -147,7 +147,8 @@ Depends: ${shlibs:Depends},
          bc
 Recommends: colord,
             cups-browsed,
-            avahi-daemon
+            avahi-daemon,
+            ipp-usb,
 Suggests: cups,
           cups-bsd,
           cups-common (>= ${source:Version}),
-- 
cgit v1.2.3


From fc6a02c81b129b45e7729b96ab3939391b64e092 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 29 Jul 2020 09:17:45 +0200
Subject: Add missing build dependency on dh addon.

Changes-By: lintian-brush
Fixes: lintian: missing-build-dependency-for-dh_-command
See-also: https://lintian.debian.org/tags/missing-build-dependency-for-dh_-command.html
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 547427dc0..823bc120a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Section: net
 Priority: optional
 Build-Depends: debhelper-compat (= 12),
                dh-apparmor,
+               dh-strip-nondeterminism,
                patch,
                autoconf,
                automake,
-- 
cgit v1.2.3


From ebe5e8c3431781fea90100787ea990fdcb35c3af Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 29 Jul 2020 09:20:56 +0200
Subject: cups 2.3.3-2 Debian release

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5ec801301..dba360484 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.3-2) unstable; urgency=medium
+
+  * Add missing dh-strip-nondeterminism B-D
+  * cups-daemon: Add ipp-usb Recommends
+
+ -- Didier Raboud <odyx@debian.org>  Wed, 29 Jul 2020 09:20:56 +0200
+
 cups (2.3.3-1) unstable; urgency=medium
 
   * New 2.3.3 upstream release, with the two -12 security patches
-- 
cgit v1.2.3


From 5382e0788b9ce3885dff2a3a32c81f90e0d20a57 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://github.com/apple/cups/issues/4299
Patch-Name: manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From 342d0c6a5bc8b4374e18f516144a4bb666f8af64 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: https://github.com/apple/cups/issues/2935
Bug-Debian: https://bugs.debian.org/410171
Patch-Name install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From fecfc203c036604a611671bbfdbd4d390be9bbd6 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://github.com/apple/cups/issues/4348
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From b776a330987c7f6cfe9504e38f01f8820b37ec01 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Mon, 17 Feb 2020 09:05:58 +0100
Subject: Fix conversion of PPD InputSlot choice names

When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
... in the InputSlot option CUPS translates these names to double-dashed IPP
attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
when passing a job to the printer with the IPP backend, making the printer
ignore the tray choice, and also when answering a get-printer-attributes IPP
request from a client. This happens when in the PPD a dash is followed by a
digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
names generally never have double-dashes and also no dashes in the beginning or
the end of the name, I have modified the pwg_unppdize_name() function
appropriately.

Bug: https://github.com/apple/cups/issues/5740
Bug-Debian: https://bugs.debian.org/949315
---
 cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 5965e382b..6609f53e5 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 {
   char	*ptr,				/* Pointer into name buffer */
 	*end;				/* End of name buffer */
+  int   nodash = 1;                     /* Next char in IPP name cannot be a
+                                           dash (first char or after a dash) */
 
 
   if (_cups_islower(*ppd))
@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
     const char *ppdptr;			/* Pointer into PPD keyword */
 
     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
+      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
+	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
+	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
         break;
 
     if (!*ppdptr)
@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 
   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
   {
-    if (_cups_isalnum(*ppd) || *ppd == '-')
+    if (_cups_isalnum(*ppd))
+    {
       *ptr++ = (char)tolower(*ppd & 255);
-    else if (strchr(dashchars, *ppd))
-      *ptr++ = '-';
+      nodash = 0;
+    }
+    else if (*ppd == '-' || strchr(dashchars, *ppd))
+    {
+      if (nodash == 0)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
     else
+    {
       *ptr++ = *ppd;
+      nodash = 0;
+    }
 
-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
-	_cups_isupper(ppd[1]) && ptr < end)
-      *ptr++ = '-';
-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
-      *ptr++ = '-';
+    if (nodash == 0)
+    {
+      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+	  _cups_isupper(ppd[1]) && ptr < end)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
   }
 
+  /* Remove trailing dashes */
+  while (ptr > name && *(ptr - 1) == '-')
+    ptr --;
+
   *ptr = '\0';
 }
-- 
cgit v1.2.3


From a667c04b34d8c64745a9d0da4208bbaa2ea46145 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Sat, 22 Feb 2020 14:28:58 +0100
Subject: Fix scheduler cupsd.conf load

When running it without arguments it is supposed to read the local CUPS's
cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
with a lot of HTML inside and this is due to the fact that when loading the
file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
admin.cgi program which returns the admin front page of the web admin
interface. cupsctl then tries to interpret that as the config file and displays
garbage. Even worse is if you run cupsctl with command line argument (one of
the five switches or a key=value pair) to change a setting. It seems to load
cupsd.conf again and gets again the HTML code of the web interface page.
cupsctl tries to interpret this again, producing garbage, adds the
user-supplied setting and writes all this back into cupsd.conf. Then it tries
to restart the scheduler which fails due to the broken config file.
The problem is that in the file scheduler/client.conf, in the function
get_file() the URI from the client is at first checked whether it begins with
"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
that the check for "/admin/conf/cupsd.conf" comes and is never reached.
I have changed the order now appropriately and this way cupsctl works again.
Note that the problem only occurs if the web interface is active and the
cupsctl command is issued by a non-root user.
This is a regression caused by issue #5652.

Bug: https://github.com/apple/cups/issues/5744
---
 scheduler/client.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/scheduler/client.c b/scheduler/client.c
index c2ee8f12a..54b841bc1 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
+  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+  {
+    strlcpy(filename, ConfigurationFile, len);
+
+    perm_check = 0;
+  }
+  else if (!strncmp(con->uri, "/admin/log/", 11))
+  {
+    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+      strlcpy(filename, AccessLog, len);
+    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+      strlcpy(filename, ErrorLog, len);
+    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+      strlcpy(filename, PageLog, len);
+    else
+      return (NULL);
+
+    perm_check = 0;
+  }
   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
   {
    /*
@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
-  {
-    strlcpy(filename, ConfigurationFile, len);
-
-    perm_check = 0;
-  }
-  else if (!strncmp(con->uri, "/admin/log/", 11))
-  {
-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
-      strlcpy(filename, AccessLog, len);
-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
-      strlcpy(filename, ErrorLog, len);
-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
-      strlcpy(filename, PageLog, len);
-    else
-      return (NULL);
-
-    perm_check = 0;
-  }
   else if (con->language)
   {
     snprintf(language, sizeof(language), "/%s", con->language->language);
-- 
cgit v1.2.3


From 9c0b988c964161a40a5f8a078f5744803b5f0409 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Fri, 14 Feb 2020 16:48:49 +0100
Subject: Fix leakage of ppd

---
 ppdc/ppdc-import.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
index 04b587d7f..b4a834138 100644
--- a/ppdc/ppdc-import.cxx
+++ b/ppdc/ppdc-import.cxx
@@ -323,5 +323,8 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
     }
   }
 
+  if (ppd)
+    ppdClose(ppd);
+
   return (1);
 }
-- 
cgit v1.2.3


From 643adb3af532ed4af3c6a91511ffc49bdd267d8b Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From bbd9709f0ed4092530e603c3ca62d6a6431e7678 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Patch-Name: tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From da09b95b25d76e35d027ca6e94f34aef401fd8f2 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From cfcf2237ae83f556eb024bb1e546bec8a5d2a054 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 99250ded325c6fd94615b7624310c36534e21836 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 129158fd68a98cd9a35674699ed7140f54563109 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 8 Feb 2020 11:49:07 +0100
Subject: Tests: ignore 'job held' message

Origin: vendor
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..dfa7f6a5c 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+       $GREP -v 'Job held by' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 7dfc62efa61114a5163a229f980259f4b5a46a7e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: https://bugs.debian.org/662996
Patch-Name: test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 4217e5b5ad992df74555fb3036b735e91adc361b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: https://bugs.debian.org/670878
Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index dfa7f6a5c..173fc86a7 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From fe754c61f169d4cefb504939f71fd249bea0d2c3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From a560d49566f85a93ec31ed5ba3b9a6eb0ba22bd1 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 173fc86a7..88bafb1a6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From c60957ac8355755fbe03ec4750c4d56af70888fb Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 88bafb1a6..d9b398575 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From 9d50ad72220a866f1c4a5c8ad2d867744dd555c6 Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: Tests: Do not test pdftourf

 Revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream
Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index d9b398575..bc332fc61 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From cf99d19cdde035c068e90ede288752a5a4ef6a8d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug-Debian: https://bugs.debian.org/640124
Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From b207aeb5bc9651572f7679965a0073386ce7f742 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index e341bdb00..545e0de93 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 9e2814e68a27dbc595808a7671ffc6c89437973b Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://github.com/apple/cups/issues/3552
Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 5573851d6fa99fb46b0451fb2148eb99625dd1ee Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 545e0de93..f28c64afe 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 58aa6d56b185d169e1e2f5e69fcc6f1bd2432e5a Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: https://github.com/apple/cups/issues/2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From 315aedaafb28505cc882a6e99f0978fb0a18d9ee Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From 9da63fbd51bf832735348e6539ad30830d95cd21 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 11:46:49 +0100
Subject: Add Requires=cups.socket to cups.service, to make sure they start in
 the right order

---
 scheduler/org.cups.cupsd.service.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index cd2334396..79d2c403e 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -2,6 +2,7 @@
 Description=CUPS Scheduler
 Documentation=man:cupsd(8)
 After=sssd.service
+Requires=cups.socket
 
 [Service]
 ExecStart=@sbindir@/cupsd -l
-- 
cgit v1.2.3


From 562580ff140c9d6050b7f730720fa5383ec66739 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From c60130517f364eec202134912d00c9a7d8b31b71 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 282de893e22d3f1067ab678856008231a0cb154b Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From d4f3abfa8f8a2430435264d7cd609f9e8947803a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From f43626b9ec62f7701d6256d9aec6703debb8507a Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From dd04cb6375afd9a4c33b3bfc1555be1c591a3a39 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From 907e31beac4411e95ee402c29cb5f10286211d07 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 1605758a91df52b9705e79e50e4f77dd181194e3 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job"

It it is less confusing and a better default on most machines.
Amend documentation accordingly.

Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From 4412cfe38497b8ef72db8c822e427354fdc66706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: https://bugs.debian.org/570157
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 06d18484b827ac212e5bc7c28f0cd9ff61c7954e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 7cc2886b9beab62d28d661d66df53911108b25e5 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index dbf3bda38..535b0b973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 522ab59581f69039504dbc58c5afc5cafdd16f93 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 9f3961eee4da243dd5a4df2db058cd7b6a85a2a6 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 25 Aug 2020 21:34:00 +0200
Subject: Resolve DNS-SD-service-name-based URIs correctly also if they are
 from a service from localhost (like IPP-over-USB, Printer Application, ...)

---
 cups/http-support.c | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/cups/http-support.c b/cups/http-support.c
index 63175145e..8eabaee4c 100644
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -2483,7 +2483,7 @@ http_poll_cb(
 static void
 http_resolve_cb(
     AvahiServiceResolver   *resolver,	/* I - Resolver (unused) */
-    AvahiIfIndex           interface,	/* I - Interface index (unused) */
+    AvahiIfIndex           interface,	/* I - Interface index */
     AvahiProtocol          protocol,	/* I - Network protocol (unused) */
     AvahiResolverEvent     event,	/* I - Event (found, etc.) */
     const char             *name,	/* I - Service name */
@@ -2504,6 +2504,7 @@ http_resolve_cb(
 			*resdefault;	/* Default path */
   char			resource[257],	/* Remote path */
 			fqdn[256];	/* FQDN of the .local name */
+  char			ifname[IF_NAMESIZE]; /* Interface name */
   AvahiStringList	*pair;		/* Current TXT record key/value pair */
   char			*value;		/* Value for "rp" key */
   size_t		valueLen = 0;	/* Length of "rp" key */
@@ -2630,13 +2631,37 @@ http_resolve_cb(
     strlcpy(resource, resdefault, sizeof(resource));
   }
 
+ /*
+  * Check whether the interface is the loopback interface ("lo"), in this
+  * case set "localhost" as the host name
+  */
+
+  if (!if_indextoname((unsigned int)interface, ifname))
+  {
+    if (uribuf->options & _HTTP_RESOLVE_STDERR)
+      fprintf(stderr,
+	      "DEBUG: Unable to find interface name for interface %d: %s\n",
+	      interface, strerror(errno));
+    DEBUG_printf(("Unable to find interface name for interface %d: %s\n",
+		  interface, strerror(errno)));
+    ifname[0] = '\0';
+  }
+
+  if (!strcmp(ifname, "lo")) {
+    if (uribuf->options & _HTTP_RESOLVE_STDERR)
+      fputs("DEBUG: Service comes from loopback interface \"lo\", setting \"localhost\" as host name.\n",
+	    stderr);
+    DEBUG_puts("Service comes from loopback interface \"lo\", setting \"localhost\" as host name.");
+    hostTarget = "localhost";
+  }
+
  /*
   * Lookup the FQDN if needed...
   */
 
-  if ((uribuf->options & _HTTP_RESOLVE_FQDN) &&
-      (hostptr = hostTarget + strlen(hostTarget) - 6) > hostTarget &&
-      !_cups_strcasecmp(hostptr, ".local"))
+  else if ((uribuf->options & _HTTP_RESOLVE_FQDN) &&
+	   (hostptr = hostTarget + strlen(hostTarget) - 6) > hostTarget &&
+	   !_cups_strcasecmp(hostptr, ".local"))
   {
    /*
     * OK, we got a .local name but the caller needs a real domain.  Start by
-- 
cgit v1.2.3


From ca63c64143b0d42623c5d721e00375686afad847 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 25 Aug 2020 21:34:00 +0200
Subject: Make lpoptions list a printer's options correctly also when CUPS is
 running on an alternative port

---
 systemv/lpoptions.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c
index 08746c000..c55f28170 100644
--- a/systemv/lpoptions.c
+++ b/systemv/lpoptions.c
@@ -480,14 +480,13 @@ static void
 list_options(cups_dest_t *dest)		/* I - Destination to list */
 {
   http_t	*http;			/* Connection to destination */
-  char		resource[1024];		/* Resource path */
   int		i;			/* Looping var */
   const char	*filename;		/* PPD filename */
   ppd_file_t	*ppd;			/* PPD data */
   ppd_group_t	*group;			/* Current group */
 
 
-  if ((http = cupsConnectDest(dest, CUPS_DEST_FLAGS_NONE, 30000, NULL, resource, sizeof(resource), NULL, NULL)) == NULL)
+  if ((http = _cupsConnect()) == NULL)
   {
     _cupsLangPrintf(stderr, _("lpoptions: Unable to get PPD file for %s: %s"),
 		    dest->name, cupsLastErrorString());
-- 
cgit v1.2.3


From aa95b97e6787739780e488bb4b1a0dbf69c95ec2 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Wed, 26 Aug 2020 13:03:00 +0200
Subject: Fix fax numbers supplied via GTK print dialog, removing a "Custom."
 prefix; do not choke if the GTK dialog sends "None" as phone number or
 pre-dial prefix

---
 backend/ipp.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 13 deletions(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index a99079e05..d80d65084 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -2828,7 +2828,19 @@ new_request(
         */
 
         _httpDecodeURI(phone, keyword, sizeof(phone));
-        for (ptr = phone; *ptr;)
+	ptr = phone;
+
+	/* Weed out "Custom." in the beginning, this allows to put the
+	   "phone" option as custom string option into the PPD so that
+	   print dialogs not supporting fax display the option and
+	   allow entering the phone number. Print dialogs also send "None"
+	   if no phone number got entered, filter this, too. */
+	if (!_cups_strcasecmp(phone, "None"))
+	  *ptr = '\0';
+	if (!_cups_strncasecmp(phone, "Custom.", 7))
+	  _cups_strcpy(ptr, ptr + 7);
+
+        for (; *ptr;)
 	{
 	  if (*ptr == ',')
 	    *ptr = 'p';
@@ -2838,20 +2850,43 @@ new_request(
 	    ptr ++;
         }
 
-        httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri), "tel", NULL, NULL, 0, phone);
-        ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI, "destination-uri", NULL, tel_uri);
-
-	if ((keyword = cupsGetOption("faxPrefix", num_options,
-	                             options)) != NULL && *keyword)
-        {
-	  char	predial[1024];		/* Pre-dial string */
+	if (strlen(phone) > 0)
+	{
+	  httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri),
+			  "tel", NULL, NULL, 0, phone);
+	  ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI,
+		       "destination-uri", NULL, tel_uri);
+	  fprintf(stderr, "DEBUG: Faxing to phone %s; destination-uri: %s\n",
+		  phone, tel_uri);
+
+	  if ((keyword = cupsGetOption("faxPrefix", num_options,
+				       options)) != NULL && *keyword)
+	  {
+	    char	predial[1024];		/* Pre-dial string */
+
+	    _httpDecodeURI(predial, keyword, sizeof(predial));
+	    ptr = predial;
+	    if (!_cups_strcasecmp(ptr, "None"))
+	      *ptr = '\0';
+	    if (!_cups_strncasecmp(ptr, "Custom.", 7))
+	      ptr += 7;
+	    if (strlen(ptr) > 0)
+	    {
+	      ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT,
+			   "pre-dial-string", NULL, ptr);
+	      fprintf(stderr, "DEBUG: Pre-dialing %s; pre-dial-string: %s\n",
+		      ptr, ptr);
+	    }
+	    else
+	      fprintf(stderr, "WARNING: Pre-dial number for fax not valid! Sending fax without pre-dial number.\n");
+	  }
 
-	  _httpDecodeURI(predial, keyword, sizeof(predial));
-	  ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT, "pre-dial-string", NULL, predial);
+	  ippAddCollection(request, IPP_TAG_JOB, "destination-uris",
+			   destination);
+	  ippDelete(destination);
 	}
-
-        ippAddCollection(request, IPP_TAG_JOB, "destination-uris", destination);
-        ippDelete(destination);
+	else
+	  fprintf(stderr, "ERROR: Phone number for fax not valid! Fax cannot be sent.\n");
       }
     }
     else
-- 
cgit v1.2.3


From f67e06ee5e76c5742ab3af23da66e0fc923596a0 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Thu, 27 Aug 2020 10:22:00 +0200
Subject: Let the rastertopwg filter check rounding errors when calculating the
 page geometry

---
 filter/rastertopwg.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c
index 1e63e4ec0..bffd89a1f 100644
--- a/filter/rastertopwg.c
+++ b/filter/rastertopwg.c
@@ -41,8 +41,10 @@ main(int  argc,				/* I - Number of command-line args */
 			page_top,	/* Top margin */
 			page_bottom,	/* Bottom margin */
 			page_left,	/* Left margin */
+			page_right,	/* Right margin */
 			linesize,	/* Bytes per line */
 			lineoffset;	/* Offset into line */
+  int			tmp;
   unsigned char		white;		/* White pixel */
   ppd_file_t		*ppd;		/* PPD file */
   ppd_attr_t		*back;		/* cupsBackSide attribute */
@@ -120,14 +122,30 @@ main(int  argc,				/* I - Number of command-line args */
     fprintf(stderr, "PAGE: %d %d\n", page, inheader.NumCopies);
 
     page_width  = (unsigned)(inheader.cupsPageSize[0] * inheader.HWResolution[0] / 72.0);
+    if (page_width < inheader.cupsWidth &&
+	page_width >= inheader.cupsWidth - 2)
+      page_width = (unsigned)inheader.cupsWidth;
     page_height = (unsigned)(inheader.cupsPageSize[1] * inheader.HWResolution[1] / 72.0);
+    if (page_height < inheader.cupsHeight &&
+	page_height >= inheader.cupsHeight - 2)
+      page_height = (unsigned)inheader.cupsHeight;
     page_left   = (unsigned)(inheader.cupsImagingBBox[0] * inheader.HWResolution[0] / 72.0);
     page_bottom = (unsigned)(inheader.cupsImagingBBox[1] * inheader.HWResolution[1] / 72.0);
-    page_top    = page_height - page_bottom - inheader.cupsHeight;
+    tmp        = (int)(page_height - page_bottom - inheader.cupsHeight);
+    if (tmp < 0 && tmp >= -2) /* Rounding error */
+      page_top = 0;
+    else
+      page_top = (unsigned)tmp;
+    tmp        = (int)(page_width - page_left - inheader.cupsWidth);
+    if (tmp < 0 && tmp >= -2) /* Rounding error */
+      page_right = 0;
+    else
+      page_right = (unsigned)tmp;
     linesize    = (page_width * inheader.cupsBitsPerPixel + 7) / 8;
     lineoffset  = page_left * inheader.cupsBitsPerPixel / 8; /* Round down */
 
-    if (page_left > page_width || page_top > page_height || page_bottom > page_height)
+    fprintf(stderr, "DEBUG: In pixels: Width: %u  Height: %u  Left: %u  Right:  %u  Top: %u  Bottom: %u\n", page_width, page_height, page_left, page_right, page_top, page_bottom);
+    if (page_left > page_width || page_top > page_height || page_bottom > page_height || page_right > page_width)
     {
       _cupsLangPrintFilter(stderr, "ERROR", _("Unsupported raster data."));
       fprintf(stderr, "DEBUG: Bad bottom/left/top margin on page %d.\n", page);
@@ -291,8 +309,7 @@ main(int  argc,				/* I - Number of command-line args */
 	  outheader.cupsInteger[1] = ~0U;/* CrossFeedTransform */
 	  outheader.cupsInteger[2] = 1;	/* FeedTransform */
 
-	  outheader.cupsInteger[3] = page_width - page_left -
-	                             inheader.cupsWidth;
+	  outheader.cupsInteger[3] = page_right;
 					/* ImageBoxLeft */
 	  outheader.cupsInteger[4] = page_top;
 					/* ImageBoxTop */
@@ -355,8 +372,7 @@ main(int  argc,				/* I - Number of command-line args */
 	  outheader.cupsInteger[1] = ~0U;/* CrossFeedTransform */
 	  outheader.cupsInteger[2] = ~0U;/* FeedTransform */
 
-	  outheader.cupsInteger[3] = page_width - page_left -
-	                             inheader.cupsWidth;
+	  outheader.cupsInteger[3] = page_right;
 					/* ImageBoxLeft */
 	  outheader.cupsInteger[4] = page_bottom;
 					/* ImageBoxTop */
-- 
cgit v1.2.3


From 485655e4b05fe2dd871db811097721e08de4f93c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 3 Sep 2020 09:01:24 +0200
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...-hyphen-used-as-minus-sign-manpage-errors.patch | 571 +++++++++++++++++++++
 ...0002-Install-root-backends-world-readable.patch |  66 +++
 ...s-with-multiple-files-or-multiple-formats.patch |  27 +
 ...-conversion-of-PPD-InputSlot-choice-names.patch |  99 ++++
 .../0005-Fix-scheduler-cupsd.conf-load.patch       |  86 ++++
 debian/patches/0006-Fix-leakage-of-ppd.patch       |  21 +
 ...sts-Ignore-warnings-from-colord-and-Avahi.patch |  28 +
 ...ignore-usb-dnssd-backend-unexpected-exits.patch |  31 ++
 .../0009-Tests-ignore-loadFile-failures.patch      |  25 +
 ...e-errors-triggered-on-ipv6-deprived-hosts.patch |  24 +
 ...re-the-failure-to-write-uncompressed-data.patch |  24 +
 .../0012-Tests-ignore-job-held-message.patch       |  21 +
 ...t-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch |  24 +
 ...sure-that-all-scheduled-jobs-are-finished.patch |  28 +
 ...-LC_-environment-variables-when-testing-n.patch |  31 ++
 ...27.0.0.1-instead-of-localhost-to-help-pbu.patch |  64 +++
 ...-LC_ALL-C-environment-variable-when-grepp.patch |  24 +
 .../patches/0018-Tests-Do-not-test-pdftourf.patch  |  68 +++
 ...d.conf.default-from-SERVERROOT-to-DATADIR.patch |  62 +++
 ...pport-Apple-AirPrint-printing-from-iPhone.patch |  91 ++++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  48 ++
 ...e-stamps-in-conffiles-to-avoid-ever-chang.patch |  67 +++
 ...t-write-VCS-tags-into-installed-conffiles.patch |  29 ++
 ...systemd-service-file-from-org.cups.cups.-.patch |  59 +++
 ...s-cups.socket-to-cups.service-to-make-sur.patch |  21 +
 ...host-names-for-broadcasting-print-queues-.patch |  25 +
 ...s-the-recommended-comments-of-the-NickNam.patch |  39 ++
 ...og-files-readable-to-group-adm-if-present.patch |  60 +++
 ...CUPS-own-log-rotating-as-the-system-alrea.patch |  25 +
 ...t-mess-with-the-permissions-of-cupsd.conf.patch |  26 +
 .../patches/0031-Show-compile-command-lines.patch  |  23 +
 ...32-Set-the-default-for-SyncOnClose-to-Yes.patch |  64 +++
 ...Set-default-job-error-policy-to-retry-job.patch |  73 +++
 ...rop-dangling-references-from-cups-lpd.man.patch |  24 +
 ...chitecture-in-cups-config-to-make-it-arch.patch |  49 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 ...rastructure-and-translations-for-manpages.patch | 342 ++++++++++++
 ...-SD-service-name-based-URIs-correctly-als.patch |  71 +++
 ...ons-list-a-printer-s-options-correctly-al.patch |  29 ++
 ...bers-supplied-via-GTK-print-dialog-removi.patch |  92 ++++
 ...tertopwg-filter-check-rounding-errors-whe.patch |  77 +++
 debian/patches/series                              |  41 ++
 42 files changed, 2809 insertions(+)
 create mode 100644 debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
 create mode 100644 debian/patches/0002-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
 create mode 100644 debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
 create mode 100644 debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
 create mode 100644 debian/patches/0006-Fix-leakage-of-ppd.patch
 create mode 100644 debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
 create mode 100644 debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
 create mode 100644 debian/patches/0009-Tests-ignore-loadFile-failures.patch
 create mode 100644 debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
 create mode 100644 debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
 create mode 100644 debian/patches/0012-Tests-ignore-job-held-message.patch
 create mode 100644 debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
 create mode 100644 debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
 create mode 100644 debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
 create mode 100644 debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
 create mode 100644 debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
 create mode 100644 debian/patches/0018-Tests-Do-not-test-pdftourf.patch
 create mode 100644 debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
 create mode 100644 debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
 create mode 100644 debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
 create mode 100644 debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
 create mode 100644 debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
 create mode 100644 debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
 create mode 100644 debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
 create mode 100644 debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
 create mode 100644 debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
 create mode 100644 debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
 create mode 100644 debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
 create mode 100644 debian/patches/0031-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
 create mode 100644 debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
 create mode 100644 debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
 create mode 100644 debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
 create mode 100644 debian/patches/0038-Resolve-DNS-SD-service-name-based-URIs-correctly-als.patch
 create mode 100644 debian/patches/0039-Make-lpoptions-list-a-printer-s-options-correctly-al.patch
 create mode 100644 debian/patches/0040-Fix-fax-numbers-supplied-via-GTK-print-dialog-removi.patch
 create mode 100644 debian/patches/0041-Let-the-rastertopwg-filter-check-rounding-errors-whe.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
new file mode 100644
index 000000000..ce9c33b51
--- /dev/null
+++ b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
@@ -0,0 +1,571 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://github.com/apple/cups/issues/4299
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/0002-Install-root-backends-world-readable.patch b/debian/patches/0002-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..def3900f7
--- /dev/null
+++ b/debian/patches/0002-Install-root-backends-world-readable.patch
@@ -0,0 +1,66 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: https://github.com/apple/cups/issues/2935
+Bug-Debian: https://bugs.debian.org/410171
+Patch-Name install-root-backends-world-readable.patch
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
new file mode 100644
index 000000000..07da4d2f7
--- /dev/null
+++ b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
@@ -0,0 +1,27 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://github.com/apple/cups/issues/4348
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
new file mode 100644
index 000000000..bc4db9fc9
--- /dev/null
+++ b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
@@ -0,0 +1,99 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Mon, 17 Feb 2020 09:05:58 +0100
+Subject: Fix conversion of PPD InputSlot choice names
+
+When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
+... in the InputSlot option CUPS translates these names to double-dashed IPP
+attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
+when passing a job to the printer with the IPP backend, making the printer
+ignore the tray choice, and also when answering a get-printer-attributes IPP
+request from a client. This happens when in the PPD a dash is followed by a
+digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
+whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
+names generally never have double-dashes and also no dashes in the beginning or
+the end of the name, I have modified the pwg_unppdize_name() function
+appropriately.
+
+Bug: https://github.com/apple/cups/issues/5740
+Bug-Debian: https://bugs.debian.org/949315
+---
+ cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 38 insertions(+), 9 deletions(-)
+
+diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
+index 5965e38..6609f53 100644
+--- a/cups/ppd-cache.c
++++ b/cups/ppd-cache.c
+@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ {
+   char	*ptr,				/* Pointer into name buffer */
+ 	*end;				/* End of name buffer */
++  int   nodash = 1;                     /* Next char in IPP name cannot be a
++                                           dash (first char or after a dash) */
+ 
+ 
+   if (_cups_islower(*ppd))
+@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+     const char *ppdptr;			/* Pointer into PPD keyword */
+ 
+     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
+-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
++      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
++	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
++	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
+         break;
+ 
+     if (!*ppdptr)
+@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ 
+   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
+   {
+-    if (_cups_isalnum(*ppd) || *ppd == '-')
++    if (_cups_isalnum(*ppd))
++    {
+       *ptr++ = (char)tolower(*ppd & 255);
+-    else if (strchr(dashchars, *ppd))
+-      *ptr++ = '-';
++      nodash = 0;
++    }
++    else if (*ppd == '-' || strchr(dashchars, *ppd))
++    {
++      if (nodash == 0)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+     else
++    {
+       *ptr++ = *ppd;
++      nodash = 0;
++    }
+ 
+-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+-	_cups_isupper(ppd[1]) && ptr < end)
+-      *ptr++ = '-';
+-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+-      *ptr++ = '-';
++    if (nodash == 0)
++    {
++      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
++	  _cups_isupper(ppd[1]) && ptr < end)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+   }
+ 
++  /* Remove trailing dashes */
++  while (ptr > name && *(ptr - 1) == '-')
++    ptr --;
++
+   *ptr = '\0';
+ }
diff --git a/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch b/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
new file mode 100644
index 000000000..d43601064
--- /dev/null
+++ b/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
@@ -0,0 +1,86 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Sat, 22 Feb 2020 14:28:58 +0100
+Subject: Fix scheduler cupsd.conf load
+
+When running it without arguments it is supposed to read the local CUPS's
+cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
+with a lot of HTML inside and this is due to the fact that when loading the
+file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
+admin.cgi program which returns the admin front page of the web admin
+interface. cupsctl then tries to interpret that as the config file and displays
+garbage. Even worse is if you run cupsctl with command line argument (one of
+the five switches or a key=value pair) to change a setting. It seems to load
+cupsd.conf again and gets again the HTML code of the web interface page.
+cupsctl tries to interpret this again, producing garbage, adds the
+user-supplied setting and writes all this back into cupsd.conf. Then it tries
+to restart the scheduler which fails due to the broken config file.
+The problem is that in the file scheduler/client.conf, in the function
+get_file() the URI from the client is at first checked whether it begins with
+"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
+that the check for "/admin/conf/cupsd.conf" comes and is never reached.
+I have changed the order now appropriately and this way cupsctl works again.
+Note that the problem only occurs if the web interface is active and the
+cupsctl command is issued by a non-root user.
+This is a regression caused by issue #5652.
+
+Bug: https://github.com/apple/cups/issues/5744
+---
+ scheduler/client.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/scheduler/client.c b/scheduler/client.c
+index c2ee8f1..54b841b 100644
+--- a/scheduler/client.c
++++ b/scheduler/client.c
+@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
++  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
++  {
++    strlcpy(filename, ConfigurationFile, len);
++
++    perm_check = 0;
++  }
++  else if (!strncmp(con->uri, "/admin/log/", 11))
++  {
++    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
++      strlcpy(filename, AccessLog, len);
++    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
++      strlcpy(filename, ErrorLog, len);
++    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
++      strlcpy(filename, PageLog, len);
++    else
++      return (NULL);
++
++    perm_check = 0;
++  }
+   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
+   {
+    /*
+@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
+-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+-  {
+-    strlcpy(filename, ConfigurationFile, len);
+-
+-    perm_check = 0;
+-  }
+-  else if (!strncmp(con->uri, "/admin/log/", 11))
+-  {
+-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+-      strlcpy(filename, AccessLog, len);
+-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+-      strlcpy(filename, ErrorLog, len);
+-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+-      strlcpy(filename, PageLog, len);
+-    else
+-      return (NULL);
+-
+-    perm_check = 0;
+-  }
+   else if (con->language)
+   {
+     snprintf(language, sizeof(language), "/%s", con->language->language);
diff --git a/debian/patches/0006-Fix-leakage-of-ppd.patch b/debian/patches/0006-Fix-leakage-of-ppd.patch
new file mode 100644
index 000000000..665395c3b
--- /dev/null
+++ b/debian/patches/0006-Fix-leakage-of-ppd.patch
@@ -0,0 +1,21 @@
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 14 Feb 2020 16:48:49 +0100
+Subject: Fix leakage of ppd
+
+---
+ ppdc/ppdc-import.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
+index 04b587d..b4a8341 100644
+--- a/ppdc/ppdc-import.cxx
++++ b/ppdc/ppdc-import.cxx
+@@ -323,5 +323,8 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
+     }
+   }
+ 
++  if (ppd)
++    ppdClose(ppd);
++
+   return (1);
+ }
diff --git a/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch b/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
new file mode 100644
index 000000000..a0c55e473
--- /dev/null
+++ b/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch b/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
new file mode 100644
index 000000000..21d84e708
--- /dev/null
+++ b/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/0009-Tests-ignore-loadFile-failures.patch b/debian/patches/0009-Tests-ignore-loadFile-failures.patch
new file mode 100644
index 000000000..6f592d7e7
--- /dev/null
+++ b/debian/patches/0009-Tests-ignore-loadFile-failures.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch b/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
new file mode 100644
index 000000000..8088de19f
--- /dev/null
+++ b/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch b/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
new file mode 100644
index 000000000..708c28dcf
--- /dev/null
+++ b/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0012-Tests-ignore-job-held-message.patch b/debian/patches/0012-Tests-ignore-job-held-message.patch
new file mode 100644
index 000000000..11f87ab7c
--- /dev/null
+++ b/debian/patches/0012-Tests-ignore-job-held-message.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 8 Feb 2020 11:49:07 +0100
+Subject: Tests: ignore 'job held' message
+
+Origin: vendor
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..dfa7f6a 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
++       $GREP -v 'Job held by' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch b/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
new file mode 100644
index 000000000..931feb799
--- /dev/null
+++ b/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: https://bugs.debian.org/662996
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch b/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
new file mode 100644
index 000000000..a677af5fb
--- /dev/null
+++ b/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: https://bugs.debian.org/670878
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index dfa7f6a..173fc86 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
diff --git a/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch b/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
new file mode 100644
index 000000000..9c3a8463e
--- /dev/null
+++ b/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch b/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
new file mode 100644
index 000000000..56e9a0710
--- /dev/null
+++ b/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 173fc86..88bafb1 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch b/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
new file mode 100644
index 000000000..1ba692070
--- /dev/null
+++ b/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 88bafb1..d9b3985 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/0018-Tests-Do-not-test-pdftourf.patch b/debian/patches/0018-Tests-Do-not-test-pdftourf.patch
new file mode 100644
index 000000000..08c1c73ec
--- /dev/null
+++ b/debian/patches/0018-Tests-Do-not-test-pdftourf.patch
@@ -0,0 +1,68 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: Tests: Do not test pdftourf
+
+ Revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index d9b3985..bc332fc 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch b/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
new file mode 100644
index 000000000..c785eb981
--- /dev/null
+++ b/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug-Debian: https://bugs.debian.org/640124
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch b/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
new file mode 100644
index 000000000..439e3e94d
--- /dev/null
+++ b/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
@@ -0,0 +1,91 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index e341bdb..545e0de 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..4389e274d
--- /dev/null
+++ b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,48 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://github.com/apple/cups/issues/3552
+Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch b/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
new file mode 100644
index 000000000..4bede9adc
--- /dev/null
+++ b/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
@@ -0,0 +1,67 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 545e0de..f28c64a 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch b/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
new file mode 100644
index 000000000..8ffa2bcb0
--- /dev/null
+++ b/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
@@ -0,0 +1,29 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: https://github.com/apple/cups/issues/2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch b/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch b/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
new file mode 100644
index 000000000..c7df689e2
--- /dev/null
+++ b/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Mon, 24 Feb 2020 11:46:49 +0100
+Subject: Add Requires=cups.socket to cups.service,
+ to make sure they start in the right order
+
+---
+ scheduler/org.cups.cupsd.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index cd23343..79d2c40 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -2,6 +2,7 @@
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+ After=sssd.service
++Requires=cups.socket
+ 
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
diff --git a/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch b/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
new file mode 100644
index 000000000..ef052d5ef
--- /dev/null
+++ b/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
@@ -0,0 +1,25 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch b/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
new file mode 100644
index 000000000..f30429b4c
--- /dev/null
+++ b/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
@@ -0,0 +1,39 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch b/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
new file mode 100644
index 000000000..7b93a2da1
--- /dev/null
+++ b/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
@@ -0,0 +1,60 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch b/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
new file mode 100644
index 000000000..c5e7fb2a1
--- /dev/null
+++ b/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch b/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
new file mode 100644
index 000000000..2057a4856
--- /dev/null
+++ b/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
@@ -0,0 +1,26 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0031-Show-compile-command-lines.patch b/debian/patches/0031-Show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/0031-Show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch b/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..40b9bbdfe
--- /dev/null
+++ b/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,64 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch b/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
new file mode 100644
index 000000000..80abeb3a8
--- /dev/null
+++ b/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
@@ -0,0 +1,73 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job"
+
+It it is less confusing and a better default on most machines.
+Amend documentation accordingly.
+
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch b/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
new file mode 100644
index 000000000..0853e7056
--- /dev/null
+++ b/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: https://bugs.debian.org/570157
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch b/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
new file mode 100644
index 000000000..142ad8a04
--- /dev/null
+++ b/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..f28bdca18
--- /dev/null
+++ b/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+Bug-Debian: https://bugs.debian.org/837936
+Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index dbf3bda..535b0b9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch b/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
new file mode 100644
index 000000000..ecfe58203
--- /dev/null
+++ b/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
@@ -0,0 +1,342 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/0038-Resolve-DNS-SD-service-name-based-URIs-correctly-als.patch b/debian/patches/0038-Resolve-DNS-SD-service-name-based-URIs-correctly-als.patch
new file mode 100644
index 000000000..6c6af1947
--- /dev/null
+++ b/debian/patches/0038-Resolve-DNS-SD-service-name-based-URIs-correctly-als.patch
@@ -0,0 +1,71 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 25 Aug 2020 21:34:00 +0200
+Subject: Resolve DNS-SD-service-name-based URIs correctly also if they are
+ from a service from localhost (like IPP-over-USB, Printer Application, ...)
+
+---
+ cups/http-support.c | 33 +++++++++++++++++++++++++++++----
+ 1 file changed, 29 insertions(+), 4 deletions(-)
+
+diff --git a/cups/http-support.c b/cups/http-support.c
+index 6317514..8eabaee 100644
+--- a/cups/http-support.c
++++ b/cups/http-support.c
+@@ -2483,7 +2483,7 @@ http_poll_cb(
+ static void
+ http_resolve_cb(
+     AvahiServiceResolver   *resolver,	/* I - Resolver (unused) */
+-    AvahiIfIndex           interface,	/* I - Interface index (unused) */
++    AvahiIfIndex           interface,	/* I - Interface index */
+     AvahiProtocol          protocol,	/* I - Network protocol (unused) */
+     AvahiResolverEvent     event,	/* I - Event (found, etc.) */
+     const char             *name,	/* I - Service name */
+@@ -2504,6 +2504,7 @@ http_resolve_cb(
+ 			*resdefault;	/* Default path */
+   char			resource[257],	/* Remote path */
+ 			fqdn[256];	/* FQDN of the .local name */
++  char			ifname[IF_NAMESIZE]; /* Interface name */
+   AvahiStringList	*pair;		/* Current TXT record key/value pair */
+   char			*value;		/* Value for "rp" key */
+   size_t		valueLen = 0;	/* Length of "rp" key */
+@@ -2630,13 +2631,37 @@ http_resolve_cb(
+     strlcpy(resource, resdefault, sizeof(resource));
+   }
+ 
++ /*
++  * Check whether the interface is the loopback interface ("lo"), in this
++  * case set "localhost" as the host name
++  */
++
++  if (!if_indextoname((unsigned int)interface, ifname))
++  {
++    if (uribuf->options & _HTTP_RESOLVE_STDERR)
++      fprintf(stderr,
++	      "DEBUG: Unable to find interface name for interface %d: %s\n",
++	      interface, strerror(errno));
++    DEBUG_printf(("Unable to find interface name for interface %d: %s\n",
++		  interface, strerror(errno)));
++    ifname[0] = '\0';
++  }
++
++  if (!strcmp(ifname, "lo")) {
++    if (uribuf->options & _HTTP_RESOLVE_STDERR)
++      fputs("DEBUG: Service comes from loopback interface \"lo\", setting \"localhost\" as host name.\n",
++	    stderr);
++    DEBUG_puts("Service comes from loopback interface \"lo\", setting \"localhost\" as host name.");
++    hostTarget = "localhost";
++  }
++
+  /*
+   * Lookup the FQDN if needed...
+   */
+ 
+-  if ((uribuf->options & _HTTP_RESOLVE_FQDN) &&
+-      (hostptr = hostTarget + strlen(hostTarget) - 6) > hostTarget &&
+-      !_cups_strcasecmp(hostptr, ".local"))
++  else if ((uribuf->options & _HTTP_RESOLVE_FQDN) &&
++	   (hostptr = hostTarget + strlen(hostTarget) - 6) > hostTarget &&
++	   !_cups_strcasecmp(hostptr, ".local"))
+   {
+    /*
+     * OK, we got a .local name but the caller needs a real domain.  Start by
diff --git a/debian/patches/0039-Make-lpoptions-list-a-printer-s-options-correctly-al.patch b/debian/patches/0039-Make-lpoptions-list-a-printer-s-options-correctly-al.patch
new file mode 100644
index 000000000..8e13e4967
--- /dev/null
+++ b/debian/patches/0039-Make-lpoptions-list-a-printer-s-options-correctly-al.patch
@@ -0,0 +1,29 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 25 Aug 2020 21:34:00 +0200
+Subject: Make lpoptions list a printer's options correctly also when CUPS is
+ running on an alternative port
+
+---
+ systemv/lpoptions.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c
+index 08746c0..c55f281 100644
+--- a/systemv/lpoptions.c
++++ b/systemv/lpoptions.c
+@@ -480,14 +480,13 @@ static void
+ list_options(cups_dest_t *dest)		/* I - Destination to list */
+ {
+   http_t	*http;			/* Connection to destination */
+-  char		resource[1024];		/* Resource path */
+   int		i;			/* Looping var */
+   const char	*filename;		/* PPD filename */
+   ppd_file_t	*ppd;			/* PPD data */
+   ppd_group_t	*group;			/* Current group */
+ 
+ 
+-  if ((http = cupsConnectDest(dest, CUPS_DEST_FLAGS_NONE, 30000, NULL, resource, sizeof(resource), NULL, NULL)) == NULL)
++  if ((http = _cupsConnect()) == NULL)
+   {
+     _cupsLangPrintf(stderr, _("lpoptions: Unable to get PPD file for %s: %s"),
+ 		    dest->name, cupsLastErrorString());
diff --git a/debian/patches/0040-Fix-fax-numbers-supplied-via-GTK-print-dialog-removi.patch b/debian/patches/0040-Fix-fax-numbers-supplied-via-GTK-print-dialog-removi.patch
new file mode 100644
index 000000000..f4fd20444
--- /dev/null
+++ b/debian/patches/0040-Fix-fax-numbers-supplied-via-GTK-print-dialog-removi.patch
@@ -0,0 +1,92 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Wed, 26 Aug 2020 13:03:00 +0200
+Subject: Fix fax numbers supplied via GTK print dialog,
+ removing a "Custom." prefix;
+ do not choke if the GTK dialog sends "None" as phone number or pre-dial
+ prefix
+
+---
+ backend/ipp.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 48 insertions(+), 13 deletions(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index a99079e..d80d650 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -2828,7 +2828,19 @@ new_request(
+         */
+ 
+         _httpDecodeURI(phone, keyword, sizeof(phone));
+-        for (ptr = phone; *ptr;)
++	ptr = phone;
++
++	/* Weed out "Custom." in the beginning, this allows to put the
++	   "phone" option as custom string option into the PPD so that
++	   print dialogs not supporting fax display the option and
++	   allow entering the phone number. Print dialogs also send "None"
++	   if no phone number got entered, filter this, too. */
++	if (!_cups_strcasecmp(phone, "None"))
++	  *ptr = '\0';
++	if (!_cups_strncasecmp(phone, "Custom.", 7))
++	  _cups_strcpy(ptr, ptr + 7);
++
++        for (; *ptr;)
+ 	{
+ 	  if (*ptr == ',')
+ 	    *ptr = 'p';
+@@ -2838,20 +2850,43 @@ new_request(
+ 	    ptr ++;
+         }
+ 
+-        httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri), "tel", NULL, NULL, 0, phone);
+-        ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI, "destination-uri", NULL, tel_uri);
+-
+-	if ((keyword = cupsGetOption("faxPrefix", num_options,
+-	                             options)) != NULL && *keyword)
+-        {
+-	  char	predial[1024];		/* Pre-dial string */
++	if (strlen(phone) > 0)
++	{
++	  httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri),
++			  "tel", NULL, NULL, 0, phone);
++	  ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI,
++		       "destination-uri", NULL, tel_uri);
++	  fprintf(stderr, "DEBUG: Faxing to phone %s; destination-uri: %s\n",
++		  phone, tel_uri);
++
++	  if ((keyword = cupsGetOption("faxPrefix", num_options,
++				       options)) != NULL && *keyword)
++	  {
++	    char	predial[1024];		/* Pre-dial string */
++
++	    _httpDecodeURI(predial, keyword, sizeof(predial));
++	    ptr = predial;
++	    if (!_cups_strcasecmp(ptr, "None"))
++	      *ptr = '\0';
++	    if (!_cups_strncasecmp(ptr, "Custom.", 7))
++	      ptr += 7;
++	    if (strlen(ptr) > 0)
++	    {
++	      ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT,
++			   "pre-dial-string", NULL, ptr);
++	      fprintf(stderr, "DEBUG: Pre-dialing %s; pre-dial-string: %s\n",
++		      ptr, ptr);
++	    }
++	    else
++	      fprintf(stderr, "WARNING: Pre-dial number for fax not valid! Sending fax without pre-dial number.\n");
++	  }
+ 
+-	  _httpDecodeURI(predial, keyword, sizeof(predial));
+-	  ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT, "pre-dial-string", NULL, predial);
++	  ippAddCollection(request, IPP_TAG_JOB, "destination-uris",
++			   destination);
++	  ippDelete(destination);
+ 	}
+-
+-        ippAddCollection(request, IPP_TAG_JOB, "destination-uris", destination);
+-        ippDelete(destination);
++	else
++	  fprintf(stderr, "ERROR: Phone number for fax not valid! Fax cannot be sent.\n");
+       }
+     }
+     else
diff --git a/debian/patches/0041-Let-the-rastertopwg-filter-check-rounding-errors-whe.patch b/debian/patches/0041-Let-the-rastertopwg-filter-check-rounding-errors-whe.patch
new file mode 100644
index 000000000..2a44dd24c
--- /dev/null
+++ b/debian/patches/0041-Let-the-rastertopwg-filter-check-rounding-errors-whe.patch
@@ -0,0 +1,77 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Thu, 27 Aug 2020 10:22:00 +0200
+Subject: Let the rastertopwg filter check rounding errors when calculating
+ the page geometry
+
+---
+ filter/rastertopwg.c | 28 ++++++++++++++++++++++------
+ 1 file changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c
+index 1e63e4e..bffd89a 100644
+--- a/filter/rastertopwg.c
++++ b/filter/rastertopwg.c
+@@ -41,8 +41,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 			page_top,	/* Top margin */
+ 			page_bottom,	/* Bottom margin */
+ 			page_left,	/* Left margin */
++			page_right,	/* Right margin */
+ 			linesize,	/* Bytes per line */
+ 			lineoffset;	/* Offset into line */
++  int			tmp;
+   unsigned char		white;		/* White pixel */
+   ppd_file_t		*ppd;		/* PPD file */
+   ppd_attr_t		*back;		/* cupsBackSide attribute */
+@@ -120,14 +122,30 @@ main(int  argc,				/* I - Number of command-line args */
+     fprintf(stderr, "PAGE: %d %d\n", page, inheader.NumCopies);
+ 
+     page_width  = (unsigned)(inheader.cupsPageSize[0] * inheader.HWResolution[0] / 72.0);
++    if (page_width < inheader.cupsWidth &&
++	page_width >= inheader.cupsWidth - 2)
++      page_width = (unsigned)inheader.cupsWidth;
+     page_height = (unsigned)(inheader.cupsPageSize[1] * inheader.HWResolution[1] / 72.0);
++    if (page_height < inheader.cupsHeight &&
++	page_height >= inheader.cupsHeight - 2)
++      page_height = (unsigned)inheader.cupsHeight;
+     page_left   = (unsigned)(inheader.cupsImagingBBox[0] * inheader.HWResolution[0] / 72.0);
+     page_bottom = (unsigned)(inheader.cupsImagingBBox[1] * inheader.HWResolution[1] / 72.0);
+-    page_top    = page_height - page_bottom - inheader.cupsHeight;
++    tmp        = (int)(page_height - page_bottom - inheader.cupsHeight);
++    if (tmp < 0 && tmp >= -2) /* Rounding error */
++      page_top = 0;
++    else
++      page_top = (unsigned)tmp;
++    tmp        = (int)(page_width - page_left - inheader.cupsWidth);
++    if (tmp < 0 && tmp >= -2) /* Rounding error */
++      page_right = 0;
++    else
++      page_right = (unsigned)tmp;
+     linesize    = (page_width * inheader.cupsBitsPerPixel + 7) / 8;
+     lineoffset  = page_left * inheader.cupsBitsPerPixel / 8; /* Round down */
+ 
+-    if (page_left > page_width || page_top > page_height || page_bottom > page_height)
++    fprintf(stderr, "DEBUG: In pixels: Width: %u  Height: %u  Left: %u  Right:  %u  Top: %u  Bottom: %u\n", page_width, page_height, page_left, page_right, page_top, page_bottom);
++    if (page_left > page_width || page_top > page_height || page_bottom > page_height || page_right > page_width)
+     {
+       _cupsLangPrintFilter(stderr, "ERROR", _("Unsupported raster data."));
+       fprintf(stderr, "DEBUG: Bad bottom/left/top margin on page %d.\n", page);
+@@ -291,8 +309,7 @@ main(int  argc,				/* I - Number of command-line args */
+ 	  outheader.cupsInteger[1] = ~0U;/* CrossFeedTransform */
+ 	  outheader.cupsInteger[2] = 1;	/* FeedTransform */
+ 
+-	  outheader.cupsInteger[3] = page_width - page_left -
+-	                             inheader.cupsWidth;
++	  outheader.cupsInteger[3] = page_right;
+ 					/* ImageBoxLeft */
+ 	  outheader.cupsInteger[4] = page_top;
+ 					/* ImageBoxTop */
+@@ -355,8 +372,7 @@ main(int  argc,				/* I - Number of command-line args */
+ 	  outheader.cupsInteger[1] = ~0U;/* CrossFeedTransform */
+ 	  outheader.cupsInteger[2] = ~0U;/* FeedTransform */
+ 
+-	  outheader.cupsInteger[3] = page_width - page_left -
+-	                             inheader.cupsWidth;
++	  outheader.cupsInteger[3] = page_right;
+ 					/* ImageBoxLeft */
+ 	  outheader.cupsInteger[4] = page_bottom;
+ 					/* ImageBoxTop */
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..5b4b83877
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,41 @@
+0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
+0002-Install-root-backends-world-readable.patch
+0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
+0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
+0005-Fix-scheduler-cupsd.conf-load.patch
+0006-Fix-leakage-of-ppd.patch
+0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
+0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
+0009-Tests-ignore-loadFile-failures.patch
+0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
+0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
+0012-Tests-ignore-job-held-message.patch
+0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
+0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
+0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
+0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
+0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
+0018-Tests-Do-not-test-pdftourf.patch
+0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
+0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
+0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
+0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
+0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
+0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
+0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
+0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
+0028-Make-log-files-readable-to-group-adm-if-present.patch
+0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
+0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
+0031-Show-compile-command-lines.patch
+0032-Set-the-default-for-SyncOnClose-to-Yes.patch
+0033-Set-default-job-error-policy-to-retry-job.patch
+0034-Drop-dangling-references-from-cups-lpd.man.patch
+0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
+0036-Build-mantohtml-with-the-build-architecture-compiler.patch
+0037-po4a-infrastructure-and-translations-for-manpages.patch
+0038-Resolve-DNS-SD-service-name-based-URIs-correctly-als.patch
+0039-Make-lpoptions-list-a-printer-s-options-correctly-al.patch
+0040-Fix-fax-numbers-supplied-via-GTK-print-dialog-removi.patch
+0041-Let-the-rastertopwg-filter-check-rounding-errors-whe.patch
-- 
cgit v1.2.3


From a9bf6990c260c25806c287722cadd8a3e444be16 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 3 Sep 2020 09:04:30 +0200
Subject: Add missing Build-Depends-Package in symbols' files

---
 debian/libcups2.symbols      | 1 +
 debian/libcupsimage2.symbols | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/libcups2.symbols b/debian/libcups2.symbols
index 7bfed17c9..7ae24a29e 100644
--- a/debian/libcups2.symbols
+++ b/debian/libcups2.symbols
@@ -1,4 +1,5 @@
 libcups.so.2 libcups2 #MINVER#
+* Build-Depends-Package: libcups2-dev
 # Keep these at the latest upstream release
  (optional|regex)"^_pwg.*@Base$" 2.3~b6
  (optional|regex)"^_cups.*@Base$" 2.3~b6
diff --git a/debian/libcupsimage2.symbols b/debian/libcupsimage2.symbols
index 4ddc62de0..130b60385 100644
--- a/debian/libcupsimage2.symbols
+++ b/debian/libcupsimage2.symbols
@@ -1,4 +1,5 @@
 libcupsimage.so.2 libcupsimage2 #MINVER#
+* Build-Depends-Package: libcupsimage2-dev
 # Keep this one at the latest upstream release
  (optional|regex)|^_cups.*@Base$" 1.6.2
  cupsRasterClose@Base 1.4.0
-- 
cgit v1.2.3


From 5f8b7e532b98b639acd69079ca31813a7d688394 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 3 Sep 2020 09:17:31 +0200
Subject: Set lintian overrides for non-changeable upstream choices

---
 debian/cups-core-drivers.lintian-overrides  |  1 +
 debian/cups-daemon.lintian-overrides        |  4 ++++
 debian/cups-server-common.lintian-overrides |  1 +
 debian/cups.lintian-overrides               | 15 ++++++++++++---
 debian/libcups2-dev.lintian-overrides       |  1 +
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 debian/cups-core-drivers.lintian-overrides
 create mode 100644 debian/libcups2-dev.lintian-overrides

diff --git a/debian/cups-core-drivers.lintian-overrides b/debian/cups-core-drivers.lintian-overrides
new file mode 100644
index 000000000..5597ace30
--- /dev/null
+++ b/debian/cups-core-drivers.lintian-overrides
@@ -0,0 +1 @@
+cups-core-drivers: executable-in-usr-lib usr/lib/cups/filter/*
diff --git a/debian/cups-daemon.lintian-overrides b/debian/cups-daemon.lintian-overrides
index da8be6ae2..98314d340 100644
--- a/debian/cups-daemon.lintian-overrides
+++ b/debian/cups-daemon.lintian-overrides
@@ -1,3 +1,7 @@
 cups-daemon: init.d-script-possible-missing-stop etc/init.d/cups 0 6
 # CUPS is WantedBy=printer.target
 cups-daemon: systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/cups.service printer.target
+cups-daemon: spare-manual-page usr/share/man/*man8/cups-snmp.8.gz
+cups-daemon: executable-in-usr-lib usr/lib/cups/backend/*
+cups-daemon: executable-in-usr-lib usr/lib/cups/daemon/*
+cups-daemon: executable-in-usr-lib usr/lib/cups/notifier/*
diff --git a/debian/cups-server-common.lintian-overrides b/debian/cups-server-common.lintian-overrides
index b77b7205a..0faa9a50d 100644
--- a/debian/cups-server-common.lintian-overrides
+++ b/debian/cups-server-common.lintian-overrides
@@ -1,2 +1,3 @@
 cups-server-common: package-contains-empty-directory usr/share/cups/data/
 cups-server-common: package-contains-empty-directory usr/share/cups/model/
+cups-server-common: package-contains-documentation-outside-usr-share-doc usr/share/cups/doc-root/*
diff --git a/debian/cups.lintian-overrides b/debian/cups.lintian-overrides
index 9d382aad4..97868e6f4 100644
--- a/debian/cups.lintian-overrides
+++ b/debian/cups.lintian-overrides
@@ -1,6 +1,15 @@
-cups: non-standard-executable-perm usr/lib/cups/backend-available/lpd 0744 != 0755
-cups: non-standard-executable-perm usr/lib/cups/backend-available/dnssd 0744 != 0755
-cups: non-standard-executable-perm usr/lib/cups/backend-available/usb 0744 != 0755
+cups: executable-in-usr-lib usr/lib/cups/backend-available/*
+cups: executable-in-usr-lib usr/lib/cups/cgi-bin/*
+cups: executable-in-usr-lib usr/lib/cups/daemon/*
+cups: executable-in-usr-lib usr/lib/cups/filter/*
+cups: executable-in-usr-lib usr/lib/cups/monitor/*
+cups: non-standard-executable-perm usr/lib/cups/backend-available/* 0744 != 0755
 cups: package-contains-empty-directory usr/lib/cups/driver/
 cups: package-contains-empty-directory usr/share/ppd/custom/
 cups: package-contains-empty-directory usr/share/cups/ppd-updaters/
+cups: spare-manual-page usr/share/man/*man1/cups.1.gz
+cups: spare-manual-page usr/share/man/*man8/cups-deviced.8.gz
+cups: spare-manual-page usr/share/man/*man8/cups-driverd.8.gz
+cups: spare-manual-page usr/share/man/*man8/cups-exec.8.gz
+cups: spare-manual-page usr/share/man/*man8/cups-lpd.8.gz
+cups: spare-manual-page usr/share/man/*man8/cupsd-helper.8.gz
diff --git a/debian/libcups2-dev.lintian-overrides b/debian/libcups2-dev.lintian-overrides
new file mode 100644
index 000000000..974e7bb0e
--- /dev/null
+++ b/debian/libcups2-dev.lintian-overrides
@@ -0,0 +1 @@
+libcups2-dev: old-style-config-script usr/bin/cups-config
-- 
cgit v1.2.3


From dc280b688e8ca365e043ce5424cabeff9cba6fef Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 3 Sep 2020 09:27:04 +0200
Subject: cups 2.3.3-3 Debian release

---
 debian/changelog | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dba360484..e4dfb229e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,29 @@
+cups (2.3.3-3) unstable; urgency=medium
+
+  [ Didier Raboud ]
+  * Set lintian overrides for non-changeable upstream choices
+  * Add missing Build-Depends-Package in symbols' files
+
+  [ Till Kamppeter ]
+  * Resolve DNS-SD-service-name-based URIs correctly also if they are
+    from a service from localhost (like IPP-over-USB, Printer
+    Application, ...)
+  * Make lpoptions list a printer's options correctly also when CUPS is
+    running on an alternative port
+  * Fix fax numbers supplied via GTK print dialog, removing a "Custom."
+    prefix; do not choke if the GTK dialog sends "None" as phone number
+    or pre-dial prefix
+  * Let the rastertopwg filter check rounding errors when calculating
+    the page geometry
+
+ -- Didier Raboud <odyx@debian.org>  Thu, 03 Sep 2020 09:27:04 +0200
+
 cups (2.3.3-2) unstable; urgency=medium
 
   * Add missing dh-strip-nondeterminism B-D
   * cups-daemon: Add ipp-usb Recommends
 
- -- Didier Raboud <odyx@debian.org>  Wed, 29 Jul 2020 09:20:56 +0200
+ -- Didier Raboud <odyx@debian.org>  Thu, 03 Sep 2020 08:54:55 +0200
 
 cups (2.3.3-1) unstable; urgency=medium
 
-- 
cgit v1.2.3


From e6791b9ea7aff88773ab60f00cfb4daf961407d4 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:05 +0200
Subject: Fix hyphen-used-as-minus-sign manpage errors

Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
Also fix a missing backslash escape

Origin: vendor
Bug-Upstream: https://github.com/apple/cups/issues/4299
Patch-Name: manpage-hyphen-minus.patch
---
 man/backend.7         |  4 ++--
 man/client.conf.5     |  4 ++--
 man/cups-files.conf.5 |  2 +-
 man/cups-lpd.8        |  6 +++---
 man/cups-snmp.conf.5  |  2 +-
 man/cups.1            |  2 +-
 man/cupsctl.8         |  6 +++---
 man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
 man/cupsd.conf.5      |  2 +-
 man/cupsfilter.8      |  2 +-
 man/filter.7          |  2 +-
 man/ippeveprinter.1   |  6 +++---
 man/ippfind.1         |  6 +++---
 man/ipptoolfile.5     |  8 ++++----
 man/lp.1              | 12 ++++++------
 man/lpadmin.8         |  6 +++---
 man/lpoptions.1       |  4 ++--
 man/lpr.1             |  8 ++++----
 man/mime.convs.5      |  6 +++---
 man/mime.types.5      |  4 ++--
 man/ppdc.1            |  2 +-
 21 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/man/backend.7 b/man/backend.7
index 5a7032650..3c426310c 100644
--- a/man/backend.7
+++ b/man/backend.7
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
 .TP 5
 .B CUPS_BACKEND_RETRY
 The print file was not successfully transmitted because of a temporary issue.
-The scheduler will retry the job at a future time - other jobs may print before this one.
+The scheduler will retry the job at a future time \- other jobs may print before this one.
 .TP 5
 .B CUPS_BACKEND_RETRY_CURRENT
 The print file was not successfully transmitted because of a temporary issue.
@@ -198,7 +198,7 @@ or
 programs to send print jobs or
 .BR lpinfo (8)
 to query for available printers using the backend.
-The one exception is the SNMP backend - see
+The one exception is the SNMP backend \- see
 .BR cups-snmp (8)
 for more information.
 .SH NOTES
diff --git a/man/client.conf.5 b/man/client.conf.5
index 4dbf0c49b..f0adb9fbb 100644
--- a/man/client.conf.5
+++ b/man/client.conf.5
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
 command:
 .nf
 defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
 
 defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
 .fi
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index b451e2f92..72494065c 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
 \fBFileDevice No\fR
 Specifies whether the file pseudo-device can be used for new printer queues.
 The URI "file:///dev/null" is always allowed.
-File devices cannot be used with "raw" print queues - a PPD file is required.
+File devices cannot be used with "raw" print queues \- a PPD file is required.
 The specified file is overwritten for every print job.
 Writing to directories is not supported.
 .\"#FontPath
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index e8ce3251f..344d2af2b 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
 [
 \fB\-h \fIhostname\fR[\fB:\fIport\fR]
 ] [
-.B -n
+.B \-n
 ] [
-.B -o
+.B \-o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -34,7 +34,7 @@ and
 \fB-h \fIhostname\fR[\fB:\fIport\fR]
 Sets the CUPS server (and port) to use.
 .TP 5
-.B -n
+.B \-n
 Disables reverse address lookups; normally
 .B cups-lpd
 will try to discover the hostname of the client via a reverse DNS lookup.
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
index 4ca20f24f..bb77c7342 100644
--- a/man/cups-snmp.conf.5
+++ b/man/cups-snmp.conf.5
@@ -16,7 +16,7 @@ The
 file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
 .LP
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
 .BR cups-snmp (8).
 .SH DIRECTIVES
 The following directives are understood by the CUPS network backends:
diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..b0c51a738 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
 .LP
 When you are asked for a username and password, enter your login username and password or the "root" username and password.
 .LP
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
 .LP
 Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
 .LP
diff --git a/man/cupsctl.8 b/man/cupsctl.8
index 791954c19..c88eb22ec 100644
--- a/man/cupsctl.8
+++ b/man/cupsctl.8
@@ -73,19 +73,19 @@ Display the current settings:
 Enable debug logging:
 .nf
 
-    cupsctl --debug-logging
+    cupsctl \--debug-logging
 
 .fi
 Get the current debug logging state:
 .nf
 
-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
 
 .fi
 Disable printer sharing:
 .nf
 
-    cupsctl --no-share-printers
+    cupsctl \--no-share-printers
 .fi
 .SH KNOWN ISSUES
 You cannot set the Listen or Port directives using \fBcupsctl\fR.
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
index 2070be9a5..a912c4693 100644
--- a/man/cupsd-logs.5
+++ b/man/cupsd-logs.5
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
 For example:
 .nf
 
-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 0 - -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 0 \- \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
       200 157 CUPS-Get-Printers
       successful-ok-ignored-or-substituted-attributes
-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
-      200 1411 CUPS-Get-Devices -
-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
-      200 6667 - -
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+      200 1411 CUPS-Get-Devices \-
+    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+      200 6667 \- \-
 
 .fi
 The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
 .LP
-The \fIgroup\fR field always contains "-".
+The \fIgroup\fR field always contains "\-".
 .LP
 The \fIuser\fR field is the authenticated username of the requesting user.
-If no username and password is supplied for the request then this field contains "-".
+If no username and password is supplied for the request then this field contains "\-".
 .LP
 The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
 .LP
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
 Upgrading to TLS-encrypted connection.
 .TP 5
 500
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
 .TP 5
 501
 The client requested encryption but encryption support is not enabled/compiled in.
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
 The \fIbytes\fR field contains the number of bytes in the request.
 For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
 .LP
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
 .LP
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
 .SS ERROR LOG FILE FORMAT
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
 .BR cupsd.conf (5)
 file controls which messages are logged:
 .nf
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
 .LP
 The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
 .LP
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
 .LP
 The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
 .LP
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .LP
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
 .SH SEE ALSO
 .BR cupsd (8),
 .BR cupsd.conf (5),
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 00b1a22d6..49fdb06b1 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
 The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
 The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
 The \fIDenyCBC\fR option disables all CBC cipher suites.
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
 The \fIMinTLS\fR options set the minimum TLS version to support.
 The \fIMaxTLS\fR options set the maximum TLS version to support.
 Not all operating systems support TLS 1.3 at this time.
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
index c655c21c0..fe4c5a2cf 100644
--- a/man/cupsfilter.8
+++ b/man/cupsfilter.8
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
 The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
 .nf
 
-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
+    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
 .fi
 .SH SEE ALSO
 .BR cups (1),
diff --git a/man/filter.7 b/man/filter.7
index dbc3150c8..8cb79bbf9 100644
--- a/man/filter.7
+++ b/man/filter.7
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
 .TP 5
 \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 .TP 5
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
 Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
 .TP 5
 \fBWARNING:\fI message\fR
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
index fa32efb2e..8ab2654b9 100644
--- a/man/ippeveprinter.1
+++ b/man/ippeveprinter.1
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
 looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
 The
 .BR cups-config (1)
-command can be used to discover the correct binary directory ("cups-config --serverbin").
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
 .BR cups (1)
 man page for more details.
 .TP 5
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
 \fBSTATE: \fIkeyword[,keyword,...]\fR
 Sets the printer's "printer-state-reasons" attribute to the listed keywords.
 .TP 5
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
 Removes the listed keywords from the printer's "printer-state-reasons" attribute.
 .TP 5
 \fBSTATE: +\fIkeyword[,keyword,...]\fR
diff --git a/man/ippfind.1 b/man/ippfind.1
index 32f2e6f8b..d77ef75cc 100644
--- a/man/ippfind.1
+++ b/man/ippfind.1
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
 .B \-l
 .TP 5
 .B \-\-ls
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
 The result is true if the URI is accessible, false otherwise.
 .TP 5
 .B \-\-local
@@ -108,7 +108,7 @@ The result is always true.
 .B \-q
 .TP 5
 .B \-\-quiet
-Quiet mode - just returns the exit codes below.
+Quiet mode \- just returns the exit codes below.
 .TP 5
 .B \-r
 .TP 5
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
 .TP 5
 \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
 Executes the specified program if the current result is true.
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
 .PP
 Expressions may also contain modifiers:
 .TP 5
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
index 700101773..576323291 100644
--- a/man/ipptoolfile.5
+++ b/man/ipptoolfile.5
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
 \fBATTR \fItag attribute-name value(s)\fR
 Adds an attribute to the test request.
 Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
-Common attributes and values are listed in the IANA IPP registry - see references below.
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
+Common attributes and values are listed in the IANA IPP registry \- see references below.
 .TP 5
 \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
 Adds a collection attribute to the test request.
@@ -194,7 +194,7 @@ test report.
 \fBEXPECT ?\fIattribute-name predicate(s)\fR
 .TP 5
 \fBEXPECT !\fIattribute-name\fR
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
 .TP 5
 \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
 .TP 5
@@ -246,7 +246,7 @@ Specifies whether
 will skip the current test if the previous test resulted in an error/failure.
 .TP 5
 \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
 .TP 5
 \fBTEST\-ID "\fIidentifier\fR"
 Specifies an identifier string for the current test.
diff --git a/man/lp.1 b/man/lp.1
index cbea3b840..839a48278 100644
--- a/man/lp.1
+++ b/man/lp.1
@@ -83,7 +83,7 @@ lp \- print files
 ]
 .SH DESCRIPTION
 \fBlp\fR submits files for printing or alters a pending job.
-Use a filename of "-" to force printing from the standard input.
+Use a filename of "\-" to force printing from the standard input.
 .SS THE DEFAULT DESTINATION
 CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
 If neither are set, the current default set using the
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
 \fB\-P \fIpage-list\fR
 Specifies which pages to print in the document.
 The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
 .SS COMMON JOB OPTIONS
 Aside from the printer-specific options reported by the
 .BR lpoptions (1)
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
 Print two copies of a document to the default printer:
 .nf
 
-    lp -n 2 filename
+    lp \-n 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "bar":
 .nf
 
-    lp -d bar -o number-up=2 filename
+    lp \-d bar \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/lpadmin.8 b/man/lpadmin.8
index 1b8c91ba4..ce6a698ff 100644
--- a/man/lpadmin.8
+++ b/man/lpadmin.8
@@ -120,7 +120,7 @@ command.
 .TP 5
 \fB\-o \fIname\fB-default=\fIvalue\fR
 Sets a default server-side option for the destination.
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
 .TP 5
 \fB\-o port\-monitor=\fIname\fR
 Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
 Create an IPP Everywhere print queue:
 .nf
 
-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
+    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
 
 .fi
 .SH SEE ALSO
diff --git a/man/lpoptions.1 b/man/lpoptions.1
index a34fd01dc..7550d9afb 100644
--- a/man/lpoptions.1
+++ b/man/lpoptions.1
@@ -102,9 +102,9 @@ Destinations can only be removed using the
 .BR lpadmin (8)
 command.
 .SH FILES
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
 .br
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
 .SH CONFORMING TO
 The \fBlpoptions\fR command is unique to CUPS.
 .SH SEE ALSO
diff --git a/man/lpr.1 b/man/lpr.1
index f367cd97c..635d126d6 100644
--- a/man/lpr.1
+++ b/man/lpr.1
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
 \fB\-o print\-quality=4\fR
 .TP 5
 \fB\-o print\-quality=5\fR
-Specifies the output quality - draft (3), normal (4), or best (5).
+Specifies the output quality \- draft (3), normal (4), or best (5).
 .TP 5
 \fB\-o sides=one\-sided\fR
 Prints on one side of the paper.
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
 Print two copies of a document to the default printer:
 .nf
 
-    lpr -# 2 filename
+    lpr \-# 2 filename
 
 .fi
 Print a double-sided legal document to a printer called "foo":
 .nf
 
-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
+    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
 
 .fi
 Print a presentation document 2-up to a printer called "foo":
 .nf
 
-    lpr -P foo -o number-up=2 filename
+    lpr \-P foo \-o number-up=2 filename
 .fi
 .SH SEE ALSO
 .BR cancel (1),
diff --git a/man/mime.convs.5 b/man/mime.convs.5
index 25a6f7653..04ba39494 100644
--- a/man/mime.convs.5
+++ b/man/mime.convs.5
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
 The \fIfilter\fR field specifies the filter program filename.
 Filenames are relative to the CUPS filter directory.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .br
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
 .br
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
 .SH EXAMPLES
 Define a filter that converts PostScript documents to CUPS Raster format:
 .nf
diff --git a/man/mime.types.5 b/man/mime.types.5
index 7e83de16a..3572726f5 100644
--- a/man/mime.types.5
+++ b/man/mime.types.5
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
 .LP
 The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
 .SS RULES
-Rules take two forms - a filename extension by itself and functions with test
+Rules take two forms \- a filename extension by itself and functions with test
 values inside parenthesis.
 The following functions are available:
 .TP 5
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
 alphanumerically smaller than "text/foo".
 However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
 .SH FILES
-\fI/etc/cups\fR - Typical CUPS configuration directory.
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
 .SH EXAMPLES
 Define two MIME media types for raster data, with one being a subset with higher priority:
 .nf
diff --git a/man/ppdc.1 b/man/ppdc.1
index 44e9d2448..38e266978 100644
--- a/man/ppdc.1
+++ b/man/ppdc.1
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
 \fB\-\-crlf\fR
 .TP 5
 \fB\-\-lf\fR
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
 The default is to use the line feed character alone.
 .SH NOTES
 PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
-- 
cgit v1.2.3


From 1b7aff4166a951342bbe55cf0236945c679ec290 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:06 +0200
Subject: Install root backends world-readable

This is needed:
 - to comply with Debian Policy
 - because it is both nonsensical to not do so
 - it also breaks system checkers, bug reporting, etc

Bug: https://github.com/apple/cups/issues/2935
Bug-Debian: https://bugs.debian.org/410171
Patch-Name install-root-backends-world-readable.patch
---
 backend/Makefile         | 4 ++--
 scheduler/cups-deviced.c | 2 +-
 scheduler/job.c          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index e3ce49be6..b73445857 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -13,7 +13,7 @@ include ../Makedefs
 # Object files...
 #
 
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
 # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
 # an unprivileged user...
@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
 	echo Installing backends in $(SERVERBIN)/backend
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
 	done
 	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 77703b983..14478fd99 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
     * all others run as the unprivileged user...
     */
 
-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
+    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
   }
 
   cupsDirClose(dir);
diff --git a/scheduler/job.c b/scheduler/job.c
index e20e7c563..eb99b3e17 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       else if (stat(command, &backinfo))
 	backroot = 0;
       else
-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
+        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
 
       argv[0] = job->printer->sanitized_device_uri;
 
-- 
cgit v1.2.3


From f7e555ca2769346be7054a3e62bb033a5a14be9d Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:07 +0200
Subject: Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://github.com/apple/cups/issues/4348
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
---
 backend/ipp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index 3f3e1867d..a99079e05 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
         	      (i + 1) >= num_files);
 
-	if (document_format)
+	if (num_files > 1)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, "application/octet-stream");
+	else if (document_format)
 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		       "document-format", NULL, document_format);
 
-- 
cgit v1.2.3


From a5605f15ce8979924cdbec580697a978b4c9ff8c Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Mon, 17 Feb 2020 09:05:58 +0100
Subject: Fix conversion of PPD InputSlot choice names

When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
... in the InputSlot option CUPS translates these names to double-dashed IPP
attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
when passing a job to the printer with the IPP backend, making the printer
ignore the tray choice, and also when answering a get-printer-attributes IPP
request from a client. This happens when in the PPD a dash is followed by a
digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
names generally never have double-dashes and also no dashes in the beginning or
the end of the name, I have modified the pwg_unppdize_name() function
appropriately.

Bug: https://github.com/apple/cups/issues/5740
Bug-Debian: https://bugs.debian.org/949315
---
 cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 5965e382b..6609f53e5 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 {
   char	*ptr,				/* Pointer into name buffer */
 	*end;				/* End of name buffer */
+  int   nodash = 1;                     /* Next char in IPP name cannot be a
+                                           dash (first char or after a dash) */
 
 
   if (_cups_islower(*ppd))
@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
     const char *ppdptr;			/* Pointer into PPD keyword */
 
     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
+      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
+	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
+	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
         break;
 
     if (!*ppdptr)
@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 
   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
   {
-    if (_cups_isalnum(*ppd) || *ppd == '-')
+    if (_cups_isalnum(*ppd))
+    {
       *ptr++ = (char)tolower(*ppd & 255);
-    else if (strchr(dashchars, *ppd))
-      *ptr++ = '-';
+      nodash = 0;
+    }
+    else if (*ppd == '-' || strchr(dashchars, *ppd))
+    {
+      if (nodash == 0)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
     else
+    {
       *ptr++ = *ppd;
+      nodash = 0;
+    }
 
-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
-	_cups_isupper(ppd[1]) && ptr < end)
-      *ptr++ = '-';
-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
-      *ptr++ = '-';
+    if (nodash == 0)
+    {
+      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+	  _cups_isupper(ppd[1]) && ptr < end)
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+      {
+	*ptr++ = '-';
+	nodash = 1;
+      }
+    }
   }
 
+  /* Remove trailing dashes */
+  while (ptr > name && *(ptr - 1) == '-')
+    ptr --;
+
   *ptr = '\0';
 }
-- 
cgit v1.2.3


From dce74966cb7d686f4f17e13ff734f25bd20fbe45 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Sat, 22 Feb 2020 14:28:58 +0100
Subject: Fix scheduler cupsd.conf load

When running it without arguments it is supposed to read the local CUPS's
cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
with a lot of HTML inside and this is due to the fact that when loading the
file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
admin.cgi program which returns the admin front page of the web admin
interface. cupsctl then tries to interpret that as the config file and displays
garbage. Even worse is if you run cupsctl with command line argument (one of
the five switches or a key=value pair) to change a setting. It seems to load
cupsd.conf again and gets again the HTML code of the web interface page.
cupsctl tries to interpret this again, producing garbage, adds the
user-supplied setting and writes all this back into cupsd.conf. Then it tries
to restart the scheduler which fails due to the broken config file.
The problem is that in the file scheduler/client.conf, in the function
get_file() the URI from the client is at first checked whether it begins with
"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
that the check for "/admin/conf/cupsd.conf" comes and is never reached.
I have changed the order now appropriately and this way cupsctl works again.
Note that the problem only occurs if the web interface is active and the
cupsctl command is issued by a non-root user.
This is a regression caused by issue #5652.

Bug: https://github.com/apple/cups/issues/5744
---
 scheduler/client.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/scheduler/client.c b/scheduler/client.c
index c2ee8f12a..54b841bc1 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
+  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+  {
+    strlcpy(filename, ConfigurationFile, len);
+
+    perm_check = 0;
+  }
+  else if (!strncmp(con->uri, "/admin/log/", 11))
+  {
+    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+      strlcpy(filename, AccessLog, len);
+    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+      strlcpy(filename, ErrorLog, len);
+    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+      strlcpy(filename, PageLog, len);
+    else
+      return (NULL);
+
+    perm_check = 0;
+  }
   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
   {
    /*
@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
 
     perm_check = 0;
   }
-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
-  {
-    strlcpy(filename, ConfigurationFile, len);
-
-    perm_check = 0;
-  }
-  else if (!strncmp(con->uri, "/admin/log/", 11))
-  {
-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
-      strlcpy(filename, AccessLog, len);
-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
-      strlcpy(filename, ErrorLog, len);
-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
-      strlcpy(filename, PageLog, len);
-    else
-      return (NULL);
-
-    perm_check = 0;
-  }
   else if (con->language)
   {
     snprintf(language, sizeof(language), "/%s", con->language->language);
-- 
cgit v1.2.3


From d49b4fb99afc4ea0c67b0439c3abd38d49bf1225 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Fri, 14 Feb 2020 16:48:49 +0100
Subject: Fix leakage of ppd

---
 ppdc/ppdc-import.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
index 04b587d7f..b4a834138 100644
--- a/ppdc/ppdc-import.cxx
+++ b/ppdc/ppdc-import.cxx
@@ -323,5 +323,8 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
     }
   }
 
+  if (ppd)
+    ppdClose(ppd);
+
   return (1);
 }
-- 
cgit v1.2.3


From 71ad601d223e32cff33b36cc5bbacb4a5d7bfb23 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f52..a60158156 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
+       $GREP -v 'org.freedesktop.ColorManager' | \
+       $GREP -v -E 'Avahi client failed: -(1|26)' | \
+       wc -l | awk '{print $1}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log
-- 
cgit v1.2.3


From 1e0bd86a3d7c30d9776ba582ccd5c1e921337644 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:10 +0200
Subject: Tests: ignore usb & dnssd backend unexpected exits

Ignore the following errors:
 "[cups-deviced] PID * (usb) crashed on signal 11!" and
 "[cups-deviced] PID * (dnssd) stopped with status 1"

 They seem to regularly happen on Debian/Ubuntu buildds and break error lines
 counting.
Patch-Name: tests-ignore-usb-crash.patch
---
 test/run-stp-tests.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a60158156..8bde425d6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1025,7 +1025,10 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+       $GREP -v '(usb) crashed on signal 11' | \
+       $GREP -v '(dnssd) stopped with status 1' | \
+       wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log
-- 
cgit v1.2.3


From c672234fb4ccf676da6814e0593502c43bc1758e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:30:48 +0200
Subject: Tests: ignore loadFile failures

Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
breaks the errorlines counting on kfreebsd-amd64 for some reason
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
---
 test/run-stp-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 8bde425d6..f5a98dd64 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1028,6 +1028,8 @@ fi
 count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
        $GREP -v '(usb) crashed on signal 11' | \
        $GREP -v '(dnssd) stopped with status 1' | \
+       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+       $GREP -v 'Failed to connect to system bus' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 7383a177c5c2c51d9adab55a1142bc893bad66b5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:33:56 +0200
Subject: Tests: ignore errors triggered on ipv6-deprived hosts

Ignore the 'Address family not supported by protocol' error that breaks the
errorlines counting on buildds without a working IPv6 stack.
Origin: vendor
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f5a98dd64..f3a432155 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v '(dnssd) stopped with status 1' | \
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
+       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 6d769d4b61d389c66cceb458d332e1eb80cccb89 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:36:02 +0200
Subject: Tests: ignore the failure to write uncompressed data

Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
sometimes breaks the errorlines counting on kfreebsd for some reason.
Origin: vendor
Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index f3a432155..c072ad88d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From a0aecf73e60406cb859eb043c741f1e14941a161 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 8 Feb 2020 11:49:07 +0100
Subject: Tests: ignore 'job held' message

Origin: vendor
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c072ad88d..dfa7f6a5c 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
        $GREP -v 'Failed to connect to system bus' | \
        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+       $GREP -v 'Job held by' | \
        wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
-- 
cgit v1.2.3


From 53186be2cabb48586ee79434548788c824d69cdc Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:16 +0200
Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
 glibc's iconv behavior is different than what the test expects.

Bug-Debian: https://bugs.debian.org/662996
Patch-Name: test-i18n-nonlinux.patch
---
 cups/testi18n.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 45e1cab35..449670c44 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
       puts("PASS");
   }
 
-#ifndef __linux
+#if !defined(__linux__) && !defined(__GLIBC__)
   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
 
   strlcpy(legsrc, legdest, sizeof(legsrc));
-- 
cgit v1.2.3


From 804077e7ba935f152b5b3544f9ce2483625e2215 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:17 +0200
Subject: Tests: Make sure that all scheduled jobs are finished before

 running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: https://bugs.debian.org/670878
Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
---
 test/run-stp-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index dfa7f6a5c..173fc86a7 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
+	#
+	# Make sure the past jobs are done before going on.
+	#
+	./waitjobs.sh 1800
+
 	echo $ac_n "Performing $file: $ac_c"
 	echo "" >>$strfile
         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
-- 
cgit v1.2.3


From 8a55e8c26ff96109fdfd815988b49a9fa4e74933 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:18 +0200
Subject: Tests: Force LC_* environment variables when testing (non)
 l10n'isation.

 Permits building in non-"C" environments.
Origin: vendor
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
---
 cups/testppd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cups/testppd.c b/cups/testppd.c
index 36707f29a..a4ab7bfaa 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Test localization...
     */
 
+   /*
+    * Enforce void localization
+    */
+    putenv("LANG=C");
+    putenv("LC_ALL=C");
+    putenv("LC_CTYPE=C");
+    putenv("LC_MESSAGES=C");
+
     fputs("ppdLocalizeIPPReason(text): ", stdout);
     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
         !strcmp(buffer, "Foo Reason"))
-- 
cgit v1.2.3


From 4ce8e42add10a4af997a60a0650d14113ad252bc Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:21 +0200
Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder

This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Patch-Name: tests-use-ipv4-lo-address.patch
---
 test/5.1-lpadmin.sh   | 4 ++--
 test/run-stp-tests.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 7efc39892..08b8c508f 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -52,8 +52,8 @@ echo ""
 
 echo "Add Shared Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
 	echo "    FAILED"
 	exit 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 173fc86a7..88bafb1a6 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -490,7 +490,7 @@ fi
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
-Listen localhost:$port
+Listen 127.0.0.1:$port
 Listen $BASE/sock
 MaxSubscriptions 3
 MaxLogSize 0
@@ -617,7 +617,7 @@ fi
 
 # These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:$port; export CUPS_SERVER
+CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
 	if test $file = ../examples/ipp-2.1.test; then
-		uri="ipp://localhost:$port/printers/Test1"
+		uri="ipp://127.0.0.1:$port/printers/Test1"
 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
 	else
-		uri="ipp://localhost:$port/printers"
+		uri="ipp://127.0.0.1:$port/printers"
 		options=""
 	fi
 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
-- 
cgit v1.2.3


From de4da6411013107fbfd90f1386bd2ba11734c43c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:22 +0200
Subject: Tests: Force LC_ALL=C environment variable when grepping the output
 of lpstat

Permits testing in non-"C" environments.
Origin: vendor
Patch-Name: tests-make-lpstat-call-reproducible.patch
---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 88bafb1a6..d9b398575 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
 echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
 echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
 echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
 if test "x$CUPS_DEBUG_LEVEL" != x; then
 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-- 
cgit v1.2.3


From 4b095db3267f9110782a644e9fe740b426305074 Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Aug 2016 18:11:23 +0200
Subject: Tests: Do not test pdftourf

 Revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream
Patch-Name: tests-no-pdftourf.patch
---
 test/run-stp-tests.sh | 4 +---
 test/test.convs       | 1 -
 test/test.types       | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 test/test.types

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index d9b398575..bc332fc61 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
+		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
 		;;
 
 	*)
@@ -443,14 +443,12 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
 	instfilter cgimagetopdf imagetopdf pdf
 	instfilter cgpdftopdf pdftopdf passthru
 	instfilter cgpdftops pdftops ps
 	instfilter cgpdftoraster pdftoraster raster
-	instfilter cgpdftoraster pdftourf raster
 	instfilter cgtexttopdf texttopdf pdf
 	instfilter pstocupsraster pstoraster raster
 else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
 application/pdf application/vnd.cups-pdf 100 pdftopdf
 application/pdf application/postscript 100 pdftops
 application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
 application/postscript application/vnd.cups-raster 100 pstoraster
 image/jpeg application/pdf 100 imagetopdf
 text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf
\ No newline at end of file
-- 
cgit v1.2.3


From f15503e7094cb13aa37b8776a49d779de7d93cbe Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug-Debian: https://bugs.debian.org/640124
Patch-Name: move-cupsd-conf-default-to-share.patch
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f087809f7..6e9a64a7c 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 6cfab5ab1b782f5631bf269943a350fcdf6fdc25 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
 Touch to a CUPS server)

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb6049b2c..bb4f9d215 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index e341bdb00..545e0de93 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 43bf98afdbefd144a3704daac5768529e575e842 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:30 +0200
Subject: Let snmp backend also use manufacturer-specific MIBs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 … of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://github.com/apple/cups/issues/3552
Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
---
 backend/snmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backend/snmp.c b/backend/snmp.c
index 66ac884c6..9572822a8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
 static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
 static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
 static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
+static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
+static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
 static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
 static cups_array_t	*DeviceURIs = NULL;
 static int		HostNameLookups = 0;
@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_ID, LexmarkDeviceIdOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, RicohDeviceIdOID);
 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
 	               packet.community, CUPS_ASN1_GET_REQUEST,
 		       DEVICE_PRODUCT, XeroxProductOID);
+	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+		       packet.community, CUPS_ASN1_GET_REQUEST,
+		       DEVICE_ID, HPDeviceIdOID);
         break;
 
     case DEVICE_DESCRIPTION :
-- 
cgit v1.2.3


From 82de16019fa580ae2c1d63d5b1ce309fea94cf75 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 18:11:31 +0200
Subject: Disable time stamps in conffiles, to avoid ever-changing files in
 /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
Patch-Name: no-conffile-timestamp.patch
---
 scheduler/classes.c       | 2 +-
 scheduler/job.c           | 2 +-
 scheduler/printers.c      | 2 +-
 scheduler/subscriptions.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf..35d0eb77d 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index eb99b3e17..760e30f4f 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 545e0de93..f28c64afe 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8..eca0bfa19 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
-- 
cgit v1.2.3


From 38bdda3a181a15b6460f6fa3b6ecc2d382b66ff0 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 9 Aug 2016 18:11:33 +0200
Subject: Do not write VCS tags into installed conffiles

Bug: https://github.com/apple/cups/issues/2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch
---
 conf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/Makefile b/conf/Makefile
index 42a123f75..db0060d75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -69,8 +69,12 @@ install-data:
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
+			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
 		fi ; \
 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
+		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-- 
cgit v1.2.3


From 580604709d56234905aa1dfb209842f12318a6df Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:34 +0200
Subject: Rename the systemd service file from org.cups.cups.* to cups.*

Patch-Name: rename-systemd-units.patch
---
 scheduler/org.cups.cups-lpd.socket  | 2 +-
 scheduler/org.cups.cupsd.path.in    | 2 +-
 scheduler/org.cups.cupsd.service.in | 2 +-
 scheduler/org.cups.cupsd.socket.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
index ed23f9dfd..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/org.cups.cups-lpd.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS LPD Server Socket
-PartOf=org.cups.cups-lpd.service
+PartOf=cups-lpd.service
 
 [Socket]
 ListenStream=515
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 0f1cc46f2..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Path]
 PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 5273762fb..cd2334396 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -9,5 +9,5 @@ Type=simple
 Restart=on-failure
 
 [Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path
 WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
index 613b977a6..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/org.cups.cupsd.socket.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=CUPS Scheduler
-PartOf=org.cups.cupsd.service
+PartOf=cups.service
 
 [Socket]
 ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-- 
cgit v1.2.3


From 023259370234f4f51615d0335b5704ab72d91a4e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 24 Feb 2020 11:46:49 +0100
Subject: Add Requires=cups.socket to cups.service, to make sure they start in
 the right order

---
 scheduler/org.cups.cupsd.service.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index cd2334396..79d2c403e 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/org.cups.cupsd.service.in
@@ -2,6 +2,7 @@
 Description=CUPS Scheduler
 Documentation=man:cupsd(8)
 After=sssd.service
+Requires=cups.socket
 
 [Service]
 ExecStart=@sbindir@/cupsd -l
-- 
cgit v1.2.3


From 6256f272afa7456eae32736d5f586e6054d3140b Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:35 +0200
Subject: Do not use host names for broadcasting print queues and

 managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
Patch-Name: do-not-broadcast-with-hostnames.patch
---
 scheduler/conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bb4f9d215..b73d33f93 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
-- 
cgit v1.2.3


From 7eedb5e67d452d7330321b81fce381e15be99b83 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: CUPS removes the "(recommended)" comments of the NickNames of
 Foomatic PPDs when listing available PPDs. This patch removes this removal
 action.

Patch-Name: reactivate_recommended_driver.patch
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From bbb542b95443a6c650aa181f275b85b4c1d634b2 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.

Bug-Ubuntu: https://launchpad.net/bugs/345953
Patch-Name: logfiles_adm_readable.patch
---
 scheduler/log.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scheduler/log.c b/scheduler/log.c
index 2bd1952f7..ae0aa5561 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
 #  include <systemd/sd-journal.h>
 #endif /* HAVE_ASL_H */
 #include <syslog.h>
+#include <grp.h>
 
 
 /*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
 		filename[1024],		/* Formatted log filename */
 		*ptr;			/* Pointer into filename */
   const char	*logptr;		/* Pointer into log filename */
+  struct group  *loggrp;		/* Group entry of log filename */
 
 
  /*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     return (1);
   }
 
+ /*
+  * Use adm group if possible, fall back to Group
+  */
+ loggrp = getgrnam("adm");
+
  /*
   * Format the filename as needed...
   */
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
       * Change ownership and permissions of non-device logs...
       */
 
-      fchown(cupsFileNumber(*lf), RunUser, Group);
+      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
       fchmod(cupsFileNumber(*lf), LogFilePerm);
     }
   }
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
     * Change ownership and permissions of non-device logs...
     */
 
-    fchown(cupsFileNumber(*lf), RunUser, Group);
+    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
     fchmod(cupsFileNumber(*lf), LogFilePerm);
   }
 
-- 
cgit v1.2.3


From 5bec952dff186b1189ea93a6f704eeadf72329d3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:40 +0200
Subject: Deactivate CUPS' own log rotating as the system already provides a
 more sophisticated log rotating

Patch-Name: default_log_settings.patch
---
 conf/cupsd.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ab37ca68c..78189e535 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -8,6 +8,10 @@
 LogLevel @CUPS_LOG_LEVEL@
 @CUPS_PAGE_LOG_FORMAT@
 
+# Deactivate CUPS' internal logrotating, as we provide a better one, especially
+# LogLevel debug2 gets usable now
+MaxLogSize 0
+
 # Only listen for connections from the local machine.
 Listen localhost:@DEFAULT_IPP_PORT@
 @CUPS_LISTEN_DOMAINSOCKET@
-- 
cgit v1.2.3


From f3510d54a67978d5ead90c1103f9461bfbd87c7b Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.

Patch-Name: confdirperms.patch
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b73d33f93..31eedbf71 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From cc9fe28c6998a9efb20ff629e3909e6777e423ee Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Show compile command lines

Patch-Name: show-compile-command-lines.patch
---
 Makedefs.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..511fbf8b1 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
-.SUFFIXES:	.a .c .cxx .h .o
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
 	echo Compiling $<...
-- 
cgit v1.2.3


From 33bdccadcc3cc65839a2ae85c525608c676c1058 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 9 Aug 2016 18:11:46 +0200
Subject: Set the default for SyncOnClose to Yes

Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
---
 conf/cups-files.conf.in           | 2 +-
 doc/help/man-cups-files.conf.html | 2 +-
 man/cups-files.conf.5             | 2 +-
 scheduler/conf.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index 4a78ba615..a3d088da5 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -7,7 +7,7 @@
 #FatalErrors @CUPS_FATAL_ERRORS@
 
 # Do we call fsync() after writing configuration or status files?
-#SyncOnClose No
+#SyncOnClose Yes
 
 # Default user and group for filters/backends/helper programs; this cannot be
 # any user or group that resolves to ID 0 for security reasons...
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index c567cbba7..f2f6802e6 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
 <b>fsync</b>(2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
 <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
 The default contains "admin", "lpadmin", "root", "sys", and/or "system".
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
index 72494065c..955f47b55 100644
--- a/man/cups-files.conf.5
+++ b/man/cups-files.conf.5
@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
 Specifies whether the scheduler calls
 .BR fsync (2)
 after writing configuration or state files.
-The default is "No".
+The default is "Yes".
 .\"#SystemGroup
 .TP 5
 \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 31eedbf71..f2924f844 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
   RootCertDuration         = 300;
   Sandboxing               = CUPSD_SANDBOXING_STRICT;
   StrictConformance        = FALSE;
-  SyncOnClose              = FALSE;
+  SyncOnClose              = TRUE;
   Timeout                  = 900;
   WebInterface             = CUPS_DEFAULT_WEBIF;
 
-- 
cgit v1.2.3


From 40b5e5631f53aa517735944757d736d52dd1be77 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 9 Aug 2016 18:11:47 +0200
Subject: Set default job error policy to "retry-job"

It it is less confusing and a better default on most machines.
Amend documentation accordingly.

Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch
---
 doc/help/man-cupsd.conf.html | 4 ++--
 man/cupsd.conf.5             | 4 ++--
 scheduler/conf.c             | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1668eee8a..7d161edd2 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
 <dt><b>ErrorPolicy retry-current-job</b>
 <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 <dt><b>ErrorPolicy retry-job</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 <dt><b>ErrorPolicy stop-printer</b>
-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
 <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
 A limit of 0 disables filter limiting.
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
index 49fdb06b1..6d3d8e393 100644
--- a/man/cupsd.conf.5
+++ b/man/cupsd.conf.5
@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
 Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
 .TP 5
 \fBErrorPolicy retry-job\fR
-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
+Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
 .TP 5
 \fBErrorPolicy stop-printer\fR
-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
+Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
 .\"#FilterLimit
 .TP 5
 \fBFilterLimit \fIlimit\fR
diff --git a/scheduler/conf.c b/scheduler/conf.c
index f2924f844..944655ecb 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
 
-  cupsdSetString(&ErrorPolicy, "stop-printer");
+  cupsdSetString(&ErrorPolicy, "retry-job");
 
   JobHistory          = DEFAULT_HISTORY;
   JobFiles            = DEFAULT_FILES;
@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
       strcmp(ErrorPolicy, "retry-job") &&
       strcmp(ErrorPolicy, "stop-printer"))
   {
-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
-    cupsdSetString(&ErrorPolicy, "stop-printer");
+    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
+    cupsdSetString(&ErrorPolicy, "retry-job");
   }
 
  /*
-- 
cgit v1.2.3


From 718a3c5ef2401d45ffb4719d01fe87f47e0b211a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
Date: Tue, 9 Aug 2016 18:11:48 +0200
Subject: Drop dangling references from cups-lpd.man

Bug-Debian: https://bugs.debian.org/570157
Patch-Name: man-cups-lpd-drop-dangling-references.patch
---
 man/cups-lpd.8 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
index 344d2af2b..e998df361 100644
--- a/man/cups-lpd.8
+++ b/man/cups-lpd.8
@@ -109,9 +109,7 @@ Simply enable the
 .B cups-lpd
 service using the corresponding control program.
 .SH SEE ALSO
-.BR cups (1),
 .BR cupsd (8),
-.BR inetconv (1m),
 .BR inetd (8),
 .BR launchd (8),
 .BR xinetd (8),
-- 
cgit v1.2.3


From 7d22e41cc48f80f09bb60eb600c4a1b0199f4b2c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Patch-Name: debianize_cups-config.patch
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From d0e6dddb99a8b9fc47a15a165d205648dc236d51 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 511fbf8b1..fbd16fba6 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index dbf3bda38..535b0b973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 791f34392a5badc67edaa09f8b70b503bb6727b0 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
Patch-Name: manpage-translations.patch
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From ce7dc36139e129a93dc2ccdc598b83fa9df9c70f Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 25 Aug 2020 21:34:00 +0200
Subject: Resolve DNS-SD-service-name-based URIs correctly also if they are
 from a service from localhost (like IPP-over-USB, Printer Application, ...)

---
 cups/http-support.c | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/cups/http-support.c b/cups/http-support.c
index 63175145e..8eabaee4c 100644
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -2483,7 +2483,7 @@ http_poll_cb(
 static void
 http_resolve_cb(
     AvahiServiceResolver   *resolver,	/* I - Resolver (unused) */
-    AvahiIfIndex           interface,	/* I - Interface index (unused) */
+    AvahiIfIndex           interface,	/* I - Interface index */
     AvahiProtocol          protocol,	/* I - Network protocol (unused) */
     AvahiResolverEvent     event,	/* I - Event (found, etc.) */
     const char             *name,	/* I - Service name */
@@ -2504,6 +2504,7 @@ http_resolve_cb(
 			*resdefault;	/* Default path */
   char			resource[257],	/* Remote path */
 			fqdn[256];	/* FQDN of the .local name */
+  char			ifname[IF_NAMESIZE]; /* Interface name */
   AvahiStringList	*pair;		/* Current TXT record key/value pair */
   char			*value;		/* Value for "rp" key */
   size_t		valueLen = 0;	/* Length of "rp" key */
@@ -2630,13 +2631,37 @@ http_resolve_cb(
     strlcpy(resource, resdefault, sizeof(resource));
   }
 
+ /*
+  * Check whether the interface is the loopback interface ("lo"), in this
+  * case set "localhost" as the host name
+  */
+
+  if (!if_indextoname((unsigned int)interface, ifname))
+  {
+    if (uribuf->options & _HTTP_RESOLVE_STDERR)
+      fprintf(stderr,
+	      "DEBUG: Unable to find interface name for interface %d: %s\n",
+	      interface, strerror(errno));
+    DEBUG_printf(("Unable to find interface name for interface %d: %s\n",
+		  interface, strerror(errno)));
+    ifname[0] = '\0';
+  }
+
+  if (!strcmp(ifname, "lo")) {
+    if (uribuf->options & _HTTP_RESOLVE_STDERR)
+      fputs("DEBUG: Service comes from loopback interface \"lo\", setting \"localhost\" as host name.\n",
+	    stderr);
+    DEBUG_puts("Service comes from loopback interface \"lo\", setting \"localhost\" as host name.");
+    hostTarget = "localhost";
+  }
+
  /*
   * Lookup the FQDN if needed...
   */
 
-  if ((uribuf->options & _HTTP_RESOLVE_FQDN) &&
-      (hostptr = hostTarget + strlen(hostTarget) - 6) > hostTarget &&
-      !_cups_strcasecmp(hostptr, ".local"))
+  else if ((uribuf->options & _HTTP_RESOLVE_FQDN) &&
+	   (hostptr = hostTarget + strlen(hostTarget) - 6) > hostTarget &&
+	   !_cups_strcasecmp(hostptr, ".local"))
   {
    /*
     * OK, we got a .local name but the caller needs a real domain.  Start by
-- 
cgit v1.2.3


From 262057cb92f1b6be13a2b4707c55d23d3cb1e681 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Wed, 26 Aug 2020 13:03:00 +0200
Subject: Fix fax numbers supplied via GTK print dialog, removing a "Custom."
 prefix; do not choke if the GTK dialog sends "None" as phone number or
 pre-dial prefix

---
 backend/ipp.c | 54 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/backend/ipp.c b/backend/ipp.c
index a99079e05..a076a0b29 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -2828,7 +2828,21 @@ new_request(
         */
 
         _httpDecodeURI(phone, keyword, sizeof(phone));
-        for (ptr = phone; *ptr;)
+        ptr = phone;
+
+        /*
+         * Weed out "Custom." in the beginning, this allows to put the
+         * "phone" option as custom string option into the PPD so that
+         * print dialogs not supporting fax display the option and
+         * allow entering the phone number. Print dialogs also send "None"
+         * if no phone number got entered, filter this, too.
+         */
+        if (!_cups_strcasecmp(phone, "None"))
+          *ptr = '\0';
+        if (!_cups_strncasecmp(phone, "Custom.", 7))
+          _cups_strcpy(ptr, ptr + 7);
+
+        for (; *ptr;)
 	{
 	  if (*ptr == ',')
 	    *ptr = 'p';
@@ -2838,20 +2852,36 @@ new_request(
 	    ptr ++;
         }
 
-        httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri), "tel", NULL, NULL, 0, phone);
-        ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI, "destination-uri", NULL, tel_uri);
-
-	if ((keyword = cupsGetOption("faxPrefix", num_options,
-	                             options)) != NULL && *keyword)
+        if (strlen(phone) > 0)
         {
-	  char	predial[1024];		/* Pre-dial string */
+          httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri), "tel", NULL, NULL, 0, phone);
+          ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI, "destination-uri", NULL, tel_uri);
+          fprintf(stderr, "DEBUG: Faxing to phone %s; destination-uri: %s\n", phone, tel_uri);
 
-	  _httpDecodeURI(predial, keyword, sizeof(predial));
-	  ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT, "pre-dial-string", NULL, predial);
-	}
+          if ((keyword = cupsGetOption("faxPrefix", num_options, options)) != NULL && *keyword)
+          {
+            char	predial[1024];		/* Pre-dial string */
+
+            _httpDecodeURI(predial, keyword, sizeof(predial));
+            ptr = predial;
+            if (!_cups_strcasecmp(ptr, "None"))
+              *ptr = '\0';
+            if (!_cups_strncasecmp(ptr, "Custom.", 7))
+              ptr += 7;
+            if (strlen(ptr) > 0)
+            {
+              ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT, "pre-dial-string", NULL, ptr);
+              fprintf(stderr, "DEBUG: Pre-dialing %s; pre-dial-string: %s\n", ptr, ptr);
+            }
+            else
+              fprintf(stderr, "WARNING: Pre-dial number for fax not valid! Sending fax without pre-dial number.\n");
+          }
 
-        ippAddCollection(request, IPP_TAG_JOB, "destination-uris", destination);
-        ippDelete(destination);
+          ippAddCollection(request, IPP_TAG_JOB, "destination-uris", destination);
+          ippDelete(destination);
+        }
+        else
+          fprintf(stderr, "ERROR: Phone number for fax not valid! Fax cannot be sent.\n");
       }
     }
     else
-- 
cgit v1.2.3


From 09963c9673f40ad45c56ec7c310b834b55b8ba81 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Thu, 27 Aug 2020 10:22:00 +0200
Subject: Let the rastertopwg filter check rounding errors when calculating the
 page geometry

---
 filter/rastertopwg.c | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c
index 1e63e4ec0..7a2523349 100644
--- a/filter/rastertopwg.c
+++ b/filter/rastertopwg.c
@@ -41,8 +41,10 @@ main(int  argc,				/* I - Number of command-line args */
 			page_top,	/* Top margin */
 			page_bottom,	/* Bottom margin */
 			page_left,	/* Left margin */
+			page_right,	/* Right margin */
 			linesize,	/* Bytes per line */
 			lineoffset;	/* Offset into line */
+  int			tmp;
   unsigned char		white;		/* White pixel */
   ppd_file_t		*ppd;		/* PPD file */
   ppd_attr_t		*back;		/* cupsBackSide attribute */
@@ -120,14 +122,30 @@ main(int  argc,				/* I - Number of command-line args */
     fprintf(stderr, "PAGE: %d %d\n", page, inheader.NumCopies);
 
     page_width  = (unsigned)(inheader.cupsPageSize[0] * inheader.HWResolution[0] / 72.0);
+    if (page_width < inheader.cupsWidth &&
+	page_width >= inheader.cupsWidth - 1)
+      page_width = (unsigned)inheader.cupsWidth;
     page_height = (unsigned)(inheader.cupsPageSize[1] * inheader.HWResolution[1] / 72.0);
+    if (page_height < inheader.cupsHeight &&
+	page_height >= inheader.cupsHeight - 1)
+      page_height = (unsigned)inheader.cupsHeight;
     page_left   = (unsigned)(inheader.cupsImagingBBox[0] * inheader.HWResolution[0] / 72.0);
     page_bottom = (unsigned)(inheader.cupsImagingBBox[1] * inheader.HWResolution[1] / 72.0);
-    page_top    = page_height - page_bottom - inheader.cupsHeight;
+    tmp        = (int)(page_height - page_bottom - inheader.cupsHeight);
+    if (tmp < 0 && tmp >= -1) /* Rounding error */
+      page_top = 0;
+    else
+      page_top = (unsigned)tmp;
+    tmp        = (int)(page_width - page_left - inheader.cupsWidth);
+    if (tmp < 0 && tmp >= -1) /* Rounding error */
+      page_right = 0;
+    else
+      page_right = (unsigned)tmp;
     linesize    = (page_width * inheader.cupsBitsPerPixel + 7) / 8;
     lineoffset  = page_left * inheader.cupsBitsPerPixel / 8; /* Round down */
 
-    if (page_left > page_width || page_top > page_height || page_bottom > page_height)
+    fprintf(stderr, "DEBUG: In pixels: Width: %u  Height: %u  Left: %u  Right:  %u  Top: %u  Bottom: %u\n", page_width, page_height, page_left, page_right, page_top, page_bottom);
+    if (page_left > page_width || page_top > page_height || page_bottom > page_height || page_right > page_width)
     {
       _cupsLangPrintFilter(stderr, "ERROR", _("Unsupported raster data."));
       fprintf(stderr, "DEBUG: Bad bottom/left/top margin on page %d.\n", page);
@@ -291,8 +309,7 @@ main(int  argc,				/* I - Number of command-line args */
 	  outheader.cupsInteger[1] = ~0U;/* CrossFeedTransform */
 	  outheader.cupsInteger[2] = 1;	/* FeedTransform */
 
-	  outheader.cupsInteger[3] = page_width - page_left -
-	                             inheader.cupsWidth;
+	  outheader.cupsInteger[3] = page_right;
 					/* ImageBoxLeft */
 	  outheader.cupsInteger[4] = page_top;
 					/* ImageBoxTop */
@@ -355,8 +372,7 @@ main(int  argc,				/* I - Number of command-line args */
 	  outheader.cupsInteger[1] = ~0U;/* CrossFeedTransform */
 	  outheader.cupsInteger[2] = ~0U;/* FeedTransform */
 
-	  outheader.cupsInteger[3] = page_width - page_left -
-	                             inheader.cupsWidth;
+	  outheader.cupsInteger[3] = page_right;
 					/* ImageBoxLeft */
 	  outheader.cupsInteger[4] = page_bottom;
 					/* ImageBoxTop */
-- 
cgit v1.2.3


From 223d8fd855fbbfffa8e45d959844e010b91ad044 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 24 Nov 2020 08:48:16 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...-hyphen-used-as-minus-sign-manpage-errors.patch | 571 +++++++++++++++++++++
 ...0002-Install-root-backends-world-readable.patch |  66 +++
 ...s-with-multiple-files-or-multiple-formats.patch |  27 +
 ...-conversion-of-PPD-InputSlot-choice-names.patch |  99 ++++
 .../0005-Fix-scheduler-cupsd.conf-load.patch       |  86 ++++
 debian/patches/0006-Fix-leakage-of-ppd.patch       |  21 +
 ...sts-Ignore-warnings-from-colord-and-Avahi.patch |  28 +
 ...ignore-usb-dnssd-backend-unexpected-exits.patch |  31 ++
 .../0009-Tests-ignore-loadFile-failures.patch      |  25 +
 ...e-errors-triggered-on-ipv6-deprived-hosts.patch |  24 +
 ...re-the-failure-to-write-uncompressed-data.patch |  24 +
 .../0012-Tests-ignore-job-held-message.patch       |  21 +
 ...t-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch |  24 +
 ...sure-that-all-scheduled-jobs-are-finished.patch |  28 +
 ...-LC_-environment-variables-when-testing-n.patch |  31 ++
 ...27.0.0.1-instead-of-localhost-to-help-pbu.patch |  64 +++
 ...-LC_ALL-C-environment-variable-when-grepp.patch |  24 +
 .../patches/0018-Tests-Do-not-test-pdftourf.patch  |  68 +++
 ...d.conf.default-from-SERVERROOT-to-DATADIR.patch |  62 +++
 ...pport-Apple-AirPrint-printing-from-iPhone.patch |  91 ++++
 ...ckend-also-use-manufacturer-specific-MIBs.patch |  48 ++
 ...e-stamps-in-conffiles-to-avoid-ever-chang.patch |  67 +++
 ...t-write-VCS-tags-into-installed-conffiles.patch |  29 ++
 ...systemd-service-file-from-org.cups.cups.-.patch |  59 +++
 ...s-cups.socket-to-cups.service-to-make-sur.patch |  21 +
 ...host-names-for-broadcasting-print-queues-.patch |  25 +
 ...s-the-recommended-comments-of-the-NickNam.patch |  39 ++
 ...og-files-readable-to-group-adm-if-present.patch |  60 +++
 ...CUPS-own-log-rotating-as-the-system-alrea.patch |  25 +
 ...t-mess-with-the-permissions-of-cupsd.conf.patch |  26 +
 .../patches/0031-Show-compile-command-lines.patch  |  23 +
 ...32-Set-the-default-for-SyncOnClose-to-Yes.patch |  64 +++
 ...Set-default-job-error-policy-to-retry-job.patch |  73 +++
 ...rop-dangling-references-from-cups-lpd.man.patch |  24 +
 ...chitecture-in-cups-config-to-make-it-arch.patch |  49 ++
 ...html-with-the-build-architecture-compiler.patch | 110 ++++
 ...rastructure-and-translations-for-manpages.patch | 342 ++++++++++++
 ...-SD-service-name-based-URIs-correctly-als.patch |  71 +++
 ...bers-supplied-via-GTK-print-dialog-removi.patch |  86 ++++
 ...tertopwg-filter-check-rounding-errors-whe.patch |  77 +++
 debian/patches/series                              |  40 ++
 41 files changed, 2773 insertions(+)
 create mode 100644 debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
 create mode 100644 debian/patches/0002-Install-root-backends-world-readable.patch
 create mode 100644 debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
 create mode 100644 debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
 create mode 100644 debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
 create mode 100644 debian/patches/0006-Fix-leakage-of-ppd.patch
 create mode 100644 debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
 create mode 100644 debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
 create mode 100644 debian/patches/0009-Tests-ignore-loadFile-failures.patch
 create mode 100644 debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
 create mode 100644 debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
 create mode 100644 debian/patches/0012-Tests-ignore-job-held-message.patch
 create mode 100644 debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
 create mode 100644 debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
 create mode 100644 debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
 create mode 100644 debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
 create mode 100644 debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
 create mode 100644 debian/patches/0018-Tests-Do-not-test-pdftourf.patch
 create mode 100644 debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
 create mode 100644 debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
 create mode 100644 debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 create mode 100644 debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
 create mode 100644 debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
 create mode 100644 debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
 create mode 100644 debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
 create mode 100644 debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
 create mode 100644 debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
 create mode 100644 debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
 create mode 100644 debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
 create mode 100644 debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
 create mode 100644 debian/patches/0031-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
 create mode 100644 debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
 create mode 100644 debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
 create mode 100644 debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
 create mode 100644 debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
 create mode 100644 debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
 create mode 100644 debian/patches/0038-Resolve-DNS-SD-service-name-based-URIs-correctly-als.patch
 create mode 100644 debian/patches/0039-Fix-fax-numbers-supplied-via-GTK-print-dialog-removi.patch
 create mode 100644 debian/patches/0040-Let-the-rastertopwg-filter-check-rounding-errors-whe.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
new file mode 100644
index 000000000..ce9c33b51
--- /dev/null
+++ b/debian/patches/0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
@@ -0,0 +1,571 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:05 +0200
+Subject: Fix hyphen-used-as-minus-sign manpage errors
+
+Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
+Also fix a missing backslash escape
+
+Origin: vendor
+Bug-Upstream: https://github.com/apple/cups/issues/4299
+Patch-Name: manpage-hyphen-minus.patch
+---
+ man/backend.7         |  4 ++--
+ man/client.conf.5     |  4 ++--
+ man/cups-files.conf.5 |  2 +-
+ man/cups-lpd.8        |  6 +++---
+ man/cups-snmp.conf.5  |  2 +-
+ man/cups.1            |  2 +-
+ man/cupsctl.8         |  6 +++---
+ man/cupsd-logs.5      | 36 ++++++++++++++++++------------------
+ man/cupsd.conf.5      |  2 +-
+ man/cupsfilter.8      |  2 +-
+ man/filter.7          |  2 +-
+ man/ippeveprinter.1   |  6 +++---
+ man/ippfind.1         |  6 +++---
+ man/ipptoolfile.5     |  8 ++++----
+ man/lp.1              | 12 ++++++------
+ man/lpadmin.8         |  6 +++---
+ man/lpoptions.1       |  4 ++--
+ man/lpr.1             |  8 ++++----
+ man/mime.convs.5      |  6 +++---
+ man/mime.types.5      |  4 ++--
+ man/ppdc.1            |  2 +-
+ 21 files changed, 65 insertions(+), 65 deletions(-)
+
+diff --git a/man/backend.7 b/man/backend.7
+index 5a70326..3c42631 100644
+--- a/man/backend.7
++++ b/man/backend.7
+@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
+ .TP 5
+ .B CUPS_BACKEND_RETRY
+ The print file was not successfully transmitted because of a temporary issue.
+-The scheduler will retry the job at a future time - other jobs may print before this one.
++The scheduler will retry the job at a future time \- other jobs may print before this one.
+ .TP 5
+ .B CUPS_BACKEND_RETRY_CURRENT
+ The print file was not successfully transmitted because of a temporary issue.
+@@ -198,7 +198,7 @@ or
+ programs to send print jobs or
+ .BR lpinfo (8)
+ to query for available printers using the backend.
+-The one exception is the SNMP backend - see
++The one exception is the SNMP backend \- see
+ .BR cups-snmp (8)
+ for more information.
+ .SH NOTES
+diff --git a/man/client.conf.5 b/man/client.conf.5
+index 4dbf0c4..f0adb9f 100644
+--- a/man/client.conf.5
++++ b/man/client.conf.5
+@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
+ command:
+ .nf
+ defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
+-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
++defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
+ 
+ defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
+ .fi
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index b451e2f..7249406 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
+ \fBFileDevice No\fR
+ Specifies whether the file pseudo-device can be used for new printer queues.
+ The URI "file:///dev/null" is always allowed.
+-File devices cannot be used with "raw" print queues - a PPD file is required.
++File devices cannot be used with "raw" print queues \- a PPD file is required.
+ The specified file is overwritten for every print job.
+ Writing to directories is not supported.
+ .\"#FontPath
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index e8ce325..344d2af 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
+ [
+ \fB\-h \fIhostname\fR[\fB:\fIport\fR]
+ ] [
+-.B -n
++.B \-n
+ ] [
+-.B -o
++.B \-o
+ .I option=value
+ ]
+ .SH DESCRIPTION
+@@ -34,7 +34,7 @@ and
+ \fB-h \fIhostname\fR[\fB:\fIport\fR]
+ Sets the CUPS server (and port) to use.
+ .TP 5
+-.B -n
++.B \-n
+ Disables reverse address lookups; normally
+ .B cups-lpd
+ will try to discover the hostname of the client via a reverse DNS lookup.
+diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
+index 4ca20f2..bb77c73 100644
+--- a/man/cups-snmp.conf.5
++++ b/man/cups-snmp.conf.5
+@@ -16,7 +16,7 @@ The
+ file configures how the standard CUPS network backends (http, https, ipp, ipps, lpd, snmp, and socket) access printer information using SNMPv1 and is normally located in the \fI/etc/cups\fR directory.
+ Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
+ .LP
+-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
++The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
+ .BR cups-snmp (8).
+ .SH DIRECTIVES
+ The following directives are understood by the CUPS network backends:
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..b0c51a7 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
+ .LP
+ When you are asked for a username and password, enter your login username and password or the "root" username and password.
+ .LP
+-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
++After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
+ .LP
+ Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
+ .LP
+diff --git a/man/cupsctl.8 b/man/cupsctl.8
+index 791954c..c88eb22 100644
+--- a/man/cupsctl.8
++++ b/man/cupsctl.8
+@@ -73,19 +73,19 @@ Display the current settings:
+ Enable debug logging:
+ .nf
+ 
+-    cupsctl --debug-logging
++    cupsctl \--debug-logging
+ 
+ .fi
+ Get the current debug logging state:
+ .nf
+ 
+-    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
++    cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
+ 
+ .fi
+ Disable printer sharing:
+ .nf
+ 
+-    cupsctl --no-share-printers
++    cupsctl \--no-share-printers
+ .fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fBcupsctl\fR.
+diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
+index 2070be9..a912c46 100644
+--- a/man/cupsd-logs.5
++++ b/man/cupsd-logs.5
+@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
+ For example:
+ .nf
+ 
+-    10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
++    10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
+       CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 0 - -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 0 \- \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+       200 157 CUPS-Get-Printers
+       successful-ok-ignored-or-substituted-attributes
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
+-      200 1411 CUPS-Get-Devices -
+-    localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
+-      200 6667 - -
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
++      200 1411 CUPS-Get-Devices \-
++    localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
++      200 6667 \- \-
+ 
+ .fi
+ The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
+ .LP
+-The \fIgroup\fR field always contains "-".
++The \fIgroup\fR field always contains "\-".
+ .LP
+ The \fIuser\fR field is the authenticated username of the requesting user.
+-If no username and password is supplied for the request then this field contains "-".
++If no username and password is supplied for the request then this field contains "\-".
+ .LP
+ The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
+ .LP
+@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
+ Upgrading to TLS-encrypted connection.
+ .TP 5
+ 500
+-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
++Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
+ .TP 5
+ 501
+ The client requested encryption but encryption support is not enabled/compiled in.
+@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
+ The \fIbytes\fR field contains the number of bytes in the request.
+ For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
+ .LP
+-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
++The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
+ .LP
+-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
++The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
+ .SS ERROR LOG FILE FORMAT
+-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
++The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
+ .BR cupsd.conf (5)
+ file controls which messages are logged:
+ .nf
+@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
+ .LP
+ The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
+ .LP
+-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
++The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
+ .LP
+ The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
+ .LP
+-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fImedia\fR field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .LP
+-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
++The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
+ .SH SEE ALSO
+ .BR cupsd (8),
+ .BR cupsd.conf (5),
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 00b1a22..49fdb06 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
+ The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
+ The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
+ The \fIDenyCBC\fR option disables all CBC cipher suites.
+-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
++The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
+ The \fIMinTLS\fR options set the minimum TLS version to support.
+ The \fIMaxTLS\fR options set the maximum TLS version to support.
+ Not all operating systems support TLS 1.3 at this time.
+diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
+index c655c21..fe4c5a2 100644
+--- a/man/cupsfilter.8
++++ b/man/cupsfilter.8
+@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
+ The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
+ .nf
+ 
+-    cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
++    cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
+ .fi
+ .SH SEE ALSO
+ .BR cups (1),
+diff --git a/man/filter.7 b/man/filter.7
+index dbc3150..8cb79bb 100644
+--- a/man/filter.7
++++ b/man/filter.7
+@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
+ .TP 5
+ \fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ .TP 5
+-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
++\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
+ Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
+ .TP 5
+ \fBWARNING:\fI message\fR
+diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
+index fa32efb..8ab2654 100644
+--- a/man/ippeveprinter.1
++++ b/man/ippeveprinter.1
+@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
+ looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command.
+ The
+ .BR cups-config (1)
+-command can be used to discover the correct binary directory ("cups-config --serverbin").
+-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
++command can be used to discover the correct binary directory ("cups-config \--serverbin").
++In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
+ .BR cups (1)
+ man page for more details.
+ .TP 5
+@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
+ \fBSTATE: \fIkeyword[,keyword,...]\fR
+ Sets the printer's "printer-state-reasons" attribute to the listed keywords.
+ .TP 5
+-\fBSTATE: -\fIkeyword[,keyword,...]\fR
++\fBSTATE: \-\fIkeyword[,keyword,...]\fR
+ Removes the listed keywords from the printer's "printer-state-reasons" attribute.
+ .TP 5
+ \fBSTATE: +\fIkeyword[,keyword,...]\fR
+diff --git a/man/ippfind.1 b/man/ippfind.1
+index 32f2e6f..d77ef75 100644
+--- a/man/ippfind.1
++++ b/man/ippfind.1
+@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
+ .B \-l
+ .TP 5
+ .B \-\-ls
+-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
++Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
+ The result is true if the URI is accessible, false otherwise.
+ .TP 5
+ .B \-\-local
+@@ -108,7 +108,7 @@ The result is always true.
+ .B \-q
+ .TP 5
+ .B \-\-quiet
+-Quiet mode - just returns the exit codes below.
++Quiet mode \- just returns the exit codes below.
+ .TP 5
+ .B \-r
+ .TP 5
+@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
+ .TP 5
+ \fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
+ Executes the specified program if the current result is true.
+-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
++"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
+ .PP
+ Expressions may also contain modifiers:
+ .TP 5
+diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
+index 7001017..5763232 100644
+--- a/man/ipptoolfile.5
++++ b/man/ipptoolfile.5
+@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
+ \fBATTR \fItag attribute-name value(s)\fR
+ Adds an attribute to the test request.
+ Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
+-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
+-Common attributes and values are listed in the IANA IPP registry - see references below.
++Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
++Common attributes and values are listed in the IANA IPP registry \- see references below.
+ .TP 5
+ \fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
+ Adds a collection attribute to the test request.
+@@ -194,7 +194,7 @@ test report.
+ \fBEXPECT ?\fIattribute-name predicate(s)\fR
+ .TP 5
+ \fBEXPECT !\fIattribute-name\fR
+-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
++Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
+ .TP 5
+ \fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
+ .TP 5
+@@ -246,7 +246,7 @@ Specifies whether
+ will skip the current test if the previous test resulted in an error/failure.
+ .TP 5
+ \fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
+-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
++Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
+ .TP 5
+ \fBTEST\-ID "\fIidentifier\fR"
+ Specifies an identifier string for the current test.
+diff --git a/man/lp.1 b/man/lp.1
+index cbea3b8..839a482 100644
+--- a/man/lp.1
++++ b/man/lp.1
+@@ -83,7 +83,7 @@ lp \- print files
+ ]
+ .SH DESCRIPTION
+ \fBlp\fR submits files for printing or alters a pending job.
+-Use a filename of "-" to force printing from the standard input.
++Use a filename of "\-" to force printing from the standard input.
+ .SS THE DEFAULT DESTINATION
+ CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
+ If neither are set, the current default set using the
+@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
+ \fB\-P \fIpage-list\fR
+ Specifies which pages to print in the document.
+ The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
+-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
++The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
+ .SS COMMON JOB OPTIONS
+ Aside from the printer-specific options reported by the
+ .BR lpoptions (1)
+@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lp -n 2 filename
++    lp \-n 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
++    lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "bar":
+ .nf
+ 
+-    lp -d bar -o number-up=2 filename
++    lp \-d bar \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/lpadmin.8 b/man/lpadmin.8
+index 1b8c91b..ce6a698 100644
+--- a/man/lpadmin.8
++++ b/man/lpadmin.8
+@@ -120,7 +120,7 @@ command.
+ .TP 5
+ \fB\-o \fIname\fB-default=\fIvalue\fR
+ Sets a default server-side option for the destination.
+-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
++Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
+ .TP 5
+ \fB\-o port\-monitor=\fIname\fR
+ Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
+@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
+ Sets user-level access control on a destination.
+ Names starting with "@" are interpreted as UNIX groups.
+ The latter two forms turn user-level access control off.
+-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
++Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
+ .TP 5
+ \fB\-v "\fIdevice-uri\fB"\fR
+ Sets the \fIdevice-uri\fR attribute of the printer queue.
+@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
+ Create an IPP Everywhere print queue:
+ .nf
+ 
+-    lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
++    lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
+ 
+ .fi
+ .SH SEE ALSO
+diff --git a/man/lpoptions.1 b/man/lpoptions.1
+index a34fd01..7550d9a 100644
+--- a/man/lpoptions.1
++++ b/man/lpoptions.1
+@@ -102,9 +102,9 @@ Destinations can only be removed using the
+ .BR lpadmin (8)
+ command.
+ .SH FILES
+-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
++\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
+ .br
+-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
++\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
+ .SH CONFORMING TO
+ The \fBlpoptions\fR command is unique to CUPS.
+ .SH SEE ALSO
+diff --git a/man/lpr.1 b/man/lpr.1
+index f367cd9..635d126 100644
+--- a/man/lpr.1
++++ b/man/lpr.1
+@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
+ \fB\-o print\-quality=4\fR
+ .TP 5
+ \fB\-o print\-quality=5\fR
+-Specifies the output quality - draft (3), normal (4), or best (5).
++Specifies the output quality \- draft (3), normal (4), or best (5).
+ .TP 5
+ \fB\-o sides=one\-sided\fR
+ Prints on one side of the paper.
+@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
+ Print two copies of a document to the default printer:
+ .nf
+ 
+-    lpr -# 2 filename
++    lpr \-# 2 filename
+ 
+ .fi
+ Print a double-sided legal document to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
++    lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
+ 
+ .fi
+ Print a presentation document 2-up to a printer called "foo":
+ .nf
+ 
+-    lpr -P foo -o number-up=2 filename
++    lpr \-P foo \-o number-up=2 filename
+ .fi
+ .SH SEE ALSO
+ .BR cancel (1),
+diff --git a/man/mime.convs.5 b/man/mime.convs.5
+index 25a6f76..04ba394 100644
+--- a/man/mime.convs.5
++++ b/man/mime.convs.5
+@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
+ The \fIfilter\fR field specifies the filter program filename.
+ Filenames are relative to the CUPS filter directory.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .br
+-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
++\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
+ .br
+-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
++\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
+ .SH EXAMPLES
+ Define a filter that converts PostScript documents to CUPS Raster format:
+ .nf
+diff --git a/man/mime.types.5 b/man/mime.types.5
+index 7e83de1..3572726 100644
+--- a/man/mime.types.5
++++ b/man/mime.types.5
+@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
+ .LP
+ The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
+ .SS RULES
+-Rules take two forms - a filename extension by itself and functions with test
++Rules take two forms \- a filename extension by itself and functions with test
+ values inside parenthesis.
+ The following functions are available:
+ .TP 5
+@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
+ alphanumerically smaller than "text/foo".
+ However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
+ .SH FILES
+-\fI/etc/cups\fR - Typical CUPS configuration directory.
++\fI/etc/cups\fR \- Typical CUPS configuration directory.
+ .SH EXAMPLES
+ Define two MIME media types for raster data, with one being a subset with higher priority:
+ .nf
+diff --git a/man/ppdc.1 b/man/ppdc.1
+index 44e9d24..38e2669 100644
+--- a/man/ppdc.1
++++ b/man/ppdc.1
+@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
+ \fB\-\-crlf\fR
+ .TP 5
+ \fB\-\-lf\fR
+-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
++Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
+ The default is to use the line feed character alone.
+ .SH NOTES
+ PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
diff --git a/debian/patches/0002-Install-root-backends-world-readable.patch b/debian/patches/0002-Install-root-backends-world-readable.patch
new file mode 100644
index 000000000..def3900f7
--- /dev/null
+++ b/debian/patches/0002-Install-root-backends-world-readable.patch
@@ -0,0 +1,66 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:06 +0200
+Subject: Install root backends world-readable
+
+This is needed:
+ - to comply with Debian Policy
+ - because it is both nonsensical to not do so
+ - it also breaks system checkers, bug reporting, etc
+
+Bug: https://github.com/apple/cups/issues/2935
+Bug-Debian: https://bugs.debian.org/410171
+Patch-Name install-root-backends-world-readable.patch
+---
+ backend/Makefile         | 4 ++--
+ scheduler/cups-deviced.c | 2 +-
+ scheduler/job.c          | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/backend/Makefile b/backend/Makefile
+index e3ce49b..b734458 100644
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -13,7 +13,7 @@ include ../Makedefs
+ # Object files...
+ #
+ 
+-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
++# RBACKENDS are installed mode 0744 so cupsd will run them as root...
+ #
+ # UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
+ # an unprivileged user...
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
+ 	echo Installing backends in $(SERVERBIN)/backend
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ 	for file in $(RBACKENDS); do \
+-		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++		$(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
+ 	done
+ 	for file in $(UBACKENDS); do \
+ 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
+index 77703b9..14478fd 100644
+--- a/scheduler/cups-deviced.c
++++ b/scheduler/cups-deviced.c
+@@ -265,7 +265,7 @@ main(int  argc,				/* I - Number of command-line args */
+     * all others run as the unprivileged user...
+     */
+ 
+-    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
++    start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
+   }
+ 
+   cupsDirClose(dir);
+diff --git a/scheduler/job.c b/scheduler/job.c
+index e20e7c5..eb99b3e 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
new file mode 100644
index 000000000..07da4d2f7
--- /dev/null
+++ b/debian/patches/0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
@@ -0,0 +1,27 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:07 +0200
+Subject: Fix jobs with multiple files or multiple formats
+
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
+Bug: https://github.com/apple/cups/issues/4348
+Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+---
+ backend/ipp.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index 3f3e186..a99079e 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -1804,7 +1804,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 	ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+         	      (i + 1) >= num_files);
+ 
+-	if (document_format)
++	if (num_files > 1)
++	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
++		       "document-format", NULL, "application/octet-stream");
++	else if (document_format)
+ 	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ 		       "document-format", NULL, document_format);
+ 
diff --git a/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
new file mode 100644
index 000000000..bc4db9fc9
--- /dev/null
+++ b/debian/patches/0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
@@ -0,0 +1,99 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Mon, 17 Feb 2020 09:05:58 +0100
+Subject: Fix conversion of PPD InputSlot choice names
+
+When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
+... in the InputSlot option CUPS translates these names to double-dashed IPP
+attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
+when passing a job to the printer with the IPP backend, making the printer
+ignore the tray choice, and also when answering a get-printer-attributes IPP
+request from a client. This happens when in the PPD a dash is followed by a
+digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
+whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
+names generally never have double-dashes and also no dashes in the beginning or
+the end of the name, I have modified the pwg_unppdize_name() function
+appropriately.
+
+Bug: https://github.com/apple/cups/issues/5740
+Bug-Debian: https://bugs.debian.org/949315
+---
+ cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 38 insertions(+), 9 deletions(-)
+
+diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
+index 5965e38..6609f53 100644
+--- a/cups/ppd-cache.c
++++ b/cups/ppd-cache.c
+@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ {
+   char	*ptr,				/* Pointer into name buffer */
+ 	*end;				/* End of name buffer */
++  int   nodash = 1;                     /* Next char in IPP name cannot be a
++                                           dash (first char or after a dash) */
+ 
+ 
+   if (_cups_islower(*ppd))
+@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+     const char *ppdptr;			/* Pointer into PPD keyword */
+ 
+     for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
+-      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
++      if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
++	  (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
++	  (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
+         break;
+ 
+     if (!*ppdptr)
+@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
+ 
+   for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
+   {
+-    if (_cups_isalnum(*ppd) || *ppd == '-')
++    if (_cups_isalnum(*ppd))
++    {
+       *ptr++ = (char)tolower(*ppd & 255);
+-    else if (strchr(dashchars, *ppd))
+-      *ptr++ = '-';
++      nodash = 0;
++    }
++    else if (*ppd == '-' || strchr(dashchars, *ppd))
++    {
++      if (nodash == 0)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+     else
++    {
+       *ptr++ = *ppd;
++      nodash = 0;
++    }
+ 
+-    if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
+-	_cups_isupper(ppd[1]) && ptr < end)
+-      *ptr++ = '-';
+-    else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
+-      *ptr++ = '-';
++    if (nodash == 0)
++    {
++      if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
++	  _cups_isupper(ppd[1]) && ptr < end)
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++      else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
++      {
++	*ptr++ = '-';
++	nodash = 1;
++      }
++    }
+   }
+ 
++  /* Remove trailing dashes */
++  while (ptr > name && *(ptr - 1) == '-')
++    ptr --;
++
+   *ptr = '\0';
+ }
diff --git a/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch b/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
new file mode 100644
index 000000000..d43601064
--- /dev/null
+++ b/debian/patches/0005-Fix-scheduler-cupsd.conf-load.patch
@@ -0,0 +1,86 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Sat, 22 Feb 2020 14:28:58 +0100
+Subject: Fix scheduler cupsd.conf load
+
+When running it without arguments it is supposed to read the local CUPS's
+cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
+with a lot of HTML inside and this is due to the fact that when loading the
+file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
+admin.cgi program which returns the admin front page of the web admin
+interface. cupsctl then tries to interpret that as the config file and displays
+garbage. Even worse is if you run cupsctl with command line argument (one of
+the five switches or a key=value pair) to change a setting. It seems to load
+cupsd.conf again and gets again the HTML code of the web interface page.
+cupsctl tries to interpret this again, producing garbage, adds the
+user-supplied setting and writes all this back into cupsd.conf. Then it tries
+to restart the scheduler which fails due to the broken config file.
+The problem is that in the file scheduler/client.conf, in the function
+get_file() the URI from the client is at first checked whether it begins with
+"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
+that the check for "/admin/conf/cupsd.conf" comes and is never reached.
+I have changed the order now appropriately and this way cupsctl works again.
+Note that the problem only occurs if the web interface is active and the
+cupsctl command is issued by a non-root user.
+This is a regression caused by issue #5652.
+
+Bug: https://github.com/apple/cups/issues/5744
+---
+ scheduler/client.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/scheduler/client.c b/scheduler/client.c
+index c2ee8f1..54b841b 100644
+--- a/scheduler/client.c
++++ b/scheduler/client.c
+@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
++  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
++  {
++    strlcpy(filename, ConfigurationFile, len);
++
++    perm_check = 0;
++  }
++  else if (!strncmp(con->uri, "/admin/log/", 11))
++  {
++    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
++      strlcpy(filename, AccessLog, len);
++    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
++      strlcpy(filename, ErrorLog, len);
++    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
++      strlcpy(filename, PageLog, len);
++    else
++      return (NULL);
++
++    perm_check = 0;
++  }
+   else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
+   {
+    /*
+@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con,		/* I  - Client connection */
+ 
+     perm_check = 0;
+   }
+-  else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
+-  {
+-    strlcpy(filename, ConfigurationFile, len);
+-
+-    perm_check = 0;
+-  }
+-  else if (!strncmp(con->uri, "/admin/log/", 11))
+-  {
+-    if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
+-      strlcpy(filename, AccessLog, len);
+-    else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
+-      strlcpy(filename, ErrorLog, len);
+-    else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
+-      strlcpy(filename, PageLog, len);
+-    else
+-      return (NULL);
+-
+-    perm_check = 0;
+-  }
+   else if (con->language)
+   {
+     snprintf(language, sizeof(language), "/%s", con->language->language);
diff --git a/debian/patches/0006-Fix-leakage-of-ppd.patch b/debian/patches/0006-Fix-leakage-of-ppd.patch
new file mode 100644
index 000000000..665395c3b
--- /dev/null
+++ b/debian/patches/0006-Fix-leakage-of-ppd.patch
@@ -0,0 +1,21 @@
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 14 Feb 2020 16:48:49 +0100
+Subject: Fix leakage of ppd
+
+---
+ ppdc/ppdc-import.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
+index 04b587d..b4a8341 100644
+--- a/ppdc/ppdc-import.cxx
++++ b/ppdc/ppdc-import.cxx
+@@ -323,5 +323,8 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
+     }
+   }
+ 
++  if (ppd)
++    ppdClose(ppd);
++
+   return (1);
+ }
diff --git a/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch b/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
new file mode 100644
index 000000000..a0c55e473
--- /dev/null
+++ b/debian/patches/0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
@@ -0,0 +1,28 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:09 +0200
+Subject: Tests: Ignore warnings from colord and Avahi
+
+These warnings change the expected number of warnings
+
+Patch-Name: tests-ignore-warnings.patch
+---
+ test/run-stp-tests.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 2f9630f..a601581 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1040,7 +1040,11 @@ else
+ fi
+ 
+ # Warning log messages
+-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
++count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
++       $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
++       $GREP -v 'org.freedesktop.ColorManager' | \
++       $GREP -v -E 'Avahi client failed: -(1|26)' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 8; then
+ 	echo "FAIL: $count warning messages, expected 8."
+ 	$GREP '^W ' $BASE/log/error_log
diff --git a/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch b/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
new file mode 100644
index 000000000..21d84e708
--- /dev/null
+++ b/debian/patches/0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:10 +0200
+Subject: Tests: ignore usb & dnssd backend unexpected exits
+
+Ignore the following errors:
+ "[cups-deviced] PID * (usb) crashed on signal 11!" and
+ "[cups-deviced] PID * (dnssd) stopped with status 1"
+
+ They seem to regularly happen on Debian/Ubuntu buildds and break error lines
+ counting.
+Patch-Name: tests-ignore-usb-crash.patch
+---
+ test/run-stp-tests.sh | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index a601581..8bde425 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1025,7 +1025,10 @@ else
+ fi
+ 
+ # Error log messages
+-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
++count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
++       $GREP -v '(usb) crashed on signal 11' | \
++       $GREP -v '(dnssd) stopped with status 1' | \
++       wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
+ 	$GREP '^E ' $BASE/log/error_log
diff --git a/debian/patches/0009-Tests-ignore-loadFile-failures.patch b/debian/patches/0009-Tests-ignore-loadFile-failures.patch
new file mode 100644
index 000000000..6f592d7e7
--- /dev/null
+++ b/debian/patches/0009-Tests-ignore-loadFile-failures.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:30:48 +0200
+Subject: Tests: ignore loadFile failures
+
+Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
+breaks the errorlines counting on kfreebsd-amd64 for some reason
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+---
+ test/run-stp-tests.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 8bde425..f5a98dd 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1028,6 +1028,8 @@ fi
+ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
+        $GREP -v '(usb) crashed on signal 11' | \
+        $GREP -v '(dnssd) stopped with status 1' | \
++       $GREP -v 'loadFile failed: temp file: not a PDF file' | \
++       $GREP -v 'Failed to connect to system bus' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch b/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
new file mode 100644
index 000000000..8088de19f
--- /dev/null
+++ b/debian/patches/0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:33:56 +0200
+Subject: Tests: ignore errors triggered on ipv6-deprived hosts
+
+Ignore the 'Address family not supported by protocol' error that breaks the
+errorlines counting on buildds without a working IPv6 stack.
+Origin: vendor
+Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f5a98dd..f3a4321 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v '(dnssd) stopped with status 1' | \
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
++       $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch b/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
new file mode 100644
index 000000000..708c28dcf
--- /dev/null
+++ b/debian/patches/0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:36:02 +0200
+Subject: Tests: ignore the failure to write uncompressed data
+
+Ignore the 'Unable to write uncompressed print data: Broken pipe'  error that
+sometimes breaks the errorlines counting on kfreebsd for some reason.
+Origin: vendor
+Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index f3a4321..c072ad8 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'loadFile failed: temp file: not a PDF file' | \
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
++       $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0012-Tests-ignore-job-held-message.patch b/debian/patches/0012-Tests-ignore-job-held-message.patch
new file mode 100644
index 000000000..11f87ab7c
--- /dev/null
+++ b/debian/patches/0012-Tests-ignore-job-held-message.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Sat, 8 Feb 2020 11:49:07 +0100
+Subject: Tests: ignore 'job held' message
+
+Origin: vendor
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index c072ad8..dfa7f6a 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -1032,6 +1032,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
+        $GREP -v 'Failed to connect to system bus' | \
+        $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
+        $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
++       $GREP -v 'Job held by' | \
+        wc -l | awk '{print $1}'`
+ if test $count != 33; then
+ 	echo "FAIL: $count error messages, expected 33."
diff --git a/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch b/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
new file mode 100644
index 000000000..931feb799
--- /dev/null
+++ b/debian/patches/0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:16 +0200
+Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either,
+ as glibc's iconv behavior is different than what the test expects.
+
+Bug-Debian: https://bugs.debian.org/662996
+Patch-Name: test-i18n-nonlinux.patch
+---
+ cups/testi18n.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cups/testi18n.c b/cups/testi18n.c
+index 45e1cab..449670c 100644
+--- a/cups/testi18n.c
++++ b/cups/testi18n.c
+@@ -410,7 +410,7 @@ main(int  argc,				/* I - Argument Count */
+       puts("PASS");
+   }
+ 
+-#ifndef __linux
++#if !defined(__linux__) && !defined(__GLIBC__)
+   fputs("cupsCharsetToUTF8(CUPS_EUC_JP): ", stdout);
+ 
+   strlcpy(legsrc, legdest, sizeof(legsrc));
diff --git a/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch b/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
new file mode 100644
index 000000000..a677af5fb
--- /dev/null
+++ b/debian/patches/0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:17 +0200
+Subject: Tests: Make sure that all scheduled jobs are finished before
+
+ running a new test. Fixes failures on slow architectures like armel and
+ mipsel.
+Bug-Debian: https://bugs.debian.org/670878
+Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch
+---
+ test/run-stp-tests.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index dfa7f6a..173fc86 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -776,6 +776,11 @@ echo "    $date by $user on `hostname`." >>$strfile
+ echo "    <pre>" >>$strfile
+ 
+ for file in 5*.sh; do
++	#
++	# Make sure the past jobs are done before going on.
++	#
++	./waitjobs.sh 1800
++
+ 	echo $ac_n "Performing $file: $ac_c"
+ 	echo "" >>$strfile
+         echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
diff --git a/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch b/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
new file mode 100644
index 000000000..9c3a8463e
--- /dev/null
+++ b/debian/patches/0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
@@ -0,0 +1,31 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:18 +0200
+Subject: Tests: Force LC_* environment variables when testing (non)
+ l10n'isation.
+
+ Permits building in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch
+---
+ cups/testppd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cups/testppd.c b/cups/testppd.c
+index 36707f2..a4ab7bf 100644
+--- a/cups/testppd.c
++++ b/cups/testppd.c
+@@ -658,6 +658,14 @@ main(int  argc,				/* I - Number of command-line arguments */
+     * Test localization...
+     */
+ 
++   /*
++    * Enforce void localization
++    */
++    putenv("LANG=C");
++    putenv("LC_ALL=C");
++    putenv("LC_CTYPE=C");
++    putenv("LC_MESSAGES=C");
++
+     fputs("ppdLocalizeIPPReason(text): ", stdout);
+     if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+         !strcmp(buffer, "Foo Reason"))
diff --git a/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch b/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
new file mode 100644
index 000000000..56e9a0710
--- /dev/null
+++ b/debian/patches/0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
@@ -0,0 +1,64 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:21 +0200
+Subject: Tests: Use 127.0.0.1 instead of localhost to help pbuilder
+
+This should make the test-suite work in pbuilder. It apparently also fixes an
+ipp backend problem in the test-suite.
+
+Origin: vendor
+Patch-Name: tests-use-ipv4-lo-address.patch
+---
+ test/5.1-lpadmin.sh   | 4 ++--
+ test/run-stp-tests.sh | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
+index 7efc398..08b8c50 100644
+--- a/test/5.1-lpadmin.sh
++++ b/test/5.1-lpadmin.sh
+@@ -52,8 +52,8 @@ echo ""
+ 
+ echo "Add Shared Printer Test"
+ echo ""
+-echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+-$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
++echo "    lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere"
++$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://127.0.0.1:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+ if test $? != 0; then
+ 	echo "    FAILED"
+ 	exit 1
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 173fc86..88bafb1 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -490,7 +490,7 @@ fi
+ cat >$BASE/cupsd.conf <<EOF
+ StrictConformance Yes
+ Browsing Off
+-Listen localhost:$port
++Listen 127.0.0.1:$port
+ Listen $BASE/sock
+ MaxSubscriptions 3
+ MaxLogSize 0
+@@ -617,7 +617,7 @@ fi
+ 
+ # These get exported because they don't have side-effects...
+ CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
+-CUPS_SERVER=localhost:$port; export CUPS_SERVER
++CUPS_SERVER=127.0.0.1:$port; export CUPS_SERVER
+ CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
+ CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
+ CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+@@ -743,10 +743,10 @@ for file in 4*.test ../examples/ipp-2.1.test; do
+         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
+ 
+ 	if test $file = ../examples/ipp-2.1.test; then
+-		uri="ipp://localhost:$port/printers/Test1"
++		uri="ipp://127.0.0.1:$port/printers/Test1"
+ 		options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
+ 	else
+-		uri="ipp://localhost:$port/printers"
++		uri="ipp://127.0.0.1:$port/printers"
+ 		options=""
+ 	fi
+ 	$runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
diff --git a/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch b/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
new file mode 100644
index 000000000..1ba692070
--- /dev/null
+++ b/debian/patches/0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
@@ -0,0 +1,24 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:22 +0200
+Subject: Tests: Force LC_ALL=C environment variable when grepping the output
+ of lpstat
+
+Permits testing in non-"C" environments.
+Origin: vendor
+Patch-Name: tests-make-lpstat-call-reproducible.patch
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 88bafb1..d9b3985 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -642,6 +642,7 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run
+ echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+ echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+ echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
++echo "LC_ALL=\"C\"; export LC_ALL" >>$runcups
+ if test "x$CUPS_DEBUG_LEVEL" != x; then
+ 	echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+ 	echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
diff --git a/debian/patches/0018-Tests-Do-not-test-pdftourf.patch b/debian/patches/0018-Tests-Do-not-test-pdftourf.patch
new file mode 100644
index 000000000..08c1c73ec
--- /dev/null
+++ b/debian/patches/0018-Tests-Do-not-test-pdftourf.patch
@@ -0,0 +1,68 @@
+From: Michael Sweet <michael.r.sweet@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:23 +0200
+Subject: Tests: Do not test pdftourf
+
+ Revert commit 830cfed95a5349b008999eebd34f5233bc35829c
+
+ "Update "make test" to include alternate filter."
+ .
+ This fixes the error lines counting in the test, and is unneeded as pdftourf
+ is not shipped in Debian.
+Origin: upstream
+Patch-Name: tests-no-pdftourf.patch
+---
+ test/run-stp-tests.sh | 4 +---
+ test/test.convs       | 1 -
+ test/test.types       | 2 --
+ 3 files changed, 1 insertion(+), 6 deletions(-)
+ delete mode 100644 test/test.types
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index d9b3985..bc332fc 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -268,7 +268,7 @@ case "$usedebugprintfs" in
+ 		echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
+ 		CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
+ 		CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
+-		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
++		CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+ 		;;
+ 
+ 	*)
+@@ -443,14 +443,12 @@ EOF
+ }
+ 
+ ln -s $root/test/test.convs $BASE/share/mime
+-ln -s $root/test/test.types $BASE/share/mime
+ 
+ if test `uname` = Darwin; then
+ 	instfilter cgimagetopdf imagetopdf pdf
+ 	instfilter cgpdftopdf pdftopdf passthru
+ 	instfilter cgpdftops pdftops ps
+ 	instfilter cgpdftoraster pdftoraster raster
+-	instfilter cgpdftoraster pdftourf raster
+ 	instfilter cgtexttopdf texttopdf pdf
+ 	instfilter pstocupsraster pstoraster raster
+ else
+diff --git a/test/test.convs b/test/test.convs
+index 77a9ce0..57540aa 100644
+--- a/test/test.convs
++++ b/test/test.convs
+@@ -2,7 +2,6 @@
+ application/pdf application/vnd.cups-pdf 100 pdftopdf
+ application/pdf application/postscript 100 pdftops
+ application/pdf application/vnd.cups-raster 100 pdftoraster
+-application/pdf image/urf 100 pdftourf
+ application/postscript application/vnd.cups-raster 100 pstoraster
+ image/jpeg application/pdf 100 imagetopdf
+ text/plain application/pdf 100 texttopdf
+diff --git a/test/test.types b/test/test.types
+deleted file mode 100644
+index 914081c..0000000
+--- a/test/test.types
++++ /dev/null
+@@ -1,2 +0,0 @@
+-# Test file listing potential MIME media types that are not in the standard mime.types file
+-image/urf
+\ No newline at end of file
diff --git a/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch b/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
new file mode 100644
index 000000000..c785eb981
--- /dev/null
+++ b/debian/patches/0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug-Debian: https://bugs.debian.org/640124
+Patch-Name: move-cupsd-conf-default-to-share.patch
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index f087809..6e9a64a 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1629,6 +1629,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1712,7 +1713,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch b/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
new file mode 100644
index 000000000..439e3e94d
--- /dev/null
+++ b/debian/patches/0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
@@ -0,0 +1,91 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Patch to support Apple AirPrint (printing from iPhone, iPad,
+ iPod Touch to a CUPS server)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Patch-Name: airprint-support.patch
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb6049b..bb4f9d2 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index e341bdb..545e0de 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
new file mode 100644
index 000000000..4389e274d
--- /dev/null
+++ b/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -0,0 +1,48 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:30 +0200
+Subject: Let snmp backend also use manufacturer-specific MIBs
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+ … of HP and Ricoh to obtain the device IDs of network-connected
+ printers. This way we get more reliable information about make and model
+ and in addition the supported page description languages, which allows one to
+ identify whether an optional PostScript add-on is installed or for an
+ unsupported printer which generic PPD is the best choice (requested by
+ Ricoh).
+Bug: https://github.com/apple/cups/issues/3552
+Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+---
+ backend/snmp.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/backend/snmp.c b/backend/snmp.c
+index 66ac884..9572822 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -154,6 +154,8 @@ static const int	UriOID[] = { CUPS_OID_ppmPortServiceNameOrURI, 1, 1, -1 };
+ static const int	LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 };
+ static const int	LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 };
+ static const int	LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 };
++static const int	HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 };
++static const int	RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 };
+ static const int	XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 };
+ static cups_array_t	*DeviceURIs = NULL;
+ static int		HostNameLookups = 0;
+@@ -969,9 +971,15 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_ID, LexmarkDeviceIdOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, RicohDeviceIdOID);
+ 	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
+ 	               packet.community, CUPS_ASN1_GET_REQUEST,
+ 		       DEVICE_PRODUCT, XeroxProductOID);
++	_cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1,
++		       packet.community, CUPS_ASN1_GET_REQUEST,
++		       DEVICE_ID, HPDeviceIdOID);
+         break;
+ 
+     case DEVICE_DESCRIPTION :
diff --git a/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch b/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
new file mode 100644
index 000000000..4bede9adc
--- /dev/null
+++ b/debian/patches/0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
@@ -0,0 +1,67 @@
+From: Joey Hess <joeyh@debian.org>
+Date: Tue, 9 Aug 2016 18:11:31 +0200
+Subject: Disable time stamps in conffiles,
+ to avoid ever-changing files in /etc.
+
+Bug: https://github.com/apple/cups/issues/3067
+Bug-Debian: https://bugs.debian.org/549673
+Patch-Name: no-conffile-timestamp.patch
+---
+ scheduler/classes.c       | 2 +-
+ scheduler/job.c           | 2 +-
+ scheduler/printers.c      | 2 +-
+ scheduler/subscriptions.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/classes.c b/scheduler/classes.c
+index 14d2558..35d0eb7 100644
+--- a/scheduler/classes.c
++++ b/scheduler/classes.c
+@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+  /*
+diff --git a/scheduler/job.c b/scheduler/job.c
+index eb99b3e..760e30f 100644
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
+ 
+  /*
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 545e0de..f28c64a 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -1503,7 +1503,7 @@ cupsdSaveAllPrinters(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
+ 
+   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
+diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
+index 15acedc..eca0bfa 100644
+--- a/scheduler/subscriptions.c
++++ b/scheduler/subscriptions.c
+@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
+   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
+ 
+   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
+-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
++  cupsFilePrintf(fp, "# Written by cupsd\n");
+ 
+   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
+ 
diff --git a/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch b/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
new file mode 100644
index 000000000..8ffa2bcb0
--- /dev/null
+++ b/debian/patches/0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
@@ -0,0 +1,29 @@
+From: Kenshi Muto <kmuto@debian.org>
+Date: Tue, 9 Aug 2016 18:11:33 +0200
+Subject: Do not write VCS tags into installed conffiles
+
+Bug: https://github.com/apple/cups/issues/2369
+Origin: vendor
+Author: Didier Raboud <odyx@debian.org>
+Patch-Name: removecvstag.patch
+---
+ conf/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/Makefile b/conf/Makefile
+index 42a123f..db0060d 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -69,8 +69,12 @@ install-data:
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
++			mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
+ 		fi ; \
+ 		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
++		grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \
++		mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
diff --git a/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch b/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
new file mode 100644
index 000000000..4d2456ab1
--- /dev/null
+++ b/debian/patches/0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
@@ -0,0 +1,59 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:34 +0200
+Subject: Rename the systemd service file from org.cups.cups.* to cups.*
+
+Patch-Name: rename-systemd-units.patch
+---
+ scheduler/org.cups.cups-lpd.socket  | 2 +-
+ scheduler/org.cups.cupsd.path.in    | 2 +-
+ scheduler/org.cups.cupsd.service.in | 2 +-
+ scheduler/org.cups.cupsd.socket.in  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/org.cups.cups-lpd.socket
+index ed23f9d..eb84459 100644
+--- a/scheduler/org.cups.cups-lpd.socket
++++ b/scheduler/org.cups.cups-lpd.socket
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS LPD Server Socket
+-PartOf=org.cups.cups-lpd.service
++PartOf=cups-lpd.service
+ 
+ [Socket]
+ ListenStream=515
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 0f1cc46..7c8509f 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Path]
+ PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 5273762..cd23343 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -9,5 +9,5 @@ Type=simple
+ Restart=on-failure
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
+index 613b977..3c37d72 100644
+--- a/scheduler/org.cups.cupsd.socket.in
++++ b/scheduler/org.cups.cupsd.socket.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=CUPS Scheduler
+-PartOf=org.cups.cupsd.service
++PartOf=cups.service
+ 
+ [Socket]
+ ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
diff --git a/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch b/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
new file mode 100644
index 000000000..c7df689e2
--- /dev/null
+++ b/debian/patches/0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
@@ -0,0 +1,21 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Mon, 24 Feb 2020 11:46:49 +0100
+Subject: Add Requires=cups.socket to cups.service,
+ to make sure they start in the right order
+
+---
+ scheduler/org.cups.cupsd.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index cd23343..79d2c40 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -2,6 +2,7 @@
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+ After=sssd.service
++Requires=cups.socket
+ 
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
diff --git a/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch b/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
new file mode 100644
index 000000000..ef052d5ef
--- /dev/null
+++ b/debian/patches/0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
@@ -0,0 +1,25 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:35 +0200
+Subject: Do not use host names for broadcasting print queues and
+
+ managing print queues broadcasted from other servers by default. Many
+ networks do not have valid host names for all machines.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
+Patch-Name: do-not-broadcast-with-hostnames.patch
+---
+ scheduler/conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bb4f9d2..b73d33f 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -899,7 +899,7 @@ cupsdReadConfiguration(void)
+     cupsdAddAlias(ServerAlias, temp);
+     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
+ 
+-    if (HostNameLookups || RemotePort)
++    if (HostNameLookups)
+     {
+       struct hostent	*host;		/* Host entry to get FQDN */
+ 
diff --git a/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch b/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
new file mode 100644
index 000000000..f30429b4c
--- /dev/null
+++ b/debian/patches/0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
@@ -0,0 +1,39 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: CUPS removes the "(recommended)" comments of the NickNames of
+ Foomatic PPDs when listing available PPDs. This patch removes this removal
+ action.
+
+Patch-Name: reactivate_recommended_driver.patch
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch b/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
new file mode 100644
index 000000000..7b93a2da1
--- /dev/null
+++ b/debian/patches/0028-Make-log-files-readable-to-group-adm-if-present.patch
@@ -0,0 +1,60 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
+Bug-Ubuntu: https://launchpad.net/bugs/345953
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 2bd1952..ae0aa55 100644
+--- a/scheduler/log.c
++++ b/scheduler/log.c
+@@ -21,6 +21,7 @@
+ #  include <systemd/sd-journal.h>
+ #endif /* HAVE_ASL_H */
+ #include <syslog.h>
++#include <grp.h>
+ 
+ 
+ /*
+@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+ 		filename[1024],		/* Formatted log filename */
+ 		*ptr;			/* Pointer into filename */
+   const char	*logptr;		/* Pointer into log filename */
++  struct group  *loggrp;		/* Group entry of log filename */
+ 
+ 
+  /*
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     return (1);
+   }
+ 
++ /*
++  * Use adm group if possible, fall back to Group
++  */
++ loggrp = getgrnam("adm");
++
+  /*
+   * Format the filename as needed...
+   */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+       * Change ownership and permissions of non-device logs...
+       */
+ 
+-      fchown(cupsFileNumber(*lf), RunUser, Group);
++      fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+       fchmod(cupsFileNumber(*lf), LogFilePerm);
+     }
+   }
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf,	/* IO - Log file */
+     * Change ownership and permissions of non-device logs...
+     */
+ 
+-    fchown(cupsFileNumber(*lf), RunUser, Group);
++    fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
+     fchmod(cupsFileNumber(*lf), LogFilePerm);
+   }
+ 
diff --git a/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch b/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
new file mode 100644
index 000000000..c5e7fb2a1
--- /dev/null
+++ b/debian/patches/0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:40 +0200
+Subject: Deactivate CUPS' own log rotating as the system already provides a
+ more sophisticated log rotating
+
+Patch-Name: default_log_settings.patch
+---
+ conf/cupsd.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
+index ab37ca6..78189e5 100644
+--- a/conf/cupsd.conf.in
++++ b/conf/cupsd.conf.in
+@@ -8,6 +8,10 @@
+ LogLevel @CUPS_LOG_LEVEL@
+ @CUPS_PAGE_LOG_FORMAT@
+ 
++# Deactivate CUPS' internal logrotating, as we provide a better one, especially
++# LogLevel debug2 gets usable now
++MaxLogSize 0
++
+ # Only listen for connections from the local machine.
+ Listen localhost:@DEFAULT_IPP_PORT@
+ @CUPS_LISTEN_DOMAINSOCKET@
diff --git a/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch b/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
new file mode 100644
index 000000000..2057a4856
--- /dev/null
+++ b/debian/patches/0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
@@ -0,0 +1,26 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Do not mess with the permissions of cupsd.conf.
+
+Patch-Name: confdirperms.patch
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index b73d33f..31eedbf 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0031-Show-compile-command-lines.patch b/debian/patches/0031-Show-compile-command-lines.patch
new file mode 100644
index 000000000..dd1a1f08b
--- /dev/null
+++ b/debian/patches/0031-Show-compile-command-lines.patch
@@ -0,0 +1,23 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Show compile command lines
+
+Patch-Name: show-compile-command-lines.patch
+---
+ Makedefs.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..511fbf8 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,8 +263,7 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+-.SUFFIXES:	.a .c .cxx .h .o
++.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+ 
+ .c.o:
+ 	echo Compiling $<...
diff --git a/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch b/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
new file mode 100644
index 000000000..40b9bbdfe
--- /dev/null
+++ b/debian/patches/0032-Set-the-default-for-SyncOnClose-to-Yes.patch
@@ -0,0 +1,64 @@
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 9 Aug 2016 18:11:46 +0200
+Subject: Set the default for SyncOnClose to Yes
+
+Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch
+---
+ conf/cups-files.conf.in           | 2 +-
+ doc/help/man-cups-files.conf.html | 2 +-
+ man/cups-files.conf.5             | 2 +-
+ scheduler/conf.c                  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index 4a78ba6..a3d088d 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -7,7 +7,7 @@
+ #FatalErrors @CUPS_FATAL_ERRORS@
+ 
+ # Do we call fsync() after writing configuration or status files?
+-#SyncOnClose No
++#SyncOnClose Yes
+ 
+ # Default user and group for filters/backends/helper programs; this cannot be
+ # any user or group that resolves to ID 0 for security reasons...
+diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
+index c567cbb..f2f6802 100644
+--- a/doc/help/man-cups-files.conf.html
++++ b/doc/help/man-cups-files.conf.html
+@@ -150,7 +150,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ <dd style="margin-left: 5.0em">Specifies whether the scheduler calls
+ <b>fsync</b>(2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ <dt><a name="SystemGroup"></a><b>SystemGroup </b><i>group-name </i>[ ... <i>group-name</i> ]
+ <dd style="margin-left: 5.0em">Specifies the group(s) to use for <i>@SYSTEM</i> group authentication.
+ The default contains "admin", "lpadmin", "root", "sys", and/or "system".
+diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
+index 7249406..955f47b 100644
+--- a/man/cups-files.conf.5
++++ b/man/cups-files.conf.5
+@@ -211,7 +211,7 @@ The default is "/var/run/cups" or "/etc/cups" depending on the platform.
+ Specifies whether the scheduler calls
+ .BR fsync (2)
+ after writing configuration or state files.
+-The default is "No".
++The default is "Yes".
+ .\"#SystemGroup
+ .TP 5
+ \fBSystemGroup \fIgroup-name \fR[ ... \fIgroup-name\fR ]
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 31eedbf..f2924f8 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -735,7 +735,7 @@ cupsdReadConfiguration(void)
+   RootCertDuration         = 300;
+   Sandboxing               = CUPSD_SANDBOXING_STRICT;
+   StrictConformance        = FALSE;
+-  SyncOnClose              = FALSE;
++  SyncOnClose              = TRUE;
+   Timeout                  = 900;
+   WebInterface             = CUPS_DEFAULT_WEBIF;
+ 
diff --git a/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch b/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
new file mode 100644
index 000000000..80abeb3a8
--- /dev/null
+++ b/debian/patches/0033-Set-default-job-error-policy-to-retry-job.patch
@@ -0,0 +1,73 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 9 Aug 2016 18:11:47 +0200
+Subject: Set default job error policy to "retry-job"
+
+It it is less confusing and a better default on most machines.
+Amend documentation accordingly.
+
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Patch-Name: cups-set-default-error-policy-retry-job.patch
+---
+ doc/help/man-cupsd.conf.html | 4 ++--
+ man/cupsd.conf.5             | 4 ++--
+ scheduler/conf.c             | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
+index 1668eee..7d161ed 100644
+--- a/doc/help/man-cupsd.conf.html
++++ b/doc/help/man-cupsd.conf.html
+@@ -95,9 +95,9 @@ The default is typically the server's ".local" hostname.
+ <dt><b>ErrorPolicy retry-current-job</b>
+ <dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ <dt><b>ErrorPolicy retry-job</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ <dt><b>ErrorPolicy stop-printer</b>
+-<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ <dt><a name="FilterLimit"></a><b>FilterLimit </b><i>limit</i>
+ <dd style="margin-left: 5.0em">Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.
+ A limit of 0 disables filter limiting.
+diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
+index 49fdb06..6d3d8e3 100644
+--- a/man/cupsd.conf.5
++++ b/man/cupsd.conf.5
+@@ -140,10 +140,10 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
+ Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
+ .TP 5
+ \fBErrorPolicy retry-job\fR
+-Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
++Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer. The 'retry-job' error policy is the default.
+ .TP 5
+ \fBErrorPolicy stop-printer\fR
+-Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
++Specifies that a failed print job should stop the printer unless otherwise specified for the printer.
+ .\"#FilterLimit
+ .TP 5
+ \fBFilterLimit \fIlimit\fR
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index f2924f8..944655e 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -752,7 +752,7 @@ cupsdReadConfiguration(void)
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+ 
+-  cupsdSetString(&ErrorPolicy, "stop-printer");
++  cupsdSetString(&ErrorPolicy, "retry-job");
+ 
+   JobHistory          = DEFAULT_HISTORY;
+   JobFiles            = DEFAULT_FILES;
+@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void)
+       strcmp(ErrorPolicy, "retry-job") &&
+       strcmp(ErrorPolicy, "stop-printer"))
+   {
+-    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"stop-printer\".", ErrorPolicy);
+-    cupsdSetString(&ErrorPolicy, "stop-printer");
++    cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid ErrorPolicy \"%s\", resetting to \"retry-job\".", ErrorPolicy);
++    cupsdSetString(&ErrorPolicy, "retry-job");
+   }
+ 
+  /*
diff --git a/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch b/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
new file mode 100644
index 000000000..0853e7056
--- /dev/null
+++ b/debian/patches/0034-Drop-dangling-references-from-cups-lpd.man.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
+Date: Tue, 9 Aug 2016 18:11:48 +0200
+Subject: Drop dangling references from cups-lpd.man
+
+Bug-Debian: https://bugs.debian.org/570157
+Patch-Name: man-cups-lpd-drop-dangling-references.patch
+---
+ man/cups-lpd.8 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
+index 344d2af..e998df3 100644
+--- a/man/cups-lpd.8
++++ b/man/cups-lpd.8
+@@ -109,9 +109,7 @@ Simply enable the
+ .B cups-lpd
+ service using the corresponding control program.
+ .SH SEE ALSO
+-.BR cups (1),
+ .BR cupsd (8),
+-.BR inetconv (1m),
+ .BR inetd (8),
+ .BR launchd (8),
+ .BR xinetd (8),
diff --git a/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch b/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
new file mode 100644
index 000000000..142ad8a04
--- /dev/null
+++ b/debian/patches/0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+Patch-Name: debianize_cups-config.patch
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
new file mode 100644
index 000000000..f28bdca18
--- /dev/null
+++ b/debian/patches/0036-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+Bug-Debian: https://bugs.debian.org/837936
+Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 511fbf8..fbd16fb 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index dbf3bda..535b0b9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch b/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
new file mode 100644
index 000000000..ecfe58203
--- /dev/null
+++ b/debian/patches/0037-po4a-infrastructure-and-translations-for-manpages.patch
@@ -0,0 +1,342 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+Patch-Name: manpage-translations.patch
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/0038-Resolve-DNS-SD-service-name-based-URIs-correctly-als.patch b/debian/patches/0038-Resolve-DNS-SD-service-name-based-URIs-correctly-als.patch
new file mode 100644
index 000000000..6c6af1947
--- /dev/null
+++ b/debian/patches/0038-Resolve-DNS-SD-service-name-based-URIs-correctly-als.patch
@@ -0,0 +1,71 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 25 Aug 2020 21:34:00 +0200
+Subject: Resolve DNS-SD-service-name-based URIs correctly also if they are
+ from a service from localhost (like IPP-over-USB, Printer Application, ...)
+
+---
+ cups/http-support.c | 33 +++++++++++++++++++++++++++++----
+ 1 file changed, 29 insertions(+), 4 deletions(-)
+
+diff --git a/cups/http-support.c b/cups/http-support.c
+index 6317514..8eabaee 100644
+--- a/cups/http-support.c
++++ b/cups/http-support.c
+@@ -2483,7 +2483,7 @@ http_poll_cb(
+ static void
+ http_resolve_cb(
+     AvahiServiceResolver   *resolver,	/* I - Resolver (unused) */
+-    AvahiIfIndex           interface,	/* I - Interface index (unused) */
++    AvahiIfIndex           interface,	/* I - Interface index */
+     AvahiProtocol          protocol,	/* I - Network protocol (unused) */
+     AvahiResolverEvent     event,	/* I - Event (found, etc.) */
+     const char             *name,	/* I - Service name */
+@@ -2504,6 +2504,7 @@ http_resolve_cb(
+ 			*resdefault;	/* Default path */
+   char			resource[257],	/* Remote path */
+ 			fqdn[256];	/* FQDN of the .local name */
++  char			ifname[IF_NAMESIZE]; /* Interface name */
+   AvahiStringList	*pair;		/* Current TXT record key/value pair */
+   char			*value;		/* Value for "rp" key */
+   size_t		valueLen = 0;	/* Length of "rp" key */
+@@ -2630,13 +2631,37 @@ http_resolve_cb(
+     strlcpy(resource, resdefault, sizeof(resource));
+   }
+ 
++ /*
++  * Check whether the interface is the loopback interface ("lo"), in this
++  * case set "localhost" as the host name
++  */
++
++  if (!if_indextoname((unsigned int)interface, ifname))
++  {
++    if (uribuf->options & _HTTP_RESOLVE_STDERR)
++      fprintf(stderr,
++	      "DEBUG: Unable to find interface name for interface %d: %s\n",
++	      interface, strerror(errno));
++    DEBUG_printf(("Unable to find interface name for interface %d: %s\n",
++		  interface, strerror(errno)));
++    ifname[0] = '\0';
++  }
++
++  if (!strcmp(ifname, "lo")) {
++    if (uribuf->options & _HTTP_RESOLVE_STDERR)
++      fputs("DEBUG: Service comes from loopback interface \"lo\", setting \"localhost\" as host name.\n",
++	    stderr);
++    DEBUG_puts("Service comes from loopback interface \"lo\", setting \"localhost\" as host name.");
++    hostTarget = "localhost";
++  }
++
+  /*
+   * Lookup the FQDN if needed...
+   */
+ 
+-  if ((uribuf->options & _HTTP_RESOLVE_FQDN) &&
+-      (hostptr = hostTarget + strlen(hostTarget) - 6) > hostTarget &&
+-      !_cups_strcasecmp(hostptr, ".local"))
++  else if ((uribuf->options & _HTTP_RESOLVE_FQDN) &&
++	   (hostptr = hostTarget + strlen(hostTarget) - 6) > hostTarget &&
++	   !_cups_strcasecmp(hostptr, ".local"))
+   {
+    /*
+     * OK, we got a .local name but the caller needs a real domain.  Start by
diff --git a/debian/patches/0039-Fix-fax-numbers-supplied-via-GTK-print-dialog-removi.patch b/debian/patches/0039-Fix-fax-numbers-supplied-via-GTK-print-dialog-removi.patch
new file mode 100644
index 000000000..c982f0e71
--- /dev/null
+++ b/debian/patches/0039-Fix-fax-numbers-supplied-via-GTK-print-dialog-removi.patch
@@ -0,0 +1,86 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Wed, 26 Aug 2020 13:03:00 +0200
+Subject: Fix fax numbers supplied via GTK print dialog,
+ removing a "Custom." prefix;
+ do not choke if the GTK dialog sends "None" as phone number or pre-dial
+ prefix
+
+---
+ backend/ipp.c | 54 ++++++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 42 insertions(+), 12 deletions(-)
+
+diff --git a/backend/ipp.c b/backend/ipp.c
+index a99079e..a076a0b 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -2828,7 +2828,21 @@ new_request(
+         */
+ 
+         _httpDecodeURI(phone, keyword, sizeof(phone));
+-        for (ptr = phone; *ptr;)
++        ptr = phone;
++
++        /*
++         * Weed out "Custom." in the beginning, this allows to put the
++         * "phone" option as custom string option into the PPD so that
++         * print dialogs not supporting fax display the option and
++         * allow entering the phone number. Print dialogs also send "None"
++         * if no phone number got entered, filter this, too.
++         */
++        if (!_cups_strcasecmp(phone, "None"))
++          *ptr = '\0';
++        if (!_cups_strncasecmp(phone, "Custom.", 7))
++          _cups_strcpy(ptr, ptr + 7);
++
++        for (; *ptr;)
+ 	{
+ 	  if (*ptr == ',')
+ 	    *ptr = 'p';
+@@ -2838,20 +2852,36 @@ new_request(
+ 	    ptr ++;
+         }
+ 
+-        httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri), "tel", NULL, NULL, 0, phone);
+-        ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI, "destination-uri", NULL, tel_uri);
+-
+-	if ((keyword = cupsGetOption("faxPrefix", num_options,
+-	                             options)) != NULL && *keyword)
++        if (strlen(phone) > 0)
+         {
+-	  char	predial[1024];		/* Pre-dial string */
++          httpAssembleURI(HTTP_URI_CODING_ALL, tel_uri, sizeof(tel_uri), "tel", NULL, NULL, 0, phone);
++          ippAddString(destination, IPP_TAG_JOB, IPP_TAG_URI, "destination-uri", NULL, tel_uri);
++          fprintf(stderr, "DEBUG: Faxing to phone %s; destination-uri: %s\n", phone, tel_uri);
+ 
+-	  _httpDecodeURI(predial, keyword, sizeof(predial));
+-	  ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT, "pre-dial-string", NULL, predial);
+-	}
++          if ((keyword = cupsGetOption("faxPrefix", num_options, options)) != NULL && *keyword)
++          {
++            char	predial[1024];		/* Pre-dial string */
++
++            _httpDecodeURI(predial, keyword, sizeof(predial));
++            ptr = predial;
++            if (!_cups_strcasecmp(ptr, "None"))
++              *ptr = '\0';
++            if (!_cups_strncasecmp(ptr, "Custom.", 7))
++              ptr += 7;
++            if (strlen(ptr) > 0)
++            {
++              ippAddString(destination, IPP_TAG_JOB, IPP_TAG_TEXT, "pre-dial-string", NULL, ptr);
++              fprintf(stderr, "DEBUG: Pre-dialing %s; pre-dial-string: %s\n", ptr, ptr);
++            }
++            else
++              fprintf(stderr, "WARNING: Pre-dial number for fax not valid! Sending fax without pre-dial number.\n");
++          }
+ 
+-        ippAddCollection(request, IPP_TAG_JOB, "destination-uris", destination);
+-        ippDelete(destination);
++          ippAddCollection(request, IPP_TAG_JOB, "destination-uris", destination);
++          ippDelete(destination);
++        }
++        else
++          fprintf(stderr, "ERROR: Phone number for fax not valid! Fax cannot be sent.\n");
+       }
+     }
+     else
diff --git a/debian/patches/0040-Let-the-rastertopwg-filter-check-rounding-errors-whe.patch b/debian/patches/0040-Let-the-rastertopwg-filter-check-rounding-errors-whe.patch
new file mode 100644
index 000000000..ab4f2cb90
--- /dev/null
+++ b/debian/patches/0040-Let-the-rastertopwg-filter-check-rounding-errors-whe.patch
@@ -0,0 +1,77 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Thu, 27 Aug 2020 10:22:00 +0200
+Subject: Let the rastertopwg filter check rounding errors when calculating
+ the page geometry
+
+---
+ filter/rastertopwg.c | 28 ++++++++++++++++++++++------
+ 1 file changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c
+index 1e63e4e..7a25233 100644
+--- a/filter/rastertopwg.c
++++ b/filter/rastertopwg.c
+@@ -41,8 +41,10 @@ main(int  argc,				/* I - Number of command-line args */
+ 			page_top,	/* Top margin */
+ 			page_bottom,	/* Bottom margin */
+ 			page_left,	/* Left margin */
++			page_right,	/* Right margin */
+ 			linesize,	/* Bytes per line */
+ 			lineoffset;	/* Offset into line */
++  int			tmp;
+   unsigned char		white;		/* White pixel */
+   ppd_file_t		*ppd;		/* PPD file */
+   ppd_attr_t		*back;		/* cupsBackSide attribute */
+@@ -120,14 +122,30 @@ main(int  argc,				/* I - Number of command-line args */
+     fprintf(stderr, "PAGE: %d %d\n", page, inheader.NumCopies);
+ 
+     page_width  = (unsigned)(inheader.cupsPageSize[0] * inheader.HWResolution[0] / 72.0);
++    if (page_width < inheader.cupsWidth &&
++	page_width >= inheader.cupsWidth - 1)
++      page_width = (unsigned)inheader.cupsWidth;
+     page_height = (unsigned)(inheader.cupsPageSize[1] * inheader.HWResolution[1] / 72.0);
++    if (page_height < inheader.cupsHeight &&
++	page_height >= inheader.cupsHeight - 1)
++      page_height = (unsigned)inheader.cupsHeight;
+     page_left   = (unsigned)(inheader.cupsImagingBBox[0] * inheader.HWResolution[0] / 72.0);
+     page_bottom = (unsigned)(inheader.cupsImagingBBox[1] * inheader.HWResolution[1] / 72.0);
+-    page_top    = page_height - page_bottom - inheader.cupsHeight;
++    tmp        = (int)(page_height - page_bottom - inheader.cupsHeight);
++    if (tmp < 0 && tmp >= -1) /* Rounding error */
++      page_top = 0;
++    else
++      page_top = (unsigned)tmp;
++    tmp        = (int)(page_width - page_left - inheader.cupsWidth);
++    if (tmp < 0 && tmp >= -1) /* Rounding error */
++      page_right = 0;
++    else
++      page_right = (unsigned)tmp;
+     linesize    = (page_width * inheader.cupsBitsPerPixel + 7) / 8;
+     lineoffset  = page_left * inheader.cupsBitsPerPixel / 8; /* Round down */
+ 
+-    if (page_left > page_width || page_top > page_height || page_bottom > page_height)
++    fprintf(stderr, "DEBUG: In pixels: Width: %u  Height: %u  Left: %u  Right:  %u  Top: %u  Bottom: %u\n", page_width, page_height, page_left, page_right, page_top, page_bottom);
++    if (page_left > page_width || page_top > page_height || page_bottom > page_height || page_right > page_width)
+     {
+       _cupsLangPrintFilter(stderr, "ERROR", _("Unsupported raster data."));
+       fprintf(stderr, "DEBUG: Bad bottom/left/top margin on page %d.\n", page);
+@@ -291,8 +309,7 @@ main(int  argc,				/* I - Number of command-line args */
+ 	  outheader.cupsInteger[1] = ~0U;/* CrossFeedTransform */
+ 	  outheader.cupsInteger[2] = 1;	/* FeedTransform */
+ 
+-	  outheader.cupsInteger[3] = page_width - page_left -
+-	                             inheader.cupsWidth;
++	  outheader.cupsInteger[3] = page_right;
+ 					/* ImageBoxLeft */
+ 	  outheader.cupsInteger[4] = page_top;
+ 					/* ImageBoxTop */
+@@ -355,8 +372,7 @@ main(int  argc,				/* I - Number of command-line args */
+ 	  outheader.cupsInteger[1] = ~0U;/* CrossFeedTransform */
+ 	  outheader.cupsInteger[2] = ~0U;/* FeedTransform */
+ 
+-	  outheader.cupsInteger[3] = page_width - page_left -
+-	                             inheader.cupsWidth;
++	  outheader.cupsInteger[3] = page_right;
+ 					/* ImageBoxLeft */
+ 	  outheader.cupsInteger[4] = page_bottom;
+ 					/* ImageBoxTop */
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..21b50ebed
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,40 @@
+0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
+0002-Install-root-backends-world-readable.patch
+0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
+0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
+0005-Fix-scheduler-cupsd.conf-load.patch
+0006-Fix-leakage-of-ppd.patch
+0007-Tests-Ignore-warnings-from-colord-and-Avahi.patch
+0008-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
+0009-Tests-ignore-loadFile-failures.patch
+0010-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
+0011-Tests-ignore-the-failure-to-write-uncompressed-data.patch
+0012-Tests-ignore-job-held-message.patch
+0013-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
+0014-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
+0015-Tests-Force-LC_-environment-variables-when-testing-n.patch
+0016-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
+0017-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
+0018-Tests-Do-not-test-pdftourf.patch
+0019-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
+0020-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
+0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0022-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
+0023-Do-not-write-VCS-tags-into-installed-conffiles.patch
+0024-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
+0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
+0026-Do-not-use-host-names-for-broadcasting-print-queues-.patch
+0027-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
+0028-Make-log-files-readable-to-group-adm-if-present.patch
+0029-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.patch
+0030-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
+0031-Show-compile-command-lines.patch
+0032-Set-the-default-for-SyncOnClose-to-Yes.patch
+0033-Set-default-job-error-policy-to-retry-job.patch
+0034-Drop-dangling-references-from-cups-lpd.man.patch
+0035-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
+0036-Build-mantohtml-with-the-build-architecture-compiler.patch
+0037-po4a-infrastructure-and-translations-for-manpages.patch
+0038-Resolve-DNS-SD-service-name-based-URIs-correctly-als.patch
+0039-Fix-fax-numbers-supplied-via-GTK-print-dialog-removi.patch
+0040-Let-the-rastertopwg-filter-check-rounding-errors-whe.patch
-- 
cgit v1.2.3


From ac0866b3b02183d8f83b80566585522bfd5ee792 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 24 Nov 2020 08:49:46 +0100
Subject: cups 2.3.3-4 Debian release

---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e4dfb229e..b67293626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cups (2.3.3-4) unstable; urgency=medium
+
+  * Drop Ubuntu "Make lpoptions list a printer's options correctly also when
+    CUPS is running on an alternative port" patch, refused upstream
+    (Closes: #970725)
+  * Use upstream-merged patches for fax numbers' fix and rastertopwg rounding
+
+ -- Didier Raboud <odyx@debian.org>  Tue, 24 Nov 2020 08:49:46 +0100
+
 cups (2.3.3-3) unstable; urgency=medium
 
   [ Didier Raboud ]
-- 
cgit v1.2.3


From 61906a4cc49f519b07302e662572d3c772566406 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Apple AirPrint support

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Bug: https://github.com/OpenPrinting/cups/pull/27
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 74531a8c7..bfd1b0b75 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 7e9a9f265..3e0087496 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 1f27b6af01b085c1e81217fd06d92f5845da2115 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames

Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 9fcde8aea35c72aa72c44af6f7e2e2b75da2d931 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Debian: Set LogFileGroup to adm

---
 conf/cups-files.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index af11fcce6..80ca35145 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
 #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
 #LogFilePerm 0@CUPS_LOG_FILE_PERM@
 
+# Specifies the group name or ID that will be used for log files.
+# The default group in Debian is "adm".
+LogFileGroup adm
+
 # Location of the file logging all access to the scheduler; may be the name
 # "syslog". If not an absolute path, the value of ServerRoot is used as the
 # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
-- 
cgit v1.2.3


From 41788a005a81a02cbf3877fe4db055207c171d9d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug: https://github.com/OpenPrinting/cups/pull/26
Bug-Debian: https://bugs.debian.org/640124
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index c6489389f..5ff750190 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 673583f7b0f73d58ed3d57ad82856881ad853f48 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Debian: Do not alter the permissions of cupsd.conf, ever

Origin: vendor
Bug: https://github.com/OpenPrinting/cups/pull/36
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bfd1b0b75..c8cd5ea49 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 31ec5ec16a9e447af568f5048c4a5b9df7baebe0 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Debian: Show compile command lines

---
 Makedefs.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..038bb9451 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
 .SUFFIXES:	.a .c .cxx .h .o
 
 .c.o:
-- 
cgit v1.2.3


From 84f96ba94716b7eb34bcbe0597984efdd0b9e5d4 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config

Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 8493abdb87bd1f4c893c932f6110541ae165a2fd Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 038bb9451..291099cf2 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index b22e24fa7..176c44f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 7d53a76d7f956ca0a5509f5d695f3142681ea01b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: Debian: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 5e5ad63cb65835f89a147adaaf090ed612384bb1 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 27 Nov 2020 17:27:07 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 debian/patches/0001-Apple-AirPrint-support.patch   |  90 ++++++
 ...tic-PPDs-recommended-stanzas-in-NickNames.patch |  37 +++
 .../0003-Debian-Set-LogFileGroup-to-adm.patch      |  23 ++
 ...-cupsd.conf.default-from-SERVERROOT-to-DA.patch |  62 ++++
 ...ot-alter-the-permissions-of-cupsd.conf-ev.patch |  27 ++
 .../0006-Debian-Show-compile-command-lines.patch   |  20 ++
 ...dpkg-architecture-in-cups-config-to-make-.patch |  49 +++
 ...d-mantohtml-with-the-build-architecture-c.patch | 110 +++++++
 ...-infrastructure-and-translations-for-manp.patch | 341 +++++++++++++++++++++
 debian/patches/series                              |   9 +
 10 files changed, 768 insertions(+)
 create mode 100644 debian/patches/0001-Apple-AirPrint-support.patch
 create mode 100644 debian/patches/0002-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
 create mode 100644 debian/patches/0003-Debian-Set-LogFileGroup-to-adm.patch
 create mode 100644 debian/patches/0004-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
 create mode 100644 debian/patches/0005-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
 create mode 100644 debian/patches/0006-Debian-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0007-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
 create mode 100644 debian/patches/0008-Debian-Build-mantohtml-with-the-build-architecture-c.patch
 create mode 100644 debian/patches/0009-Debian-po4a-infrastructure-and-translations-for-manp.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Apple-AirPrint-support.patch b/debian/patches/0001-Apple-AirPrint-support.patch
new file mode 100644
index 000000000..5fc39dfe8
--- /dev/null
+++ b/debian/patches/0001-Apple-AirPrint-support.patch
@@ -0,0 +1,90 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Apple AirPrint support
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Bug: https://github.com/OpenPrinting/cups/pull/27
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 74531a8..bfd1b0b 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 7e9a9f2..3e00874 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0002-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch b/debian/patches/0002-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
new file mode 100644
index 000000000..0da73cea6
--- /dev/null
+++ b/debian/patches/0002-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
@@ -0,0 +1,37 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames
+
+Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0003-Debian-Set-LogFileGroup-to-adm.patch b/debian/patches/0003-Debian-Set-LogFileGroup-to-adm.patch
new file mode 100644
index 000000000..597d9bfad
--- /dev/null
+++ b/debian/patches/0003-Debian-Set-LogFileGroup-to-adm.patch
@@ -0,0 +1,23 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Debian: Set LogFileGroup to adm
+
+---
+ conf/cups-files.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index af11fcc..80ca351 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
+ #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
+ #LogFilePerm 0@CUPS_LOG_FILE_PERM@
+ 
++# Specifies the group name or ID that will be used for log files.
++# The default group in Debian is "adm".
++LogFileGroup adm
++
+ # Location of the file logging all access to the scheduler; may be the name
+ # "syslog". If not an absolute path, the value of ServerRoot is used as the
+ # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
diff --git a/debian/patches/0004-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch b/debian/patches/0004-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
new file mode 100644
index 000000000..c4efe6cad
--- /dev/null
+++ b/debian/patches/0004-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug: https://github.com/OpenPrinting/cups/pull/26
+Bug-Debian: https://bugs.debian.org/640124
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index c648938..5ff7501 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0005-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch b/debian/patches/0005-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
new file mode 100644
index 000000000..bcbc93a03
--- /dev/null
+++ b/debian/patches/0005-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
@@ -0,0 +1,27 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Debian: Do not alter the permissions of cupsd.conf, ever
+
+Origin: vendor
+Bug: https://github.com/OpenPrinting/cups/pull/36
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bfd1b0b..c8cd5ea 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0006-Debian-Show-compile-command-lines.patch b/debian/patches/0006-Debian-Show-compile-command-lines.patch
new file mode 100644
index 000000000..a3c709609
--- /dev/null
+++ b/debian/patches/0006-Debian-Show-compile-command-lines.patch
@@ -0,0 +1,20 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Debian: Show compile command lines
+
+---
+ Makedefs.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..038bb94 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+ .SUFFIXES:	.a .c .cxx .h .o
+ 
+ .c.o:
diff --git a/debian/patches/0007-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch b/debian/patches/0007-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
new file mode 100644
index 000000000..7f508d999
--- /dev/null
+++ b/debian/patches/0007-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0008-Debian-Build-mantohtml-with-the-build-architecture-c.patch b/debian/patches/0008-Debian-Build-mantohtml-with-the-build-architecture-c.patch
new file mode 100644
index 000000000..73c63f9c6
--- /dev/null
+++ b/debian/patches/0008-Debian-Build-mantohtml-with-the-build-architecture-c.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+
+Bug-Debian: https://bugs.debian.org/837936
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 038bb94..291099c 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index b22e24f..176c44f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0009-Debian-po4a-infrastructure-and-translations-for-manp.patch b/debian/patches/0009-Debian-po4a-infrastructure-and-translations-for-manp.patch
new file mode 100644
index 000000000..ef9aa4262
--- /dev/null
+++ b/debian/patches/0009-Debian-po4a-infrastructure-and-translations-for-manp.patch
@@ -0,0 +1,341 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: Debian: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..9f16c30ab
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,9 @@
+0001-Apple-AirPrint-support.patch
+0002-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
+0003-Debian-Set-LogFileGroup-to-adm.patch
+0004-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
+0005-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
+0006-Debian-Show-compile-command-lines.patch
+0007-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
+0008-Debian-Build-mantohtml-with-the-build-architecture-c.patch
+0009-Debian-po4a-infrastructure-and-translations-for-manp.patch
-- 
cgit v1.2.3


From efd9a48722cf2aa67731e9b6be6e564d6a596415 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 27 Nov 2020 17:43:38 +0100
Subject: Mirror packaging/cups.spec from 2.3.3op1 tarball

---
 packaging/cups.spec | 440 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 440 insertions(+)
 create mode 100644 packaging/cups.spec

diff --git a/packaging/cups.spec b/packaging/cups.spec
new file mode 100644
index 000000000..1a50855a7
--- /dev/null
+++ b/packaging/cups.spec
@@ -0,0 +1,440 @@
+#
+# RPM "spec" file for CUPS.
+#
+# Original version by Jason McMullan <jmcc@ontv.com>.
+#
+# Copyright © 2020 by Michael R Sweet
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1999-2007 by Easy Software Products, all rights reserved.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+# Conditional build options (--with name/--without name):
+#
+#   dbus     - Enable/disable DBUS support (default = enable)
+#   dnssd    - Enable/disable DNS-SD support (default = enable)
+#   libusb1  - Enable/disable LIBUSB 1.0 support (default = enable)
+#   static   - Enable/disable static libraries (default = enable)
+#   systemd  - Enable/disable systemd support (default = enable)
+
+%{!?_with_dbus: %{!?_without_dbus: %define _with_dbus --with-dbus}}
+%{?_with_dbus: %define _dbus --enable-dbus}
+%{!?_with_dbus: %define _dbus --disable-dbus}
+
+%{!?_with_dnssd: %{!?_without_dnssd: %define _with_dnssd --with-dnssd}}
+%{?_with_dnssd: %define _dnssd --enable-avahi}
+%{!?_with_dnssd: %define _dnssd --disable-avahi}
+
+%{!?_with_libusb1: %{!?_without_libusb1: %define _with_libusb1 --with-libusb1}}
+%{?_with_libusb1: %define _libusb1 --enable-libusb}
+%{!?_with_libusb1: %define _libusb1 --disable-libusb}
+
+%{!?_with_static: %{!?_without_static: %define _without_static --without-static}}
+%{?_with_static: %define _static --enable-static}
+%{!?_with_static: %define _static --disable-static}
+
+%{!?_with_systemd: %{!?_without_systemd: %define _with_systemd --with-systemd}}
+%{?_with_systemd: %define _systemd --enable-systemd}
+%{!?_with_systemd: %define _systemd --disable-systemd}
+
+Summary: CUPS
+Name: cups
+Version: 2.3.3op1
+Release: 0
+Epoch: 1
+License: GPL
+Group: System Environment/Daemons
+Source: https://github.com/openprinting/cups/releases/download/v2.3.3op1/cups-2.3.3op1-source.tar.gz
+Url: http://www.cups.org
+Packager: Anonymous <anonymous@example.com>
+Vendor: OpenPrinting
+
+# Package names are as defined for Red Hat (and clone) distributions
+BuildRequires: gnutls-devel, pam-devel
+
+%if %{?_with_dbus:1}%{!?_with_dbus:0}
+BuildRequires: dbus-devel
+%endif
+
+%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
+BuildRequires: avahi-devel
+%endif
+
+%if %{?_with_libusb1:1}%{!?_with_libusb1:0}
+BuildRequires: libusb-devel >= 1.0
+%endif
+
+%if %{?_with_systemd:1}%{!?_with_systemd:0}
+BuildRequires: systemd-devel
+%endif
+
+# Use buildroot so as not to disturb the version already installed
+BuildRoot: /tmp/%{name}-root
+
+# Dependencies...
+Requires: %{name}-libs = %{epoch}:%{version}
+Obsoletes: lpd, lpr, LPRng
+Provides: lpd, lpr, LPRng
+Obsoletes: cups-da, cups-de, cups-es, cups-et, cups-fi, cups-fr, cups-he
+Obsoletes: cups-id, cups-it, cups-ja, cups-ko, cups-nl, cups-no, cups-pl
+Obsoletes: cups-pt, cups-ru, cups-sv, cups-zh
+
+%package devel
+Summary: CUPS - development environment
+Group: Development/Libraries
+Requires: %{name}-libs = %{epoch}:%{version}
+
+%package libs
+Summary: CUPS - shared libraries
+Group: System Environment/Libraries
+Provides: libcups1
+
+%package lpd
+Summary: CUPS - LPD support
+Group: System Environment/Daemons
+Requires: %{name} = %{epoch}:%{version} xinetd
+
+%description
+CUPS is the standards-based, open source printing system developed by
+Apple Inc. and maintained by OpenPrinting for macOS® and other UNIX®-like
+operating systems.
+
+%description devel
+This package provides the CUPS headers and development environment.
+
+%description libs
+This package provides the CUPS shared libraries.
+
+%description lpd
+This package provides LPD client support.
+
+%prep
+%setup
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \
+    ./configure %{_dbus} %{_dnssd} %{_libusb1} %{_static} %{_systemd}
+# If we got this far, all prerequisite libraries must be here.
+make
+
+%install
+# Make sure the RPM_BUILD_ROOT directory exists.
+rm -rf $RPM_BUILD_ROOT
+
+make BUILDROOT=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/data
+
+%post
+%if %{?_with_systemd:1}%{!?_with_systemd:0}
+/bin/systemctl enable cups.service
+
+if test $1 -ge 1; then
+	/bin/systemctl stop cups.service
+	/bin/systemctl start cups.service
+fi
+
+%else
+/sbin/chkconfig --add cups
+/sbin/chkconfig cups on
+
+# Restart cupsd if we are upgrading...
+if test $1 -gt 1; then
+	/sbin/service cups stop
+	/sbin/service cups start
+fi
+%endif
+
+%post libs
+/sbin/ldconfig
+
+%preun
+%if %{?_with_systemd:1}%{!?_with_systemd:0}
+if test $1 -ge 1; then
+	/bin/systemctl stop cups.service
+	/bin/systemctl disable cups.service
+fi
+
+%else
+if test $1 = 0; then
+	/sbin/service cups stop
+	/sbin/chkconfig --del cups
+fi
+%endif
+
+%postun
+%if %{?_with_systemd:1}%{!?_with_systemd:0}
+if test $1 -ge 1; then
+	/bin/systemctl stop cups.service
+	/bin/systemctl start cups.service
+fi
+
+%else
+if test $1 -ge 1; then
+	/sbin/service cups stop
+	/sbin/service cups start
+fi
+%endif
+
+%postun libs
+/sbin/ldconfig
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%docdir /usr/share/doc/cups
+%defattr(-,root,root)
+%dir /etc/cups
+%config(noreplace) /etc/cups/*.conf
+/etc/cups/cups-files.conf.default
+/etc/cups/cupsd.conf.default
+/etc/cups/snmp.conf.default
+%dir /etc/cups/ppd
+%attr(0700,root,root) %dir /etc/cups/ssl
+
+%if %{?_with_dbus:1}%{!?_with_dbus:0}
+# DBUS
+/etc/dbus-1/system.d/*
+%endif
+
+# PAM
+%dir /etc/pam.d
+/etc/pam.d/*
+
+%if %{?_with_systemd:1}%{!?_with_systemd:0}
+# SystemD
+/usr/lib/systemd/system/cups.*
+
+%else
+# Legacy init support on Linux
+/etc/init.d/*
+/etc/rc0.d/*
+/etc/rc2.d/*
+/etc/rc3.d/*
+/etc/rc5.d/*
+%endif
+
+/usr/bin/cancel
+/usr/bin/cupstestppd
+/usr/bin/ippeveprinter
+/usr/bin/ipptool
+/usr/bin/lp*
+%dir /usr/lib/cups
+%dir /usr/lib/cups/backend
+%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
+# DNS-SD
+/usr/bin/ippfind
+/usr/lib/cups/backend/dnssd
+%endif
+/usr/lib/cups/backend/http
+/usr/lib/cups/backend/https
+%attr(0700,root,root) /usr/lib/cups/backend/ipp
+/usr/lib/cups/backend/ipps
+%attr(0700,root,root) /usr/lib/cups/backend/lpd
+/usr/lib/cups/backend/snmp
+/usr/lib/cups/backend/socket
+/usr/lib/cups/backend/usb
+%dir /usr/lib/cups/cgi-bin
+/usr/lib/cups/cgi-bin/*
+%dir /usr/lib/cups/command
+/usr/lib/cups/command/*
+%dir /usr/lib/cups/daemon
+/usr/lib/cups/daemon/cups-deviced
+/usr/lib/cups/daemon/cups-driverd
+/usr/lib/cups/daemon/cups-exec
+%dir /usr/lib/cups/driver
+%dir /usr/lib/cups/filter
+/usr/lib/cups/filter/*
+%dir /usr/lib/cups/monitor
+/usr/lib/cups/monitor/*
+%dir /usr/lib/cups/notifier
+/usr/lib/cups/notifier/*
+
+/usr/sbin/*
+%dir /usr/share/cups
+%dir /usr/share/cups/drv
+/usr/share/cups/drv/*
+%dir /usr/share/cups/ipptool
+/usr/share/cups/ipptool/*
+%dir /usr/share/cups/mime
+/usr/share/cups/mime/*
+%dir /usr/share/cups/model
+%dir /usr/share/cups/ppdc
+/usr/share/cups/ppdc/*
+%dir /usr/share/cups/templates
+/usr/share/cups/templates/*
+%if %{?_with_libusb1:1}%{!?_with_libusb1:0}
+# LIBUSB quirks files
+%dir /usr/share/cups/usb
+/usr/share/cups/usb/*
+%endif
+
+%dir /usr/share/doc/cups
+/usr/share/doc/cups/*.*
+%dir /usr/share/doc/cups/help
+/usr/share/doc/cups/help/accounting.html
+/usr/share/doc/cups/help/admin.html
+/usr/share/doc/cups/help/cgi.html
+/usr/share/doc/cups/help/encryption.html
+/usr/share/doc/cups/help/firewalls.html
+/usr/share/doc/cups/help/glossary.html
+/usr/share/doc/cups/help/kerberos.html
+/usr/share/doc/cups/help/license.html
+/usr/share/doc/cups/help/man-*.html
+/usr/share/doc/cups/help/network.html
+/usr/share/doc/cups/help/options.html
+/usr/share/doc/cups/help/overview.html
+/usr/share/doc/cups/help/policies.html
+/usr/share/doc/cups/help/ref-*.html
+/usr/share/doc/cups/help/security.html
+/usr/share/doc/cups/help/sharing.html
+/usr/share/doc/cups/help/translation.html
+%dir /usr/share/doc/cups/images
+/usr/share/doc/cups/images/*
+
+#%dir /usr/share/doc/cups/ca
+#/usr/share/doc/cups/ca/*
+#%dir /usr/share/doc/cups/cs
+#/usr/share/doc/cups/cs/*
+%dir /usr/share/doc/cups/de
+/usr/share/doc/cups/de/*
+%dir /usr/share/doc/cups/es
+/usr/share/doc/cups/es/*
+#%dir /usr/share/doc/cups/fr
+#/usr/share/doc/cups/fr/*
+%dir /usr/share/doc/cups/ja
+/usr/share/doc/cups/ja/*
+%dir /usr/share/doc/cups/pt_BR
+/usr/share/doc/cups/pt_BR/*
+%dir /usr/share/doc/cups/ru
+/usr/share/doc/cups/ru/*
+
+%dir /usr/share/locale/ca
+/usr/share/locale/ca/cups_ca.po
+%dir /usr/share/locale/cs
+/usr/share/locale/cs/cups_cs.po
+%dir /usr/share/locale/de
+/usr/share/locale/de/cups_de.po
+%dir /usr/share/locale/en
+/usr/share/locale/en/cups_en.po
+%dir /usr/share/locale/es
+/usr/share/locale/es/cups_es.po
+%dir /usr/share/locale/fr
+/usr/share/locale/fr/cups_fr.po
+%dir /usr/share/locale/it
+/usr/share/locale/it/cups_it.po
+%dir /usr/share/locale/ja
+/usr/share/locale/ja/cups_ja.po
+%dir /usr/share/locale/pt_BR
+/usr/share/locale/pt_BR/cups_pt_BR.po
+%dir /usr/share/locale/ru
+/usr/share/locale/ru/cups_ru.po
+%dir /usr/share/locale/zh_CN
+/usr/share/locale/zh_CN/cups_zh_CN.po
+
+%dir /usr/share/man/man1
+/usr/share/man/man1/cancel.1.gz
+/usr/share/man/man1/cups.1.gz
+/usr/share/man/man1/cupstestppd.1.gz
+/usr/share/man/man1/ippeveprinter.1.gz
+%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
+# DNS-SD
+/usr/share/man/man1/ippfind.1.gz
+%endif
+/usr/share/man/man1/ipptool.1.gz
+/usr/share/man/man1/lp.1.gz
+/usr/share/man/man1/lpoptions.1.gz
+/usr/share/man/man1/lpq.1.gz
+/usr/share/man/man1/lpr.1.gz
+/usr/share/man/man1/lprm.1.gz
+/usr/share/man/man1/lpstat.1.gz
+%dir /usr/share/man/man5
+/usr/share/man/man5/*.conf.5.gz
+/usr/share/man/man5/cupsd-logs.5.gz
+/usr/share/man/man5/ipptoolfile.5.gz
+/usr/share/man/man5/mime.*.5.gz
+%dir /usr/share/man/man7
+/usr/share/man/man7/ippevepcl.7.gz
+/usr/share/man/man7/ippeveps.7.gz
+%dir /usr/share/man/man8
+/usr/share/man/man8/cups-deviced.8.gz
+/usr/share/man/man8/cups-driverd.8.gz
+/usr/share/man/man8/cups-exec.8.gz
+/usr/share/man/man8/cups-snmp.8.gz
+/usr/share/man/man8/cupsaccept.8.gz
+/usr/share/man/man8/cupsctl.8.gz
+/usr/share/man/man8/cupsfilter.8.gz
+/usr/share/man/man8/cupsd.8.gz
+/usr/share/man/man8/cupsd-helper.8.gz
+/usr/share/man/man8/cupsdisable.8.gz
+/usr/share/man/man8/cupsenable.8.gz
+/usr/share/man/man8/cupsreject.8.gz
+/usr/share/man/man8/lpadmin.8.gz
+/usr/share/man/man8/lpc.8.gz
+/usr/share/man/man8/lpinfo.8.gz
+/usr/share/man/man8/lpmove.8.gz
+
+%dir /var/cache/cups
+%attr(0775,root,sys) %dir /var/cache/cups/rss
+%dir /var/log/cups
+%dir /var/run/cups
+%attr(0711,lp,sys) %dir /var/run/cups/certs
+%attr(0710,lp,sys) %dir /var/spool/cups
+%attr(1770,lp,sys) %dir /var/spool/cups/tmp
+
+# Desktop files
+/usr/share/applications/*
+/usr/share/icons/*
+
+%files devel
+%defattr(-,root,root)
+%dir /usr/share/cups/examples
+/usr/share/cups/examples/*
+%dir /usr/share/man/man1
+/usr/share/man/man1/cups-config.1.gz
+/usr/share/man/man1/ppd*.1.gz
+%dir /usr/share/man/man5
+/usr/share/man/man5/ppdcfile.5.gz
+/usr/share/man/man7/backend.7.gz
+/usr/share/man/man7/filter.7.gz
+/usr/share/man/man7/notifier.7.gz
+
+/usr/bin/cups-config
+/usr/bin/ppd*
+%dir /usr/include/cups
+/usr/include/cups/*
+/usr/lib*/*.so
+
+%if %{?_with_static:1}%{!?_with_static:0}
+/usr/lib*/*.a
+%endif
+
+%dir /usr/share/doc/cups/help
+/usr/share/doc/cups/help/api*.html
+/usr/share/doc/cups/help/cupspm.*
+/usr/share/doc/cups/help/postscript-driver.html
+/usr/share/doc/cups/help/ppd-compiler.html
+/usr/share/doc/cups/help/raster-driver.html
+/usr/share/doc/cups/help/spec*.html
+
+%files libs
+%defattr(-,root,root)
+/usr/lib*/*.so.*
+
+%files lpd
+%defattr(-,root,root)
+%if %{?_with_systemd:1}%{!?_with_systemd:0}
+# SystemD
+/usr/lib/systemd/system/cups-lpd*
+%else
+# Legacy xinetd
+/etc/xinetd.d/cups-lpd
+%endif
+
+%dir /usr/lib/cups
+%dir /usr/lib/cups/daemon
+/usr/lib/cups/daemon/cups-lpd
+%dir /usr/share/man/man8
+/usr/share/man/man8/cups-lpd.8.gz
-- 
cgit v1.2.3


From 47c9f3722964fcf2eb18d8e16eac8f37ff9ea5d5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 27 Nov 2020 17:27:21 +0100
Subject: cups 2.3.3op1-1 Debian release

---
 debian/changelog | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d3290925..b6570239b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,30 @@
-cups (2.3.3op1-1) UNRELEASED; urgency=medium
-
-  * Update to new upstream version 2.3.3op1.
-
- -- Didier Raboud <odyx@debian.org>  Fri, 27 Nov 2020 17:06:42 +0100
+cups (2.3.3op1-1) unstable; urgency=medium
+
+  * Use OpenPrinting CUPS fork instead of Apple's codebase
+    - Update d/upstream/metadata, d/watch
+    - d/upstream/signing-key.asc: Swap Apple's with Michael R Sweet's
+  * Large patch-suite cleanup thanks to lots of Debian proposals merged
+    upstream; from 40 to 9;
+    - Reorder (upstream-mergeable first, Debian-specific later)
+    - Reword and refresh metadata for the last patches
+  * Set Debian customizations in d/rules instead of patches;
+    - Set --with-max-log-size=0
+    - Set --enable-sync-on-close
+    - Set --with-error-policy=retry-job
+  * Packaging cleanup;
+    - Drop the Debian-specific systemd units' renaming, now upstream
+    - Drop pre-oldstable postinst ConfigFilePerm handling
+    - Add missing BSD-2-Clause block in debian/copyright
+    - Convert debian/po files to UTF-8
+    - Drop --as-needed as it's now default in Debian
+    - Drop Ubuntu-specific patch handling, in favour of compile-time option
+      for --disable-browsing
+    - Bump S-V to 4.5.1 without changes needed
+    - Use debian/main as head branch; update d/gbp.conf accordingly
+    - Drop outdated d/source/options
+   * Refresh manpage translation pofiles for 2.3.3op1
+
+ -- Didier Raboud <odyx@debian.org>  Fri, 27 Nov 2020 17:27:21 +0100
 
 cups (2.3.3-4) unstable; urgency=medium
 
-- 
cgit v1.2.3


From 6e433b57704e86616685bf873677d8c93ef8f743 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 27 Nov 2020 17:54:13 +0100
Subject: Use dh_auto_test (make test) instead of make check

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index a31a6c406..ec9f679c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -213,7 +213,7 @@ override_dh_strip_nondeterminism: override_dh_fixperms
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	CUPS_TESTBASE=$(shell mktemp -d /tmp/cups.XXXXXX) make check
+	CUPS_TESTBASE=$(shell mktemp -d /tmp/cups.XXXXXX) dh_auto_test
 	# Check that cups-config is not architecture-specific
 	[ -r cups-config ] && grep -vq $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) cups-config
 endif
-- 
cgit v1.2.3


From 890e28a8768bd21a93951cda05417cbce230da8b Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Apple AirPrint support

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Bug: https://github.com/OpenPrinting/cups/pull/27
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 74531a8c7..bfd1b0b75 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 7e9a9f265..3e0087496 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 306cc3dba71b7dc44f5ec31348fb9bb0121d08c7 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames

Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From ca90e0892c098b5e58d70d962a9cdee75fa10c48 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Debian: Set LogFileGroup to adm

---
 conf/cups-files.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index af11fcce6..80ca35145 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
 #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
 #LogFilePerm 0@CUPS_LOG_FILE_PERM@
 
+# Specifies the group name or ID that will be used for log files.
+# The default group in Debian is "adm".
+LogFileGroup adm
+
 # Location of the file logging all access to the scheduler; may be the name
 # "syslog". If not an absolute path, the value of ServerRoot is used as the
 # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
-- 
cgit v1.2.3


From 32e83a56e32f60c8370d6bfce9ad0eda7dc0a54b Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug: https://github.com/OpenPrinting/cups/pull/26
Bug-Debian: https://bugs.debian.org/640124
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index c6489389f..5ff750190 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From f2d0d6ad3f8a58a31638d1cb1df274d610bb031d Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Debian: Do not alter the permissions of cupsd.conf, ever

Origin: vendor
Bug: https://github.com/OpenPrinting/cups/pull/36
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bfd1b0b75..c8cd5ea49 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 9e4d7ddd3f90194b900cb1b54db5e9fb11792a96 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Debian: Show compile command lines

---
 Makedefs.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..038bb9451 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
 .SUFFIXES:	.a .c .cxx .h .o
 
 .c.o:
-- 
cgit v1.2.3


From baeedb522022f95b21b9ae1c1b50aca994a5a353 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config

Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 9d6bfe31b46ef0dd2c37bc03ed276517e2c83b53 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 038bb9451..291099cf2 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index b22e24fa7..176c44f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From e1cbcf5e8508a5097769b28315b70add403a6237 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: Debian: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 92f40749d7254bce972c335cc0ff572a6a3ab3d4 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <msweet@msweet.org>
Date: Sat, 28 Nov 2020 08:43:46 -0500
Subject: Force a 5 second sleep to wait for the job control file to be
 written.

---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 1af6d0741..0bf95c501 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -844,6 +844,7 @@ else
 	echo "PASS"
 	echo "    PASSED" >>$strfile
 
+	sleep 5
 	./waitjobs.sh >>$strfile
 
         echo $ac_n "Verifying that history still exists: $ac_c"
-- 
cgit v1.2.3


From ffb9798f97627381800083c4bb58836f27f53d9c Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Apple AirPrint support

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Bug: https://github.com/OpenPrinting/cups/pull/27
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 74531a8c7..bfd1b0b75 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 7e9a9f265..3e0087496 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 73c8384916c0683c40f9cb0570b8d5485455f486 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames

Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 05d0d71da026f952e59978bec1a27d804879edc4 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Debian: Set LogFileGroup to adm

---
 conf/cups-files.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index af11fcce6..80ca35145 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
 #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
 #LogFilePerm 0@CUPS_LOG_FILE_PERM@
 
+# Specifies the group name or ID that will be used for log files.
+# The default group in Debian is "adm".
+LogFileGroup adm
+
 # Location of the file logging all access to the scheduler; may be the name
 # "syslog". If not an absolute path, the value of ServerRoot is used as the
 # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
-- 
cgit v1.2.3


From e2e1fb2a0b0230425e696524351d438e47d9f089 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug: https://github.com/OpenPrinting/cups/pull/26
Bug-Debian: https://bugs.debian.org/640124
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index c6489389f..5ff750190 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 9a5188a4a3b19d243fde98faa51e65154bdb17aa Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Debian: Do not alter the permissions of cupsd.conf, ever

Origin: vendor
Bug: https://github.com/OpenPrinting/cups/pull/36
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bfd1b0b75..c8cd5ea49 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From cb863d75e57521656b8d6067f2846e9ae9ba1fa3 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Debian: Show compile command lines

---
 Makedefs.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..038bb9451 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
 .SUFFIXES:	.a .c .cxx .h .o
 
 .c.o:
-- 
cgit v1.2.3


From 99f696f28d9f23d841990f9a8e2456ce8821ef23 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config

Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From a833ad779be130734ee1794a633c08f720f64594 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 038bb9451..291099cf2 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index b22e24fa7..176c44f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 66b832530ef40b84c853906302ac0aaa0abebb0e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: Debian: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From b3e3fe4e2ea5ca79b62bd614784ece9d5e380a75 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 28 Nov 2020 16:39:49 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...econd-sleep-to-wait-for-the-job-control-f.patch |  21 ++
 debian/patches/0002-Apple-AirPrint-support.patch   |  90 ++++++
 ...tic-PPDs-recommended-stanzas-in-NickNames.patch |  37 +++
 .../0004-Debian-Set-LogFileGroup-to-adm.patch      |  23 ++
 ...-cupsd.conf.default-from-SERVERROOT-to-DA.patch |  62 ++++
 ...ot-alter-the-permissions-of-cupsd.conf-ev.patch |  27 ++
 .../0007-Debian-Show-compile-command-lines.patch   |  20 ++
 ...dpkg-architecture-in-cups-config-to-make-.patch |  49 +++
 ...d-mantohtml-with-the-build-architecture-c.patch | 110 +++++++
 ...-infrastructure-and-translations-for-manp.patch | 341 +++++++++++++++++++++
 debian/patches/series                              |  10 +
 11 files changed, 790 insertions(+)
 create mode 100644 debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
 create mode 100644 debian/patches/0002-Apple-AirPrint-support.patch
 create mode 100644 debian/patches/0003-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
 create mode 100644 debian/patches/0004-Debian-Set-LogFileGroup-to-adm.patch
 create mode 100644 debian/patches/0005-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
 create mode 100644 debian/patches/0006-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
 create mode 100644 debian/patches/0007-Debian-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0008-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
 create mode 100644 debian/patches/0009-Debian-Build-mantohtml-with-the-build-architecture-c.patch
 create mode 100644 debian/patches/0010-Debian-po4a-infrastructure-and-translations-for-manp.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch b/debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
new file mode 100644
index 000000000..5a3745b38
--- /dev/null
+++ b/debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
@@ -0,0 +1,21 @@
+From: Michael R Sweet <msweet@msweet.org>
+Date: Sat, 28 Nov 2020 08:43:46 -0500
+Subject: Force a 5 second sleep to wait for the job control file to be
+ written.
+
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 1af6d07..0bf95c5 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -844,6 +844,7 @@ else
+ 	echo "PASS"
+ 	echo "    PASSED" >>$strfile
+ 
++	sleep 5
+ 	./waitjobs.sh >>$strfile
+ 
+         echo $ac_n "Verifying that history still exists: $ac_c"
diff --git a/debian/patches/0002-Apple-AirPrint-support.patch b/debian/patches/0002-Apple-AirPrint-support.patch
new file mode 100644
index 000000000..5fc39dfe8
--- /dev/null
+++ b/debian/patches/0002-Apple-AirPrint-support.patch
@@ -0,0 +1,90 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Apple AirPrint support
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Bug: https://github.com/OpenPrinting/cups/pull/27
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 74531a8..bfd1b0b 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 7e9a9f2..3e00874 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0003-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch b/debian/patches/0003-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
new file mode 100644
index 000000000..0da73cea6
--- /dev/null
+++ b/debian/patches/0003-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
@@ -0,0 +1,37 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames
+
+Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0004-Debian-Set-LogFileGroup-to-adm.patch b/debian/patches/0004-Debian-Set-LogFileGroup-to-adm.patch
new file mode 100644
index 000000000..597d9bfad
--- /dev/null
+++ b/debian/patches/0004-Debian-Set-LogFileGroup-to-adm.patch
@@ -0,0 +1,23 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Debian: Set LogFileGroup to adm
+
+---
+ conf/cups-files.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index af11fcc..80ca351 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
+ #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
+ #LogFilePerm 0@CUPS_LOG_FILE_PERM@
+ 
++# Specifies the group name or ID that will be used for log files.
++# The default group in Debian is "adm".
++LogFileGroup adm
++
+ # Location of the file logging all access to the scheduler; may be the name
+ # "syslog". If not an absolute path, the value of ServerRoot is used as the
+ # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
diff --git a/debian/patches/0005-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch b/debian/patches/0005-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
new file mode 100644
index 000000000..c4efe6cad
--- /dev/null
+++ b/debian/patches/0005-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug: https://github.com/OpenPrinting/cups/pull/26
+Bug-Debian: https://bugs.debian.org/640124
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index c648938..5ff7501 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0006-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch b/debian/patches/0006-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
new file mode 100644
index 000000000..bcbc93a03
--- /dev/null
+++ b/debian/patches/0006-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
@@ -0,0 +1,27 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Debian: Do not alter the permissions of cupsd.conf, ever
+
+Origin: vendor
+Bug: https://github.com/OpenPrinting/cups/pull/36
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bfd1b0b..c8cd5ea 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0007-Debian-Show-compile-command-lines.patch b/debian/patches/0007-Debian-Show-compile-command-lines.patch
new file mode 100644
index 000000000..a3c709609
--- /dev/null
+++ b/debian/patches/0007-Debian-Show-compile-command-lines.patch
@@ -0,0 +1,20 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Debian: Show compile command lines
+
+---
+ Makedefs.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..038bb94 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+ .SUFFIXES:	.a .c .cxx .h .o
+ 
+ .c.o:
diff --git a/debian/patches/0008-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch b/debian/patches/0008-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
new file mode 100644
index 000000000..7f508d999
--- /dev/null
+++ b/debian/patches/0008-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0009-Debian-Build-mantohtml-with-the-build-architecture-c.patch b/debian/patches/0009-Debian-Build-mantohtml-with-the-build-architecture-c.patch
new file mode 100644
index 000000000..73c63f9c6
--- /dev/null
+++ b/debian/patches/0009-Debian-Build-mantohtml-with-the-build-architecture-c.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+
+Bug-Debian: https://bugs.debian.org/837936
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 038bb94..291099c 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index b22e24f..176c44f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0010-Debian-po4a-infrastructure-and-translations-for-manp.patch b/debian/patches/0010-Debian-po4a-infrastructure-and-translations-for-manp.patch
new file mode 100644
index 000000000..ef9aa4262
--- /dev/null
+++ b/debian/patches/0010-Debian-po4a-infrastructure-and-translations-for-manp.patch
@@ -0,0 +1,341 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: Debian: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..58423abf4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,10 @@
+0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
+0002-Apple-AirPrint-support.patch
+0003-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
+0004-Debian-Set-LogFileGroup-to-adm.patch
+0005-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
+0006-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
+0007-Debian-Show-compile-command-lines.patch
+0008-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
+0009-Debian-Build-mantohtml-with-the-build-architecture-c.patch
+0010-Debian-po4a-infrastructure-and-translations-for-manp.patch
-- 
cgit v1.2.3


From 35c94c28ccbb84133d3cc789e737e8e6cb12bf51 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sat, 28 Nov 2020 16:50:59 +0100
Subject: cups 2.3.3op1-2 Debian release

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b6570239b..4306b4a0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.3op1-2) unstable; urgency=medium
+
+  * Backport upstream "Force a 5 second sleep to wait for the job control file
+    to be written" patch, to address s390x test suite timing issue
+
+ -- Didier Raboud <odyx@debian.org>  Sat, 28 Nov 2020 16:50:59 +0100
+
 cups (2.3.3op1-1) unstable; urgency=medium
 
   * Use OpenPrinting CUPS fork instead of Apple's codebase
-- 
cgit v1.2.3


From a5d9c188614e85c6a974c361117cd3e4f756cef0 Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Wed, 2 Dec 2020 19:52:54 +0100
Subject: Update German man page (2211t)

---
 debian/changelog             |  7 +++++
 debian/manpage-po4a/po/de.po | 68 ++++++++++++++------------------------------
 2 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4306b4a0d..20a2b52bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.3op1-2.1) UNRELEASED; urgency=medium
+
+  [ Helge Kreutzmann ]
+  * Update German man page (2211t)
+
+ -- Helge Kreutzmann <debian@helgefjell.de>  Wed, 02 Dec 2020 19:51:23 +0100
+
 cups (2.3.3op1-2) unstable; urgency=medium
 
   * Backport upstream "Force a 5 second sleep to wait for the job control file
diff --git a/debian/manpage-po4a/po/de.po b/debian/manpage-po4a/po/de.po
index b040ee591..7f58827d3 100644
--- a/debian/manpage-po4a/po/de.po
+++ b/debian/manpage-po4a/po/de.po
@@ -1,5 +1,5 @@
 # Translation of cups man pages to German
-# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2008-2019
+# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2008-2020
 # Chris Leick <c.leick@vollbio.de>, 2009.
 # This file is distributed under the same license as the cups package.
 #
@@ -10,9 +10,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cups man pages 2.3.1-1\n"
+"Project-Id-Version: cups man pages 2.3.3op1-2\n"
 "POT-Creation-Date: 2020-11-27 16:31+0100\n"
-"PO-Revision-Date: 2019-12-24 06:37+0100\n"
+"PO-Revision-Date: 2020-12-02 19:50+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -3091,18 +3091,13 @@ msgstr "B<ErrorPolicy stop-printer>"
 #. #FilterLimit
 #. type: Plain text
 #: cupsd.conf.5:148
-#, fuzzy
-#| msgid ""
-#| "Specifies that a failed print job should be retried at a later time "
-#| "unless otherwise specified for the printer. The 'retry-job' error policy "
-#| "is the default."
 msgid ""
 "Specifies that a failed print job should stop the printer unless otherwise "
 "specified for the printer. The 'stop-printer' error policy is the default."
 msgstr ""
-"Legt fest, dass ein fehlgeschlagener Druckauftrag zu einem späteren "
-"Zeitpunkt neu versucht werden soll, es sei denn, es wurde anders für den "
-"Drucker festgelegt. Die Fehler-Richtlinie »retry-job« ist die Vorgabe."
+"Legt fest, dass ein fehlgeschlagener Druckauftrag den Drucker stoppen soll, "
+"außer etwas anderes wurde für den Drucker festgelegt. Die Fehler-Richtlinie "
+"»stop-printer« ist die Vorgabe."
 
 #. type: TP
 #: cupsd.conf.5:148
@@ -6523,10 +6518,9 @@ msgstr "cups-files.conf"
 
 #. type: TH
 #: cups-files.conf.5:11 cups-lpd.8:11
-#, fuzzy, no-wrap
-#| msgid "19 November 2009"
+#, no-wrap
 msgid "14 November 2020"
-msgstr "19. November 2009"
+msgstr "14. November 2020"
 
 #. type: Plain text
 #: cups-files.conf.5:14
@@ -6917,25 +6911,19 @@ msgstr ""
 
 #. type: TP
 #: cups-files.conf.5:137
-#, fuzzy, no-wrap
-#| msgid "B<Group >I<group-name-or-number>"
+#, no-wrap
 msgid "B<LogFileGroup >I<group-name-or-number>"
-msgstr "B<Group >I<Gruppenname-oder-Nummer>"
+msgstr "B<LogFileGroup >I<Gruppenname-oder-Nummer>"
 
 #. #LogFilePerm
 #. type: Plain text
 #: cups-files.conf.5:142
-#, fuzzy
-#| msgid ""
-#| "Specifies the group name or ID that will be used when executing external "
-#| "programs.  The default group is operating system specific but is usually "
-#| "\"lp\" or \"nobody\"."
 msgid ""
 "Specifies the group name or ID that will be used for log files.  The default "
 "group is operating system specific but is usually \"lp\" or \"nobody\"."
 msgstr ""
-"Legt den Gruppenname oder deren ID, die bei der Ausführung externer "
-"Programme verwandt wird, fest. Die Vorgabegruppe ist abhängig vom "
+"Legt den Gruppenname oder deren ID, die für Protokolldateien verwandt wird, "
+"fest. Die Vorgabegruppe ist abhängig vom "
 "Betriebssystem; gewöhnlich ist sie »lp« oder »nobody«."
 
 #. type: TP
@@ -7189,16 +7177,12 @@ msgstr "B<SyncOnClose No>"
 #. #SystemGroup
 #. type: Plain text
 #: cups-files.conf.5:222
-#, fuzzy
-#| msgid ""
-#| "Specifies whether the scheduler calls B<fsync>(2)  after writing "
-#| "configuration or state files.  The default is \"Yes\"."
 msgid ""
 "Specifies whether the scheduler calls B<fsync>(2)  after writing "
 "configuration or state files."
 msgstr ""
 "Legt fest, ob der Auftragsplaner nach dem Schreiben der Konfigurations- oder "
-"Zustandsdateien B<fsync>(2) aufruft. Die Vorgabe ist »Yes«."
+"Zustandsdateien B<fsync>(2) aufruft."
 
 #. type: TP
 #: cups-files.conf.5:222
@@ -7399,12 +7383,12 @@ msgstr ""
 
 #. type: Plain text
 #: cups-files.conf.5:298 cups-lpd.8:118
-#, fuzzy
-#| msgid "Copyright \\[co] 2007-2019 by Apple Inc."
 msgid ""
 "Copyright \\[co] 2020 by Michael R Sweet Copyright \\[co] 2007-2019 by Apple "
 "Inc."
-msgstr "Copyright \\[co] 2007-2019 by Apple Inc."
+msgstr ""
+"Copyright \\[co] 2020 Michael R Sweet Copyright \\[co] 2007-2019 Apple "
+"Inc."
 
 #. type: TH
 #: cupsfilter.8:9
@@ -7941,16 +7925,12 @@ msgstr ""
 
 #. type: Plain text
 #: cups-lpd.8:116
-#, fuzzy
-#| msgid ""
-#| "B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), CUPS Online Help "
-#| "(http://localhost:631/help), RFC 2569"
 msgid ""
 "B<cups>(1), B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), CUPS "
 "Online Help (http://localhost:631/help), RFC 2569"
 msgstr ""
-"B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), CUPS-Online-Hilfe "
-"(http://localhost:631/help), RFC 2569"
+"B<cups>(1), B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), CUPS-"
+"Online-Hilfe (http://localhost:631/help), RFC 2569"
 
 #. type: TH
 #: cups-snmp.8:9
@@ -16349,13 +16329,11 @@ msgstr ""
 msgid "ppdc"
 msgstr "ppdc"
 
-# type: TH
 #. type: TH
 #: ppdc.1:10
-#, fuzzy, no-wrap
-#| msgid "23 October 2008"
+#, no-wrap
 msgid "28 October 2020"
-msgstr "23. Oktober 2008"
+msgstr "28. Oktober 2020"
 
 #. type: Plain text
 #: ppdc.1:13
@@ -16475,16 +16453,12 @@ msgstr ""
 
 #. type: Plain text
 #: ppdc.1:73
-#, fuzzy
-#| msgid ""
-#| "Specifies that the output filename should be based on the ModelName value "
-#| "instead of FileName or PCFilenName."
 msgid ""
 "Specifies that the output filename should be based on the ModelName value "
 "instead of FileName or PCFileName."
 msgstr ""
 "Legt fest, dass der Ausgabename auf dem Wert von ModelName statt von "
-"FileName oder PCFilenName basieren soll."
+"FileName oder PCFileName basieren soll."
 
 #. type: Plain text
 #: ppdc.1:76
-- 
cgit v1.2.3


From f0c458167c6b864308ecb4b292a12a5f769fc53f Mon Sep 17 00:00:00 2001
From: Michael R Sweet <msweet@msweet.org>
Date: Sat, 28 Nov 2020 08:43:46 -0500
Subject: Force a 5 second sleep to wait for the job control file to be
 written.

---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 1af6d0741..0bf95c501 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -844,6 +844,7 @@ else
 	echo "PASS"
 	echo "    PASSED" >>$strfile
 
+	sleep 5
 	./waitjobs.sh >>$strfile
 
         echo $ac_n "Verifying that history still exists: $ac_c"
-- 
cgit v1.2.3


From f1985e492bd908341dd624b039021d17fc328689 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 3 Dec 2020 12:32:54 +0100
Subject: SERVERBIN: match host_os_name on *-gnu first, to catch kfreebsd-gnu
 before *bsd*

Debian's kfreebsd-gnu architectures (kfreebsd-amd64 and kfreebsd-i386) work as Debian/GNU systems, hence with a /usr/lib/cups SERVERBIN, not a /usr/libexec/cups.

Bug-Upstream: https://github.com/OpenPrinting/cups/pull/60
---
 config-scripts/cups-directories.m4 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index b74083ac2..1430af3a6 100644
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -262,6 +262,11 @@ AC_SUBST(CUPS_REQUESTS)
 
 # Server executables...
 case "$host_os_name" in
+	*-gnu)
+		# GNUs
+		INSTALL_SYSV="install-sysv"
+		CUPS_SERVERBIN="$exec_prefix/lib/cups"
+		;;
 	*bsd* | darwin*)
 		# *BSD and Darwin (macOS)
 		INSTALL_SYSV=""
-- 
cgit v1.2.3


From 3609cbd5d2db37f5dbf98fb682719c93073c048f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 3 Dec 2020 18:33:35 +0100
Subject: CUPS_EXE_FILE_PERM: also match host_os_name on *-gnu, to also catch
 kfreebsd-gnu

Debian's kfreebsd-gnu architectures (kfreebsd-amd64 and kfreebsd-i386) work as Debian/GNU systems, hence with a 755 CUP_EXE_FILE_PERM, not 555

Bug-Upstream: https://github.com/OpenPrinting/cups/pull/61
---
 config-scripts/cups-defaults.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 7a2d35a86..9e05bd477 100644
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -53,7 +53,7 @@ dnl Default executable file permissions
 AC_ARG_WITH(exe_file_perm, [  --with-exe-file-perm    set default executable permissions value, default=0555],
 	CUPS_EXE_FILE_PERM="$withval",
 	[case "$host_os_name" in
-		linux* | gnu*)
+		linux* | gnu* | *-gnu)
 			CUPS_EXE_FILE_PERM="755"
 			;;
 		*)
-- 
cgit v1.2.3


From cad959fae2c36bfea61fbc8b917a2a15be465781 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Apple AirPrint support

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Bug: https://github.com/OpenPrinting/cups/pull/27
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 74531a8c7..bfd1b0b75 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 7e9a9f265..3e0087496 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 302b6330cfaef1ce3c8f265648459f2137f3a209 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames

Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From eca07abee226c5a3c60d148ca52c6f4c8f1512cb Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Debian: Set LogFileGroup to adm

---
 conf/cups-files.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index af11fcce6..80ca35145 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
 #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
 #LogFilePerm 0@CUPS_LOG_FILE_PERM@
 
+# Specifies the group name or ID that will be used for log files.
+# The default group in Debian is "adm".
+LogFileGroup adm
+
 # Location of the file logging all access to the scheduler; may be the name
 # "syslog". If not an absolute path, the value of ServerRoot is used as the
 # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
-- 
cgit v1.2.3


From 1b810319e68a4afab744949d08fcaf264c7a7182 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug: https://github.com/OpenPrinting/cups/pull/26
Bug-Debian: https://bugs.debian.org/640124
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index c6489389f..5ff750190 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 8dd60dc633c130cbfb539a5152603d214c1bf025 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Debian: Do not alter the permissions of cupsd.conf, ever

Origin: vendor
Bug: https://github.com/OpenPrinting/cups/pull/36
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bfd1b0b75..c8cd5ea49 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From bdb573498cf9a4c240f5bc52e26639f1769380b8 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Debian: Show compile command lines

---
 Makedefs.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..038bb9451 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
 .SUFFIXES:	.a .c .cxx .h .o
 
 .c.o:
-- 
cgit v1.2.3


From 2677e81ff37b3bafe7eb8c7a8a927196bb7ea53d Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config

Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 22c0741616d5199c913e61828766823cec69c247 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 038bb9451..291099cf2 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index b22e24fa7..176c44f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 906d8b816fc8f0118ae779304a1765f77322fca0 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: Debian: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 34f49eca4e3bfbdf8108acd921c3038d9e9c1775 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 4 Dec 2020 10:32:31 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...econd-sleep-to-wait-for-the-job-control-f.patch |  21 ++
 ...atch-host_os_name-on-gnu-first-to-catch-k.patch |  28 ++
 ...LE_PERM-also-match-host_os_name-on-gnu-to.patch |  25 ++
 debian/patches/0004-Apple-AirPrint-support.patch   |  90 ++++++
 ...tic-PPDs-recommended-stanzas-in-NickNames.patch |  37 +++
 .../0006-Debian-Set-LogFileGroup-to-adm.patch      |  23 ++
 ...-cupsd.conf.default-from-SERVERROOT-to-DA.patch |  62 ++++
 ...ot-alter-the-permissions-of-cupsd.conf-ev.patch |  27 ++
 .../0009-Debian-Show-compile-command-lines.patch   |  20 ++
 ...dpkg-architecture-in-cups-config-to-make-.patch |  49 +++
 ...d-mantohtml-with-the-build-architecture-c.patch | 110 +++++++
 ...-infrastructure-and-translations-for-manp.patch | 341 +++++++++++++++++++++
 debian/patches/series                              |  12 +
 13 files changed, 845 insertions(+)
 create mode 100644 debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
 create mode 100644 debian/patches/0002-SERVERBIN-match-host_os_name-on-gnu-first-to-catch-k.patch
 create mode 100644 debian/patches/0003-CUPS_EXE_FILE_PERM-also-match-host_os_name-on-gnu-to.patch
 create mode 100644 debian/patches/0004-Apple-AirPrint-support.patch
 create mode 100644 debian/patches/0005-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
 create mode 100644 debian/patches/0006-Debian-Set-LogFileGroup-to-adm.patch
 create mode 100644 debian/patches/0007-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
 create mode 100644 debian/patches/0008-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
 create mode 100644 debian/patches/0009-Debian-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0010-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
 create mode 100644 debian/patches/0011-Debian-Build-mantohtml-with-the-build-architecture-c.patch
 create mode 100644 debian/patches/0012-Debian-po4a-infrastructure-and-translations-for-manp.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch b/debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
new file mode 100644
index 000000000..5a3745b38
--- /dev/null
+++ b/debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
@@ -0,0 +1,21 @@
+From: Michael R Sweet <msweet@msweet.org>
+Date: Sat, 28 Nov 2020 08:43:46 -0500
+Subject: Force a 5 second sleep to wait for the job control file to be
+ written.
+
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 1af6d07..0bf95c5 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -844,6 +844,7 @@ else
+ 	echo "PASS"
+ 	echo "    PASSED" >>$strfile
+ 
++	sleep 5
+ 	./waitjobs.sh >>$strfile
+ 
+         echo $ac_n "Verifying that history still exists: $ac_c"
diff --git a/debian/patches/0002-SERVERBIN-match-host_os_name-on-gnu-first-to-catch-k.patch b/debian/patches/0002-SERVERBIN-match-host_os_name-on-gnu-first-to-catch-k.patch
new file mode 100644
index 000000000..c3daed8c2
--- /dev/null
+++ b/debian/patches/0002-SERVERBIN-match-host_os_name-on-gnu-first-to-catch-k.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Thu, 3 Dec 2020 12:32:54 +0100
+Subject: SERVERBIN: match host_os_name on *-gnu first,
+ to catch kfreebsd-gnu before *bsd*
+
+Debian's kfreebsd-gnu architectures (kfreebsd-amd64 and kfreebsd-i386) work as Debian/GNU systems, hence with a /usr/lib/cups SERVERBIN, not a /usr/libexec/cups.
+
+Bug-Upstream: https://github.com/OpenPrinting/cups/pull/60
+---
+ config-scripts/cups-directories.m4 | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
+index b74083a..1430af3 100644
+--- a/config-scripts/cups-directories.m4
++++ b/config-scripts/cups-directories.m4
+@@ -262,6 +262,11 @@ AC_SUBST(CUPS_REQUESTS)
+ 
+ # Server executables...
+ case "$host_os_name" in
++	*-gnu)
++		# GNUs
++		INSTALL_SYSV="install-sysv"
++		CUPS_SERVERBIN="$exec_prefix/lib/cups"
++		;;
+ 	*bsd* | darwin*)
+ 		# *BSD and Darwin (macOS)
+ 		INSTALL_SYSV=""
diff --git a/debian/patches/0003-CUPS_EXE_FILE_PERM-also-match-host_os_name-on-gnu-to.patch b/debian/patches/0003-CUPS_EXE_FILE_PERM-also-match-host_os_name-on-gnu-to.patch
new file mode 100644
index 000000000..3400533f5
--- /dev/null
+++ b/debian/patches/0003-CUPS_EXE_FILE_PERM-also-match-host_os_name-on-gnu-to.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Thu, 3 Dec 2020 18:33:35 +0100
+Subject: CUPS_EXE_FILE_PERM: also match host_os_name on *-gnu,
+ to also catch kfreebsd-gnu
+
+Debian's kfreebsd-gnu architectures (kfreebsd-amd64 and kfreebsd-i386) work as Debian/GNU systems, hence with a 755 CUP_EXE_FILE_PERM, not 555
+
+Bug-Upstream: https://github.com/OpenPrinting/cups/pull/61
+---
+ config-scripts/cups-defaults.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
+index 7a2d35a..9e05bd4 100644
+--- a/config-scripts/cups-defaults.m4
++++ b/config-scripts/cups-defaults.m4
+@@ -53,7 +53,7 @@ dnl Default executable file permissions
+ AC_ARG_WITH(exe_file_perm, [  --with-exe-file-perm    set default executable permissions value, default=0555],
+ 	CUPS_EXE_FILE_PERM="$withval",
+ 	[case "$host_os_name" in
+-		linux* | gnu*)
++		linux* | gnu* | *-gnu)
+ 			CUPS_EXE_FILE_PERM="755"
+ 			;;
+ 		*)
diff --git a/debian/patches/0004-Apple-AirPrint-support.patch b/debian/patches/0004-Apple-AirPrint-support.patch
new file mode 100644
index 000000000..5fc39dfe8
--- /dev/null
+++ b/debian/patches/0004-Apple-AirPrint-support.patch
@@ -0,0 +1,90 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Apple AirPrint support
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Bug: https://github.com/OpenPrinting/cups/pull/27
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 74531a8..bfd1b0b 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 7e9a9f2..3e00874 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0005-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch b/debian/patches/0005-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
new file mode 100644
index 000000000..0da73cea6
--- /dev/null
+++ b/debian/patches/0005-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
@@ -0,0 +1,37 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames
+
+Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0006-Debian-Set-LogFileGroup-to-adm.patch b/debian/patches/0006-Debian-Set-LogFileGroup-to-adm.patch
new file mode 100644
index 000000000..597d9bfad
--- /dev/null
+++ b/debian/patches/0006-Debian-Set-LogFileGroup-to-adm.patch
@@ -0,0 +1,23 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Debian: Set LogFileGroup to adm
+
+---
+ conf/cups-files.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index af11fcc..80ca351 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
+ #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
+ #LogFilePerm 0@CUPS_LOG_FILE_PERM@
+ 
++# Specifies the group name or ID that will be used for log files.
++# The default group in Debian is "adm".
++LogFileGroup adm
++
+ # Location of the file logging all access to the scheduler; may be the name
+ # "syslog". If not an absolute path, the value of ServerRoot is used as the
+ # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
diff --git a/debian/patches/0007-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch b/debian/patches/0007-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
new file mode 100644
index 000000000..c4efe6cad
--- /dev/null
+++ b/debian/patches/0007-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug: https://github.com/OpenPrinting/cups/pull/26
+Bug-Debian: https://bugs.debian.org/640124
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index c648938..5ff7501 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0008-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch b/debian/patches/0008-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
new file mode 100644
index 000000000..bcbc93a03
--- /dev/null
+++ b/debian/patches/0008-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
@@ -0,0 +1,27 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Debian: Do not alter the permissions of cupsd.conf, ever
+
+Origin: vendor
+Bug: https://github.com/OpenPrinting/cups/pull/36
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bfd1b0b..c8cd5ea 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0009-Debian-Show-compile-command-lines.patch b/debian/patches/0009-Debian-Show-compile-command-lines.patch
new file mode 100644
index 000000000..a3c709609
--- /dev/null
+++ b/debian/patches/0009-Debian-Show-compile-command-lines.patch
@@ -0,0 +1,20 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Debian: Show compile command lines
+
+---
+ Makedefs.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..038bb94 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+ .SUFFIXES:	.a .c .cxx .h .o
+ 
+ .c.o:
diff --git a/debian/patches/0010-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch b/debian/patches/0010-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
new file mode 100644
index 000000000..7f508d999
--- /dev/null
+++ b/debian/patches/0010-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0011-Debian-Build-mantohtml-with-the-build-architecture-c.patch b/debian/patches/0011-Debian-Build-mantohtml-with-the-build-architecture-c.patch
new file mode 100644
index 000000000..73c63f9c6
--- /dev/null
+++ b/debian/patches/0011-Debian-Build-mantohtml-with-the-build-architecture-c.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+
+Bug-Debian: https://bugs.debian.org/837936
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 038bb94..291099c 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index b22e24f..176c44f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0012-Debian-po4a-infrastructure-and-translations-for-manp.patch b/debian/patches/0012-Debian-po4a-infrastructure-and-translations-for-manp.patch
new file mode 100644
index 000000000..ef9aa4262
--- /dev/null
+++ b/debian/patches/0012-Debian-po4a-infrastructure-and-translations-for-manp.patch
@@ -0,0 +1,341 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: Debian: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..8e7d8da6e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,12 @@
+0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
+0002-SERVERBIN-match-host_os_name-on-gnu-first-to-catch-k.patch
+0003-CUPS_EXE_FILE_PERM-also-match-host_os_name-on-gnu-to.patch
+0004-Apple-AirPrint-support.patch
+0005-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
+0006-Debian-Set-LogFileGroup-to-adm.patch
+0007-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
+0008-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
+0009-Debian-Show-compile-command-lines.patch
+0010-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
+0011-Debian-Build-mantohtml-with-the-build-architecture-c.patch
+0012-Debian-po4a-infrastructure-and-translations-for-manp.patch
-- 
cgit v1.2.3


From 115bfc39a7b8f76b52e0964986f7088b6910c13e Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 4 Dec 2020 10:32:55 +0100
Subject: cups 2.3.3op1-3 Debian release

---
 debian/changelog | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20a2b52bb..0329299bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-cups (2.3.3op1-2.1) UNRELEASED; urgency=medium
+cups (2.3.3op1-3) unstable; urgency=medium
 
   [ Helge Kreutzmann ]
   * Update German man page (2211t)
 
- -- Helge Kreutzmann <debian@helgefjell.de>  Wed, 02 Dec 2020 19:51:23 +0100
+  [ Didier Raboud ]
+  * Patch configure scripts to fix FTBFS on freebsd-gnu systems
+
+ -- Didier Raboud <odyx@debian.org>  Fri, 04 Dec 2020 10:32:55 +0100
 
 cups (2.3.3op1-2) unstable; urgency=medium
 
-- 
cgit v1.2.3


From 0df3153d01ed7c2f1166e75b05cc9e7b2d61b1dd Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 4 Dec 2020 10:55:49 +0100
Subject: Drop ancient manual link-doc setting in cups-bsd.postinst

---
 debian/cups-bsd.postinst | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/debian/cups-bsd.postinst b/debian/cups-bsd.postinst
index 11cfa155f..feb0c6adf 100644
--- a/debian/cups-bsd.postinst
+++ b/debian/cups-bsd.postinst
@@ -7,14 +7,6 @@ set -e
 
 case "$1" in
     configure)
-
-	# Set documentation symlinks
-	if [ -d /usr/share/doc/cups ]; then
-	    if [ ! -e /usr/share/doc/cups-bsd ]; then
-		ln -sf cups-common /usr/share/doc/cups-bsd
-	    fi
-	fi
-
 	if [ -x "`which update-inetd 2>/dev/null`" ]; then
 	    # Add cups-lpd to inetd.conf
 	    db_get cups-bsd/setuplpd
-- 
cgit v1.2.3


From b295df10b71d52e2bc5e733699b69bb52298059a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 4 Dec 2020 11:22:53 +0100
Subject: =?UTF-8?q?Salsa-CI:=C2=A0Allow=20reprotest=20to=20fail=20(it=20is?=
 =?UTF-8?q?=20known=20to)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
index b50c0ce92..0e9d6d9c6 100644
--- a/debian/gitlab-ci.yml
+++ b/debian/gitlab-ci.yml
@@ -2,5 +2,5 @@ include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
 
-variables:
-  RELEASE: 'experimental'
+reprotest:
+  allow_failure: true
-- 
cgit v1.2.3


From 9f76c13337d4982bee77829b9f79ac52c1bd0f9d Mon Sep 17 00:00:00 2001
From: Michael R Sweet <msweet@msweet.org>
Date: Sat, 28 Nov 2020 08:43:46 -0500
Subject: Force a 5 second sleep to wait for the job control file to be
 written.

---
 test/run-stp-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 1af6d0741..0bf95c501 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -844,6 +844,7 @@ else
 	echo "PASS"
 	echo "    PASSED" >>$strfile
 
+	sleep 5
 	./waitjobs.sh >>$strfile
 
         echo $ac_n "Verifying that history still exists: $ac_c"
-- 
cgit v1.2.3


From 3b822367db7caf8aa70e0a87e1e107477ebc8ed8 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 3 Dec 2020 12:32:54 +0100
Subject: SERVERBIN: match host_os_name on *-gnu first, to catch kfreebsd-gnu
 before *bsd*

Debian's kfreebsd-gnu architectures (kfreebsd-amd64 and kfreebsd-i386) work as Debian/GNU systems, hence with a /usr/lib/cups SERVERBIN, not a /usr/libexec/cups.

Bug-Upstream: https://github.com/OpenPrinting/cups/pull/60
---
 config-scripts/cups-directories.m4 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index b74083ac2..1430af3a6 100644
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -262,6 +262,11 @@ AC_SUBST(CUPS_REQUESTS)
 
 # Server executables...
 case "$host_os_name" in
+	*-gnu)
+		# GNUs
+		INSTALL_SYSV="install-sysv"
+		CUPS_SERVERBIN="$exec_prefix/lib/cups"
+		;;
 	*bsd* | darwin*)
 		# *BSD and Darwin (macOS)
 		INSTALL_SYSV=""
-- 
cgit v1.2.3


From 72841eed1f06a87841d2866b86d59a4f00d6a653 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 3 Dec 2020 18:33:35 +0100
Subject: CUPS_EXE_FILE_PERM: also match host_os_name on *-gnu, to also catch
 kfreebsd-gnu

Debian's kfreebsd-gnu architectures (kfreebsd-amd64 and kfreebsd-i386) work as Debian/GNU systems, hence with a 755 CUP_EXE_FILE_PERM, not 555

Bug-Upstream: https://github.com/OpenPrinting/cups/pull/61
---
 config-scripts/cups-defaults.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 7a2d35a86..9e05bd477 100644
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -53,7 +53,7 @@ dnl Default executable file permissions
 AC_ARG_WITH(exe_file_perm, [  --with-exe-file-perm    set default executable permissions value, default=0555],
 	CUPS_EXE_FILE_PERM="$withval",
 	[case "$host_os_name" in
-		linux* | gnu*)
+		linux* | gnu* | *-gnu)
 			CUPS_EXE_FILE_PERM="755"
 			;;
 		*)
-- 
cgit v1.2.3


From 38ca10288c567cff8fc99f2fc0a2830fcf872bb2 Mon Sep 17 00:00:00 2001
From: Wolfgang Schweer <w.schweer@gmx.de>
Date: Sat, 12 Dec 2020 13:38:52 +0100
Subject: Systemd: Let cups.service start after nslcd.service

Bug-Debian: #977198
Bug-Upstream: https://github.com/OpenPrinting/cups/issues/69
---
 scheduler/cups.service.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/cups.service.in b/scheduler/cups.service.in
index 9e70b2973..a3fa0e83f 100644
--- a/scheduler/cups.service.in
+++ b/scheduler/cups.service.in
@@ -1,7 +1,7 @@
 [Unit]
 Description=CUPS Scheduler
 Documentation=man:cupsd(8)
-After=network.target sssd.service ypbind.service
+After=network.target sssd.service ypbind.service nslcd.service
 Requires=cups.socket
 
 [Service]
-- 
cgit v1.2.3


From cf4befe27feb492d6ceb52ebc01374d40e54d5c4 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Apple AirPrint support

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Bug: https://github.com/OpenPrinting/cups/pull/27
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 74531a8c7..bfd1b0b75 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 7e9a9f265..3e0087496 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From c4ef990b08bfaf3b3fcb6ef78ec15116cf6de0d2 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames

Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 8d524e32145a64d529886fd7cacea8a385a7e980 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Debian: Set LogFileGroup to adm

---
 conf/cups-files.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index af11fcce6..80ca35145 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
 #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
 #LogFilePerm 0@CUPS_LOG_FILE_PERM@
 
+# Specifies the group name or ID that will be used for log files.
+# The default group in Debian is "adm".
+LogFileGroup adm
+
 # Location of the file logging all access to the scheduler; may be the name
 # "syslog". If not an absolute path, the value of ServerRoot is used as the
 # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
-- 
cgit v1.2.3


From d8259b499f38b7f2bd685c3c99a162e96e56d5a0 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug: https://github.com/OpenPrinting/cups/pull/26
Bug-Debian: https://bugs.debian.org/640124
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index c6489389f..5ff750190 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 45011955f40d12a0674de065d601f3bffae34f08 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Debian: Do not alter the permissions of cupsd.conf, ever

Origin: vendor
Bug: https://github.com/OpenPrinting/cups/pull/36
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bfd1b0b75..c8cd5ea49 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 79f6d19dc4e941d8ec38cb1b6de2a7566f160d42 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Debian: Show compile command lines

---
 Makedefs.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..038bb9451 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
 .SUFFIXES:	.a .c .cxx .h .o
 
 .c.o:
-- 
cgit v1.2.3


From 3d6eb5db97bfb97365ff9c9c0311b373964161fd Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config

Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 7f2e66f2633808cd8d4b800f2137f8bd214aed8e Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 038bb9451..291099cf2 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index b22e24fa7..176c44f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 875cd4cdc14b00223b6bbd1b20a9a4c1af161841 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: Debian: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From 8613d17f6a62c3e4d17e90662aca524b05d157e6 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 23 Dec 2020 13:48:09 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...econd-sleep-to-wait-for-the-job-control-f.patch |  21 ++
 ...atch-host_os_name-on-gnu-first-to-catch-k.patch |  28 ++
 ...LE_PERM-also-match-host_os_name-on-gnu-to.patch |  25 ++
 ...et-cups.service-start-after-nslcd.service.patch |  23 ++
 debian/patches/0005-Apple-AirPrint-support.patch   |  90 ++++++
 ...tic-PPDs-recommended-stanzas-in-NickNames.patch |  37 +++
 .../0007-Debian-Set-LogFileGroup-to-adm.patch      |  23 ++
 ...-cupsd.conf.default-from-SERVERROOT-to-DA.patch |  62 ++++
 ...ot-alter-the-permissions-of-cupsd.conf-ev.patch |  27 ++
 .../0010-Debian-Show-compile-command-lines.patch   |  20 ++
 ...dpkg-architecture-in-cups-config-to-make-.patch |  49 +++
 ...d-mantohtml-with-the-build-architecture-c.patch | 110 +++++++
 ...-infrastructure-and-translations-for-manp.patch | 341 +++++++++++++++++++++
 debian/patches/series                              |  13 +
 14 files changed, 869 insertions(+)
 create mode 100644 debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
 create mode 100644 debian/patches/0002-SERVERBIN-match-host_os_name-on-gnu-first-to-catch-k.patch
 create mode 100644 debian/patches/0003-CUPS_EXE_FILE_PERM-also-match-host_os_name-on-gnu-to.patch
 create mode 100644 debian/patches/0004-Systemd-Let-cups.service-start-after-nslcd.service.patch
 create mode 100644 debian/patches/0005-Apple-AirPrint-support.patch
 create mode 100644 debian/patches/0006-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
 create mode 100644 debian/patches/0007-Debian-Set-LogFileGroup-to-adm.patch
 create mode 100644 debian/patches/0008-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
 create mode 100644 debian/patches/0009-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
 create mode 100644 debian/patches/0010-Debian-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0011-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
 create mode 100644 debian/patches/0012-Debian-Build-mantohtml-with-the-build-architecture-c.patch
 create mode 100644 debian/patches/0013-Debian-po4a-infrastructure-and-translations-for-manp.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch b/debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
new file mode 100644
index 000000000..5a3745b38
--- /dev/null
+++ b/debian/patches/0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
@@ -0,0 +1,21 @@
+From: Michael R Sweet <msweet@msweet.org>
+Date: Sat, 28 Nov 2020 08:43:46 -0500
+Subject: Force a 5 second sleep to wait for the job control file to be
+ written.
+
+---
+ test/run-stp-tests.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 1af6d07..0bf95c5 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -844,6 +844,7 @@ else
+ 	echo "PASS"
+ 	echo "    PASSED" >>$strfile
+ 
++	sleep 5
+ 	./waitjobs.sh >>$strfile
+ 
+         echo $ac_n "Verifying that history still exists: $ac_c"
diff --git a/debian/patches/0002-SERVERBIN-match-host_os_name-on-gnu-first-to-catch-k.patch b/debian/patches/0002-SERVERBIN-match-host_os_name-on-gnu-first-to-catch-k.patch
new file mode 100644
index 000000000..c3daed8c2
--- /dev/null
+++ b/debian/patches/0002-SERVERBIN-match-host_os_name-on-gnu-first-to-catch-k.patch
@@ -0,0 +1,28 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Thu, 3 Dec 2020 12:32:54 +0100
+Subject: SERVERBIN: match host_os_name on *-gnu first,
+ to catch kfreebsd-gnu before *bsd*
+
+Debian's kfreebsd-gnu architectures (kfreebsd-amd64 and kfreebsd-i386) work as Debian/GNU systems, hence with a /usr/lib/cups SERVERBIN, not a /usr/libexec/cups.
+
+Bug-Upstream: https://github.com/OpenPrinting/cups/pull/60
+---
+ config-scripts/cups-directories.m4 | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
+index b74083a..1430af3 100644
+--- a/config-scripts/cups-directories.m4
++++ b/config-scripts/cups-directories.m4
+@@ -262,6 +262,11 @@ AC_SUBST(CUPS_REQUESTS)
+ 
+ # Server executables...
+ case "$host_os_name" in
++	*-gnu)
++		# GNUs
++		INSTALL_SYSV="install-sysv"
++		CUPS_SERVERBIN="$exec_prefix/lib/cups"
++		;;
+ 	*bsd* | darwin*)
+ 		# *BSD and Darwin (macOS)
+ 		INSTALL_SYSV=""
diff --git a/debian/patches/0003-CUPS_EXE_FILE_PERM-also-match-host_os_name-on-gnu-to.patch b/debian/patches/0003-CUPS_EXE_FILE_PERM-also-match-host_os_name-on-gnu-to.patch
new file mode 100644
index 000000000..3400533f5
--- /dev/null
+++ b/debian/patches/0003-CUPS_EXE_FILE_PERM-also-match-host_os_name-on-gnu-to.patch
@@ -0,0 +1,25 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Thu, 3 Dec 2020 18:33:35 +0100
+Subject: CUPS_EXE_FILE_PERM: also match host_os_name on *-gnu,
+ to also catch kfreebsd-gnu
+
+Debian's kfreebsd-gnu architectures (kfreebsd-amd64 and kfreebsd-i386) work as Debian/GNU systems, hence with a 755 CUP_EXE_FILE_PERM, not 555
+
+Bug-Upstream: https://github.com/OpenPrinting/cups/pull/61
+---
+ config-scripts/cups-defaults.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
+index 7a2d35a..9e05bd4 100644
+--- a/config-scripts/cups-defaults.m4
++++ b/config-scripts/cups-defaults.m4
+@@ -53,7 +53,7 @@ dnl Default executable file permissions
+ AC_ARG_WITH(exe_file_perm, [  --with-exe-file-perm    set default executable permissions value, default=0555],
+ 	CUPS_EXE_FILE_PERM="$withval",
+ 	[case "$host_os_name" in
+-		linux* | gnu*)
++		linux* | gnu* | *-gnu)
+ 			CUPS_EXE_FILE_PERM="755"
+ 			;;
+ 		*)
diff --git a/debian/patches/0004-Systemd-Let-cups.service-start-after-nslcd.service.patch b/debian/patches/0004-Systemd-Let-cups.service-start-after-nslcd.service.patch
new file mode 100644
index 000000000..74e841f16
--- /dev/null
+++ b/debian/patches/0004-Systemd-Let-cups.service-start-after-nslcd.service.patch
@@ -0,0 +1,23 @@
+From: Wolfgang Schweer <w.schweer@gmx.de>
+Date: Sat, 12 Dec 2020 13:38:52 +0100
+Subject: Systemd: Let cups.service start after nslcd.service
+
+Bug-Debian: #977198
+Bug-Upstream: https://github.com/OpenPrinting/cups/issues/69
+---
+ scheduler/cups.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/cups.service.in b/scheduler/cups.service.in
+index 9e70b29..a3fa0e8 100644
+--- a/scheduler/cups.service.in
++++ b/scheduler/cups.service.in
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+-After=network.target sssd.service ypbind.service
++After=network.target sssd.service ypbind.service nslcd.service
+ Requires=cups.socket
+ 
+ [Service]
diff --git a/debian/patches/0005-Apple-AirPrint-support.patch b/debian/patches/0005-Apple-AirPrint-support.patch
new file mode 100644
index 000000000..5fc39dfe8
--- /dev/null
+++ b/debian/patches/0005-Apple-AirPrint-support.patch
@@ -0,0 +1,90 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Apple AirPrint support
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Bug: https://github.com/OpenPrinting/cups/pull/27
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 74531a8..bfd1b0b 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 7e9a9f2..3e00874 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0006-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch b/debian/patches/0006-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
new file mode 100644
index 000000000..0da73cea6
--- /dev/null
+++ b/debian/patches/0006-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
@@ -0,0 +1,37 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames
+
+Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0007-Debian-Set-LogFileGroup-to-adm.patch b/debian/patches/0007-Debian-Set-LogFileGroup-to-adm.patch
new file mode 100644
index 000000000..597d9bfad
--- /dev/null
+++ b/debian/patches/0007-Debian-Set-LogFileGroup-to-adm.patch
@@ -0,0 +1,23 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Debian: Set LogFileGroup to adm
+
+---
+ conf/cups-files.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index af11fcc..80ca351 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
+ #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
+ #LogFilePerm 0@CUPS_LOG_FILE_PERM@
+ 
++# Specifies the group name or ID that will be used for log files.
++# The default group in Debian is "adm".
++LogFileGroup adm
++
+ # Location of the file logging all access to the scheduler; may be the name
+ # "syslog". If not an absolute path, the value of ServerRoot is used as the
+ # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
diff --git a/debian/patches/0008-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch b/debian/patches/0008-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
new file mode 100644
index 000000000..c4efe6cad
--- /dev/null
+++ b/debian/patches/0008-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug: https://github.com/OpenPrinting/cups/pull/26
+Bug-Debian: https://bugs.debian.org/640124
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index c648938..5ff7501 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0009-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch b/debian/patches/0009-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
new file mode 100644
index 000000000..bcbc93a03
--- /dev/null
+++ b/debian/patches/0009-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
@@ -0,0 +1,27 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Debian: Do not alter the permissions of cupsd.conf, ever
+
+Origin: vendor
+Bug: https://github.com/OpenPrinting/cups/pull/36
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bfd1b0b..c8cd5ea 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0010-Debian-Show-compile-command-lines.patch b/debian/patches/0010-Debian-Show-compile-command-lines.patch
new file mode 100644
index 000000000..a3c709609
--- /dev/null
+++ b/debian/patches/0010-Debian-Show-compile-command-lines.patch
@@ -0,0 +1,20 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Debian: Show compile command lines
+
+---
+ Makedefs.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..038bb94 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+ .SUFFIXES:	.a .c .cxx .h .o
+ 
+ .c.o:
diff --git a/debian/patches/0011-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch b/debian/patches/0011-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
new file mode 100644
index 000000000..7f508d999
--- /dev/null
+++ b/debian/patches/0011-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0012-Debian-Build-mantohtml-with-the-build-architecture-c.patch b/debian/patches/0012-Debian-Build-mantohtml-with-the-build-architecture-c.patch
new file mode 100644
index 000000000..73c63f9c6
--- /dev/null
+++ b/debian/patches/0012-Debian-Build-mantohtml-with-the-build-architecture-c.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+
+Bug-Debian: https://bugs.debian.org/837936
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 038bb94..291099c 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index b22e24f..176c44f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0013-Debian-po4a-infrastructure-and-translations-for-manp.patch b/debian/patches/0013-Debian-po4a-infrastructure-and-translations-for-manp.patch
new file mode 100644
index 000000000..ef9aa4262
--- /dev/null
+++ b/debian/patches/0013-Debian-po4a-infrastructure-and-translations-for-manp.patch
@@ -0,0 +1,341 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: Debian: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..d1c84bd0b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,13 @@
+0001-Force-a-5-second-sleep-to-wait-for-the-job-control-f.patch
+0002-SERVERBIN-match-host_os_name-on-gnu-first-to-catch-k.patch
+0003-CUPS_EXE_FILE_PERM-also-match-host_os_name-on-gnu-to.patch
+0004-Systemd-Let-cups.service-start-after-nslcd.service.patch
+0005-Apple-AirPrint-support.patch
+0006-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
+0007-Debian-Set-LogFileGroup-to-adm.patch
+0008-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
+0009-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
+0010-Debian-Show-compile-command-lines.patch
+0011-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
+0012-Debian-Build-mantohtml-with-the-build-architecture-c.patch
+0013-Debian-po4a-infrastructure-and-translations-for-manp.patch
-- 
cgit v1.2.3


From ab2b8efd2463f39e11325e19eff630e41fabcae0 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 23 Dec 2020 14:53:09 +0100
Subject: cups 2.3.3op1-4 Debian release

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0329299bb..d3241d0df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.3op1-4) unstable; urgency=medium
+
+  * Drop ancient manual link-doc setting in cups-bsd.postinst
+  * Let cups.service start after nslcd.service (Closes: #977198)
+
+ -- Didier Raboud <odyx@debian.org>  Wed, 23 Dec 2020 14:53:09 +0100
+
 cups (2.3.3op1-3) unstable; urgency=medium
 
   [ Helge Kreutzmann ]
-- 
cgit v1.2.3


From 4fb597d4de878d38a00c5dbbd4c438004a3fec87 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Thu, 7 Jan 2021 16:13:50 +0100
Subject: Update Homepage and Source fields to point Homepage to
 https://github.com/OpenPrinting/cups/ instead of https://cups.org/

Closes: #979461
---
 debian/control   | 2 +-
 debian/copyright | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 269236578..1d9e5f516 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Build-Conflicts: libgmp-dev (<< 2:6)
 Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/printing-team/cups
 Vcs-Git: https://salsa.debian.org/printing-team/cups.git
-Homepage: https://www.cups.org/
+Homepage: https://github.com/OpenPrinting/cups/
 Rules-Requires-Root: no
 
 Package: libcups2
diff --git a/debian/copyright b/debian/copyright
index 8539bc2f5..e4c1a1371 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: CUPS
 Upstream-Contact: Michael Sweet <msweet@apple.com>
-Source: https://www.cups.org/software.html
-Copyright: 2005-2018, Apple Inc.
+Source: https://github.com/OpenPrinting/cups/
+Copyright: 2005-2019, Apple Inc.
 License: Apache-2.0-with-GPL2-LGPL2-Exception
 
 Files: *
-- 
cgit v1.2.3


From 231cf7919b11ae94ba4cc419e4cfc145996044f7 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 8 Jan 2021 11:35:18 +0100
Subject: cups 2.3.3op1-5 Debian release

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d3241d0df..692b2d279 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cups (2.3.3op1-5) unstable; urgency=medium
+
+  * Update Homepage and Source fields to point
+    https://github.com/OpenPrinting/cups/ as Debian's using the OpenPrinting
+    (friendly) fork (Closes: #979461)
+
+ -- Didier Raboud <odyx@debian.org>  Fri, 08 Jan 2021 11:35:18 +0100
+
 cups (2.3.3op1-4) unstable; urgency=medium
 
   * Drop ancient manual link-doc setting in cups-bsd.postinst
-- 
cgit v1.2.3


From 1e712fe744a0565aa3b2dd93e7eae0ac39af7bdb Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Fri, 8 Jan 2021 19:07:00 +0100
Subject: In the AppArmor profile allow cupsd to write to /run/systemd/notify
 to notify that it is up and running (systemd service type "notify")

---
 debian/local/apparmor-profile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/local/apparmor-profile b/debian/local/apparmor-profile
index 9b8d0668d..4b631b7bc 100644
--- a/debian/local/apparmor-profile
+++ b/debian/local/apparmor-profile
@@ -47,6 +47,11 @@
   network econet dgram,
   network ash dgram,
 
+  # CUPS is of systemd service type "notify" now, meaning that cupsd notifies
+  # systemd when it is up and running, give CUPS access to systemd's
+  # notification socket
+  /run/systemd/notify w,
+
   /{usr/,}bin/bash ixr,
   /{usr/,}bin/dash ixr,
   /{usr/,}bin/hostname ixr,
-- 
cgit v1.2.3


From 107fe2963c89ef2b5ee51f9b987a0d1c9fba4c98 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 11 Jan 2021 08:31:58 +0100
Subject: cups 2.3.3op1-6 Debian release

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 692b2d279..3e0197546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cups (2.3.3op1-6) unstable; urgency=medium
+
+  [ Till Kamppeter ]
+  * In the AppArmor profile, allow cupsd to write to /run/systemd/notify to
+    notify that it is up and running (systemd service type "notify")
+
+ -- Didier Raboud <odyx@debian.org>  Mon, 11 Jan 2021 08:31:58 +0100
+
 cups (2.3.3op1-5) unstable; urgency=medium
 
   * Update Homepage and Source fields to point
-- 
cgit v1.2.3


From eb03d891f87a41780d3a396806d1131c09d60b32 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Sat, 9 Jan 2021 21:27:23 +0100
Subject: B-D: Move dh_apparmor to B-D-A

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 1d9e5f516..2a441a1dd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Uploaders: Didier Raboud <odyx@debian.org>,
 Section: net
 Priority: optional
 Build-Depends: debhelper-compat (= 12),
-               dh-apparmor,
                dh-strip-nondeterminism,
                patch,
                autoconf,
@@ -35,6 +34,7 @@ Build-Depends: debhelper-compat (= 12),
                poppler-utils,
                sharutils,
                zlib1g-dev
+Build-Depends-Arch: dh-apparmor,
 # libgmp-dev is not GPL-2 compatible before it's 6 release, which makes it also GPL-2+
 Build-Conflicts: libgmp-dev (<< 2:6)
 Standards-Version: 4.5.1
-- 
cgit v1.2.3


From 6f3d3cdfd5a507df173fdbd9bbb01c3f4eb2b05e Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Fri, 15 Jan 2021 10:14:12 +0100
Subject: =?UTF-8?q?B-D:=C2=A0Drop=20now-unnecessary=20Build-Depends?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/control | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/debian/control b/debian/control
index 2a441a1dd..c034855fd 100644
--- a/debian/control
+++ b/debian/control
@@ -11,28 +11,17 @@ Build-Depends: debhelper-compat (= 12),
                automake,
                libtool,
                pkg-config,
-               ghostscript,
                libavahi-client-dev,
                libavahi-common-dev,
-               libavahi-compat-libdnssd-dev,
                libdbus-1-dev,
-               libfontconfig1-dev,
-               libfreetype6-dev,
                libgnutls28-dev,
-               libijs-dev,
-               libjpeg-dev,
-               libldap2-dev,
                libkrb5-dev,
                libpam0g-dev,
                libpaper-dev,
-               libpng-dev,
                libsystemd-dev [linux-any],
-               libtiff-dev,
                libusb-1.0-0-dev [!hurd-any],
                po4a,
                po-debconf,
-               poppler-utils,
-               sharutils,
                zlib1g-dev
 Build-Depends-Arch: dh-apparmor,
 # libgmp-dev is not GPL-2 compatible before it's 6 release, which makes it also GPL-2+
-- 
cgit v1.2.3


From 219a1ecb119b3aa451994e5aa95436c4ead4ce9a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 15 Jan 2021 12:11:30 +0100
Subject: cups 2.3.3op1-7 Debian release

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3e0197546..cf7f327d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.3op1-7) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Reduce Build-Depends, move dh_apparmor to B-D-A (Closes: #980104)
+
+ -- Didier Raboud <odyx@debian.org>  Fri, 15 Jan 2021 12:11:30 +0100
+
 cups (2.3.3op1-6) unstable; urgency=medium
 
   [ Till Kamppeter ]
-- 
cgit v1.2.3


From 9c0c0c3c4bc65b9edbc1c3408071ea3da083167b Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Apple AirPrint support

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Bug: https://github.com/OpenPrinting/cups/pull/27
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 74531a8c7..bfd1b0b75 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 7e9a9f265..3e0087496 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 544f6fdf87159efa66f26bc94be28d1c912d899b Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames

Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From 33d00168a0fafa319b64645d163961019d78abd7 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Debian: Set LogFileGroup to adm

---
 conf/cups-files.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index af11fcce6..80ca35145 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
 #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
 #LogFilePerm 0@CUPS_LOG_FILE_PERM@
 
+# Specifies the group name or ID that will be used for log files.
+# The default group in Debian is "adm".
+LogFileGroup adm
+
 # Location of the file logging all access to the scheduler; may be the name
 # "syslog". If not an absolute path, the value of ServerRoot is used as the
 # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
-- 
cgit v1.2.3


From 2fbf8ea84c127f24144f2a2744fcaa0d7a9163e6 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug: https://github.com/OpenPrinting/cups/pull/26
Bug-Debian: https://bugs.debian.org/640124
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index c6489389f..5ff750190 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From f845a822cd57c9a033494c3f3aa7fece6537f1bc Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Debian: Do not alter the permissions of cupsd.conf, ever

Origin: vendor
Bug: https://github.com/OpenPrinting/cups/pull/36
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bfd1b0b75..c8cd5ea49 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From 46fc92fc23fb3fc3d381ec3726a31f5af8b42552 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Debian: Show compile command lines

---
 Makedefs.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..038bb9451 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
 .SUFFIXES:	.a .c .cxx .h .o
 
 .c.o:
-- 
cgit v1.2.3


From c05937e51b336fd6133bc63cd65022bc62ee21f4 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config

Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 6a9e7e560803398614e5b073f0134244d96a3241 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 038bb9451..291099cf2 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 93a4b9739..b60b832c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 984a86d137bfe5a2f59a8d5a320200638cf000b2 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: Debian: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From f1ba5dda80b17eaa2680fe0b99b0072ffe770e4a Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 2 Feb 2021 21:19:39 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 debian/patches/0001-Apple-AirPrint-support.patch   |  90 ++++++
 ...tic-PPDs-recommended-stanzas-in-NickNames.patch |  37 +++
 .../0003-Debian-Set-LogFileGroup-to-adm.patch      |  23 ++
 ...-cupsd.conf.default-from-SERVERROOT-to-DA.patch |  62 ++++
 ...ot-alter-the-permissions-of-cupsd.conf-ev.patch |  27 ++
 .../0006-Debian-Show-compile-command-lines.patch   |  20 ++
 ...dpkg-architecture-in-cups-config-to-make-.patch |  49 +++
 ...d-mantohtml-with-the-build-architecture-c.patch | 110 +++++++
 ...-infrastructure-and-translations-for-manp.patch | 341 +++++++++++++++++++++
 debian/patches/series                              |   9 +
 10 files changed, 768 insertions(+)
 create mode 100644 debian/patches/0001-Apple-AirPrint-support.patch
 create mode 100644 debian/patches/0002-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
 create mode 100644 debian/patches/0003-Debian-Set-LogFileGroup-to-adm.patch
 create mode 100644 debian/patches/0004-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
 create mode 100644 debian/patches/0005-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
 create mode 100644 debian/patches/0006-Debian-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0007-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
 create mode 100644 debian/patches/0008-Debian-Build-mantohtml-with-the-build-architecture-c.patch
 create mode 100644 debian/patches/0009-Debian-po4a-infrastructure-and-translations-for-manp.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Apple-AirPrint-support.patch b/debian/patches/0001-Apple-AirPrint-support.patch
new file mode 100644
index 000000000..5fc39dfe8
--- /dev/null
+++ b/debian/patches/0001-Apple-AirPrint-support.patch
@@ -0,0 +1,90 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Apple AirPrint support
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Bug: https://github.com/OpenPrinting/cups/pull/27
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 74531a8..bfd1b0b 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 7e9a9f2..3e00874 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0002-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch b/debian/patches/0002-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
new file mode 100644
index 000000000..0da73cea6
--- /dev/null
+++ b/debian/patches/0002-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
@@ -0,0 +1,37 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames
+
+Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0003-Debian-Set-LogFileGroup-to-adm.patch b/debian/patches/0003-Debian-Set-LogFileGroup-to-adm.patch
new file mode 100644
index 000000000..597d9bfad
--- /dev/null
+++ b/debian/patches/0003-Debian-Set-LogFileGroup-to-adm.patch
@@ -0,0 +1,23 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Debian: Set LogFileGroup to adm
+
+---
+ conf/cups-files.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index af11fcc..80ca351 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
+ #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
+ #LogFilePerm 0@CUPS_LOG_FILE_PERM@
+ 
++# Specifies the group name or ID that will be used for log files.
++# The default group in Debian is "adm".
++LogFileGroup adm
++
+ # Location of the file logging all access to the scheduler; may be the name
+ # "syslog". If not an absolute path, the value of ServerRoot is used as the
+ # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
diff --git a/debian/patches/0004-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch b/debian/patches/0004-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
new file mode 100644
index 000000000..c4efe6cad
--- /dev/null
+++ b/debian/patches/0004-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug: https://github.com/OpenPrinting/cups/pull/26
+Bug-Debian: https://bugs.debian.org/640124
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index c648938..5ff7501 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0005-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch b/debian/patches/0005-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
new file mode 100644
index 000000000..bcbc93a03
--- /dev/null
+++ b/debian/patches/0005-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
@@ -0,0 +1,27 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Debian: Do not alter the permissions of cupsd.conf, ever
+
+Origin: vendor
+Bug: https://github.com/OpenPrinting/cups/pull/36
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bfd1b0b..c8cd5ea 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0006-Debian-Show-compile-command-lines.patch b/debian/patches/0006-Debian-Show-compile-command-lines.patch
new file mode 100644
index 000000000..a3c709609
--- /dev/null
+++ b/debian/patches/0006-Debian-Show-compile-command-lines.patch
@@ -0,0 +1,20 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Debian: Show compile command lines
+
+---
+ Makedefs.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..038bb94 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+ .SUFFIXES:	.a .c .cxx .h .o
+ 
+ .c.o:
diff --git a/debian/patches/0007-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch b/debian/patches/0007-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
new file mode 100644
index 000000000..7f508d999
--- /dev/null
+++ b/debian/patches/0007-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0008-Debian-Build-mantohtml-with-the-build-architecture-c.patch b/debian/patches/0008-Debian-Build-mantohtml-with-the-build-architecture-c.patch
new file mode 100644
index 000000000..44c038d74
--- /dev/null
+++ b/debian/patches/0008-Debian-Build-mantohtml-with-the-build-architecture-c.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+
+Bug-Debian: https://bugs.debian.org/837936
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 038bb94..291099c 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 93a4b97..b60b832 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0009-Debian-po4a-infrastructure-and-translations-for-manp.patch b/debian/patches/0009-Debian-po4a-infrastructure-and-translations-for-manp.patch
new file mode 100644
index 000000000..ef9aa4262
--- /dev/null
+++ b/debian/patches/0009-Debian-po4a-infrastructure-and-translations-for-manp.patch
@@ -0,0 +1,341 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: Debian: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..9f16c30ab
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,9 @@
+0001-Apple-AirPrint-support.patch
+0002-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
+0003-Debian-Set-LogFileGroup-to-adm.patch
+0004-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
+0005-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
+0006-Debian-Show-compile-command-lines.patch
+0007-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
+0008-Debian-Build-mantohtml-with-the-build-architecture-c.patch
+0009-Debian-po4a-infrastructure-and-translations-for-manp.patch
-- 
cgit v1.2.3


From 645f647b38122b16dd9bcafe3e1048f7b0866832 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 2 Feb 2021 21:20:06 +0100
Subject: cups 2.3.3op2-1 Debian release

---
 debian/changelog | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ffe976c1c..05ee46dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-cups (2.3.3op2-1) UNRELEASED; urgency=medium
+cups (2.3.3op2-1) unstable; urgency=medium
 
-  * Update to new upstream version 2.3.3op2.
+  * New OpenPrinting 2.3.3op2 release
+    - CVE-2020-10001: Fixed a buffer (read) overflow in the `ippReadIO`
+      function
+    - Drop 4 patches merged upstream
+  * Update d/copyright authors and years
 
- -- Didier Raboud <odyx@debian.org>  Tue, 02 Feb 2021 21:19:02 +0100
+ -- Didier Raboud <odyx@debian.org>  Tue, 02 Feb 2021 21:20:06 +0100
 
 cups (2.3.3op1-7) unstable; urgency=medium
 
-- 
cgit v1.2.3


From be8efc35004b5bbf64b940df379f5db08acfbb76 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 2 Feb 2021 21:25:50 +0100
Subject: Bump debhelper from old 12 to 13.

Changes-By: lintian-brush
Fixes: lintian: package-uses-old-debhelper-compat-version
See-also: https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index c034855fd..1afcfefee 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Didier Raboud <odyx@debian.org>,
            Till Kamppeter <till.kamppeter@gmail.com>
 Section: net
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                dh-strip-nondeterminism,
                patch,
                autoconf,
-- 
cgit v1.2.3


From f32a71c447f59b08e029bcf930340fcadc2ef36f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 2 Feb 2021 22:04:45 +0100
Subject: Add d/not-installed to document what doesn't get installed and why

---
 debian/not-installed | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 debian/not-installed

diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 000000000..1daa86cbd
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,43 @@
+# Debian moves this to /usr/share/cups/cupsd.conf.default
+etc/cups/cupsd.conf
+# Back from CUPS 1.5
+etc/dbus-1/system.d/cups.conf
+# Installed by dh_installpam (debian/cups-daemon.cups.pam)
+etc/pam.d/cups
+# Deprecated, not installed (use xinetd)
+lib/systemd/system/cups-lpd.socket
+lib/systemd/system/cups-lpd@.service
+# Not decided whether worth installing or not yet
+usr/bin/ippeveprinter
+usr/lib/cups/command/ippevepcl
+usr/lib/cups/command/ippeveps
+usr/share/man/man7/ippevepcl.7
+usr/share/man/man7/ippeveps.7
+# Ipptool utils
+usr/share/cups/ipptool/color.jpg
+usr/share/cups/ipptool/document-a4.pdf
+usr/share/cups/ipptool/document-a4.ps
+usr/share/cups/ipptool/document-letter.pdf
+usr/share/cups/ipptool/document-letter.ps
+usr/share/cups/ipptool/gray.jpg
+usr/share/cups/ipptool/onepage-a4.pdf
+usr/share/cups/ipptool/onepage-a4.ps
+usr/share/cups/ipptool/onepage-letter.pdf
+usr/share/cups/ipptool/onepage-letter.ps
+usr/share/cups/ipptool/testfile.jpg
+usr/share/cups/ipptool/testfile.pcl
+usr/share/cups/ipptool/testfile.pdf
+usr/share/cups/ipptool/testfile.ps
+usr/share/cups/ipptool/testfile.txt
+# CUPS "desktop" entry, to access the webinterface
+usr/share/applications/cups.desktop
+usr/share/icons/hicolor/*x*/apps/cups.png
+# Translated manpages only get installed if sufficiently translated
+usr/share/man/de/man1/*.1
+usr/share/man/de/man5/*.5
+usr/share/man/de/man7/*.7
+usr/share/man/de/man8/*.8
+usr/share/man/fr/man1/*.1
+usr/share/man/fr/man5/*.5
+usr/share/man/fr/man7/*.7
+usr/share/man/fr/man8/*.8
-- 
cgit v1.2.3


From 0cea6882b719ffbb5ced3eaf9d473a036550c601 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 3 Feb 2021 13:13:18 +0100
Subject: cups 2.3.3op2-2 Debian release

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 05ee46dda..271667e5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cups (2.3.3op2-2) unstable; urgency=medium
+
+  * Bump debhelper compat to 13, document not-installed files
+
+ -- Didier Raboud <odyx@debian.org>  Wed, 03 Feb 2021 13:13:18 +0100
+
 cups (2.3.3op2-1) unstable; urgency=medium
 
   * New OpenPrinting 2.3.3op2 release
-- 
cgit v1.2.3


From 7ecaf418cdbb04893c3f4679a9d38b99e1ae3a2a Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Wed, 3 Feb 2021 18:09:33 +0100
Subject: Refresh po(t) files for man page translations

---
 debian/manpage-po4a/po/cups.pot | 853 +++++++++++++++++++-------------------
 debian/manpage-po4a/po/de.po    | 878 ++++++++++++++++++++-------------------
 debian/manpage-po4a/po/fr.po    | 879 +++++++++++++++++++++-------------------
 3 files changed, 1333 insertions(+), 1277 deletions(-)

diff --git a/debian/manpage-po4a/po/cups.pot b/debian/manpage-po4a/po/cups.pot
index ad813aacf..743249211 100644
--- a/debian/manpage-po4a/po/cups.pot
+++ b/debian/manpage-po4a/po/cups.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-11-27 16:31+0100\n"
+"POT-Creation-Date: 2021-02-03 18:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #. type: TH
 #: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
-#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:11
 #: cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:11
 #: cupsfilter.8:9 cups-lpd.8:11 cups-snmp.8:9 cups-snmp.conf.5:10
 #: cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ipptool.1:9
@@ -52,7 +52,7 @@ msgstr ""
 
 #. type: TH
 #: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
-#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:11
 #: cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:11
 #: cupsfilter.8:9 cups-lpd.8:11 cups-snmp.8:9 cups-snmp.conf.5:10
 #: cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ippfind.1:9
@@ -67,7 +67,7 @@ msgstr ""
 
 #. type: SH
 #: backend.7:11 cancel.1:11 classes.conf.5:11 client.conf.5:11 cups.1:11
-#: cupsaccept.8:11 cups-config.1:11 cupsctl.8:11 cupsd.8:11 cupsd.conf.5:11
+#: cupsaccept.8:11 cups-config.1:11 cupsctl.8:11 cupsd.8:11 cupsd.conf.5:12
 #: cupsd-helper.8:11 cupsd-logs.5:11 cupsenable.8:11 cups-files.conf.5:12
 #: cupsfilter.8:10 cups-lpd.8:12 cups-snmp.8:10 cups-snmp.conf.5:11
 #: cupstestppd.1:11 filter.7:11 ippevepcl.7:10 ippeveprinter.1:10 ippfind.1:10
@@ -160,7 +160,7 @@ msgstr ""
 
 #. type: SH
 #: backend.7:49 cancel.1:37 classes.conf.5:13 client.conf.5:13 cups.1:13
-#: cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:13
+#: cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:14
 #: cupsd-helper.8:46 cupsd-logs.5:13 cupsenable.8:46 cups-files.conf.5:14
 #: cupsfilter.8:54 cups-lpd.8:24 cups-snmp.8:23 cups-snmp.conf.5:13
 #: cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:84 ippfind.1:32
@@ -523,7 +523,7 @@ msgstr ""
 
 #. type: SH
 #: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:126
-#: cups.1:122 cupsd.conf.5:858 cupsd-helper.8:77 cups-files.conf.5:279
+#: cups.1:122 cupsd.conf.5:860 cupsd-helper.8:77 cups-files.conf.5:279
 #: cupsfilter.8:117 cups-lpd.8:61 cups-snmp.8:44 cups-snmp.conf.5:58
 #: cupstestppd.1:138 filter.7:201 lpadmin.8:203 lpc.8:40 lpinfo.8:117 lpr.1:151
 #: mime.convs.5:50 ppdc.1:90 ppdcfile.5:149 ppdhtml.1:35 ppdi.1:42
@@ -565,7 +565,7 @@ msgstr ""
 
 #. type: SH
 #: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:138 cups.1:126
-#: cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:895
+#: cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:897
 #: cupsd-helper.8:81 cupsd-logs.5:216 cupsenable.8:88 cups-files.conf.5:286
 #: cupsfilter.8:131 cups-lpd.8:108 cups-snmp.8:49 cups-snmp.conf.5:62
 #: cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:268
@@ -592,7 +592,7 @@ msgstr ""
 
 #. type: SH
 #: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:142 cups.1:142
-#: cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:904
+#: cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:906
 #: cupsd-helper.8:89 cupsd-logs.5:221 cupsenable.8:96 cups-files.conf.5:296
 #: cupsfilter.8:138 cups-lpd.8:116 cups-snmp.8:55 cups-snmp.conf.5:65
 #: cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:272
@@ -607,14 +607,15 @@ msgstr ""
 
 #. type: Plain text
 #: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:143 cups.1:143
-#: cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:905
-#: cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cupsfilter.8:139
-#: cups-snmp.8:56 cups-snmp.conf.5:66 cupstestppd.1:147 filter.7:221
-#: ippeveprinter.1:273 ipptool.1:252 ipptoolfile.5:655 lp.1:229 lpadmin.8:231
-#: lpc.8:58 lpinfo.8:125 lpmove.8:74 lpoptions.1:118 lpq.1:64 lpr.1:181
-#: lprm.1:82 lpstat.1:148 mailto.conf.5:44 mime.convs.5:62 mime.types.5:108
-#: notifier.7:36 ppdc.1:102 ppdcfile.5:161 ppdhtml.1:47 ppdi.1:54 ppdmerge.1:50
-#: ppdpo.1:54 printers.conf.5:28 subscriptions.conf.5:31
+#: cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:909
+#: cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cups-files.conf.5:299
+#: cupsfilter.8:139 cups-snmp.8:56 cups-snmp.conf.5:66 cupstestppd.1:147
+#: filter.7:221 ippeveprinter.1:273 ipptool.1:252 ipptoolfile.5:655 lp.1:229
+#: lpadmin.8:231 lpc.8:58 lpinfo.8:125 lpmove.8:74 lpoptions.1:118 lpq.1:64
+#: lpr.1:181 lprm.1:82 lpstat.1:148 mailto.conf.5:44 mime.convs.5:62
+#: mime.types.5:108 notifier.7:36 ppdc.1:102 ppdcfile.5:161 ppdhtml.1:47
+#: ppdi.1:54 ppdmerge.1:50 ppdpo.1:54 printers.conf.5:28
+#: subscriptions.conf.5:31
 msgid "Copyright \\[co] 2007-2019 by Apple Inc."
 msgstr ""
 
@@ -647,7 +648,7 @@ msgstr ""
 
 #. type: SH
 #: cancel.1:40 cupsaccept.8:50 cups-config.1:52 cupsctl.8:40 cupsd.8:37
-#: cupsd.conf.5:485 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:33
+#: cupsd.conf.5:487 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:33
 #: cupstestppd.1:58 filter.7:60 ippeveprinter.1:87 ippfind.1:191 ipptool.1:88
 #: lp.1:94 lpadmin.8:73 lpinfo.8:63 lpmove.8:39 lpoptions.1:68 lpq.1:36
 #: lpr.1:64 lprm.1:36 lpstat.1:68 ppdc.1:48 ppdhtml.1:25 ppdi.1:30
@@ -734,7 +735,7 @@ msgid "Deletes job data files in addition to canceling."
 msgstr ""
 
 #. type: SH
-#: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:873
+#: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:875
 #: cupsenable.8:77 cups-lpd.8:47 cups-snmp.8:47 filter.7:199
 #: ippeveprinter.1:207 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97
 #: lpoptions.1:108 lprm.1:52 lpstat.1:133
@@ -751,7 +752,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:875
+#: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:877
 #: cupstestppd.1:125 ippeveprinter.1:252 ippfind.1:242 ipptool.1:233 lp.1:201
 #: lpinfo.8:99 lpmove.8:50 lpr.1:153 lprm.1:56 mime.convs.5:43 mime.types.5:89
 #, no-wrap
@@ -953,19 +954,19 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: client.conf.5:45 cupsd.conf.5:732
+#: client.conf.5:45 cupsd.conf.5:734
 #, no-wrap
 msgid "B<Encryption IfRequested>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:47 cupsd.conf.5:734
+#: client.conf.5:47 cupsd.conf.5:736
 #, no-wrap
 msgid "B<Encryption Never>"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:49 cupsd.conf.5:736
+#: client.conf.5:49 cupsd.conf.5:738
 #, no-wrap
 msgid "B<Encryption Required>"
 msgstr ""
@@ -977,7 +978,7 @@ msgid "Specifies the level of encryption that should be used."
 msgstr ""
 
 #. type: TP
-#: client.conf.5:53 cupsd.conf.5:165
+#: client.conf.5:53 cupsd.conf.5:166
 #, no-wrap
 msgid "B<GSSServiceName >I<name>"
 msgstr ""
@@ -1025,7 +1026,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: client.conf.5:68 cupsd.conf.5:437
+#: client.conf.5:68 cupsd.conf.5:439
 #, no-wrap
 msgid ""
 "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] "
@@ -1034,14 +1035,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: client.conf.5:70 cupsd.conf.5:439
+#: client.conf.5:70 cupsd.conf.5:441
 #, no-wrap
 msgid "B<SSLOptions None>"
 msgstr ""
 
 #. #SSLPort
 #. type: Plain text
-#: client.conf.5:85 cupsd.conf.5:454
+#: client.conf.5:85 cupsd.conf.5:456
 msgid ""
 "Sets encryption options (only in /etc/cups/client.conf).  By default, CUPS "
 "only supports encryption using TLS v1.0 or higher using known secure cipher "
@@ -2273,24 +2274,24 @@ msgid ""
 msgstr ""
 
 #. type: TH
-#: cupsd.conf.5:10
+#: cupsd.conf.5:11
 #, no-wrap
 msgid "cupsd.conf"
 msgstr ""
 
 #. type: TH
-#: cupsd.conf.5:10
+#: cupsd.conf.5:11
 #, no-wrap
-msgid "16 July 2019"
+msgid "28 November 2020"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:13
+#: cupsd.conf.5:14
 msgid "cupsd.conf - server configuration file for cups"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:25
+#: cupsd.conf.5:26
 msgid ""
 "The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
 "normally located in the I</etc/cups> directory.  Each line in the file can "
@@ -2301,38 +2302,38 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.5:25 ipptoolfile.5:83
+#: cupsd.conf.5:26 ipptoolfile.5:83
 #, no-wrap
 msgid "TOP-LEVEL DIRECTIVES"
 msgstr ""
 
 #. #AccessLogLevel
 #. type: Plain text
-#: cupsd.conf.5:29
+#: cupsd.conf.5:30
 msgid "The following top-level directives are understood by B<cupsd>(8):"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:29
+#: cupsd.conf.5:30
 #, no-wrap
 msgid "B<AccessLogLevel config>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:31
+#: cupsd.conf.5:32
 #, no-wrap
 msgid "B<AccessLogLevel actions>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:33
+#: cupsd.conf.5:34
 #, no-wrap
 msgid "B<AccessLogLevel all>"
 msgstr ""
 
 #. #AutoPurgeJobs
 #. type: Plain text
-#: cupsd.conf.5:41
+#: cupsd.conf.5:42
 msgid ""
 "Specifies the logging level for the AccessLog file.  The \"config\" level "
 "logs when printers and classes are added, deleted, or modified and when "
@@ -2343,34 +2344,34 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:41
+#: cupsd.conf.5:42
 #, no-wrap
 msgid "B<AutoPurgeJobs Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:43
+#: cupsd.conf.5:44
 #, no-wrap
 msgid "B<AutoPurgeJobs No>"
 msgstr ""
 
 #. #BrowseDNSSDSubTypes
 #. type: Plain text
-#: cupsd.conf.5:49
+#: cupsd.conf.5:50
 msgid ""
 "Specifies whether to purge job history data automatically when it is no "
 "longer required for quotas.  The default is \"No\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:49
+#: cupsd.conf.5:50
 #, no-wrap
 msgid "B<BrowseDNSSDSubTypes>I<_subtype[,...]>"
 msgstr ""
 
 #. #BrowseLocalProtocols
 #. type: Plain text
-#: cupsd.conf.5:55
+#: cupsd.conf.5:56
 msgid ""
 "Specifies a list of Bonjour sub-types to advertise for each shared printer.  "
 "For example, \"BrowseDNSSDSubTypes _cups,_print\" will tell network clients "
@@ -2380,150 +2381,150 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:55
+#: cupsd.conf.5:56
 #, no-wrap
 msgid "B<BrowseLocalProtocols all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:57
+#: cupsd.conf.5:58
 #, no-wrap
 msgid "B<BrowseLocalProtocols dnssd>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:59
+#: cupsd.conf.5:60
 #, no-wrap
 msgid "B<BrowseLocalProtocols none>"
 msgstr ""
 
 #. #BrowseWebIF
 #. type: Plain text
-#: cupsd.conf.5:64
+#: cupsd.conf.5:65
 msgid ""
 "Specifies which protocols to use for local printer sharing.  The default is "
 "\"dnssd\" on systems that support Bonjour and \"none\" otherwise."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:64
+#: cupsd.conf.5:65
 #, no-wrap
 msgid "B<BrowseWebIF Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:66
+#: cupsd.conf.5:67
 #, no-wrap
 msgid "B<BrowseWebIF No>"
 msgstr ""
 
 #. #Browsing
 #. type: Plain text
-#: cupsd.conf.5:72
+#: cupsd.conf.5:73
 msgid ""
 "Specifies whether the CUPS web interface is advertised.  The default is "
 "\"No\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:72
+#: cupsd.conf.5:73
 #, no-wrap
 msgid "B<Browsing Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:74
+#: cupsd.conf.5:75
 #, no-wrap
 msgid "B<Browsing No>"
 msgstr ""
 
 #. #DefaultAuthType
 #. type: Plain text
-#: cupsd.conf.5:80
+#: cupsd.conf.5:81
 msgid "Specifies whether shared printers are advertised.  The default is \"No\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:80
+#: cupsd.conf.5:81
 #, no-wrap
 msgid "B<DefaultAuthType Basic>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:82
+#: cupsd.conf.5:83
 #, no-wrap
 msgid "B<DefaultAuthType Negotiate>"
 msgstr ""
 
 #. #DefaultEncryption
 #. type: Plain text
-#: cupsd.conf.5:88
+#: cupsd.conf.5:89
 msgid ""
 "Specifies the default type of authentication to use.  The default is "
 "\"Basic\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:88
+#: cupsd.conf.5:89
 #, no-wrap
 msgid "B<DefaultEncryption Never>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:90
+#: cupsd.conf.5:91
 #, no-wrap
 msgid "B<DefaultEncryption IfRequested>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:92
+#: cupsd.conf.5:93
 #, no-wrap
 msgid "B<DefaultEncryption Required>"
 msgstr ""
 
 #. #DefaultLanguage
 #. type: Plain text
-#: cupsd.conf.5:97
+#: cupsd.conf.5:98
 msgid ""
 "Specifies whether encryption will be used for authenticated requests.  The "
 "default is \"Required\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:97
+#: cupsd.conf.5:98
 #, no-wrap
 msgid "B<DefaultLanguage >I<locale>"
 msgstr ""
 
 #. #DefaultPaperSize
 #. type: Plain text
-#: cupsd.conf.5:102
+#: cupsd.conf.5:103
 msgid ""
 "Specifies the default language to use for text and web content.  The default "
 "is \"en\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:102
+#: cupsd.conf.5:103
 #, no-wrap
 msgid "B<DefaultPaperSize Auto>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:104
+#: cupsd.conf.5:105
 #, no-wrap
 msgid "B<DefaultPaperSize None>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:106
+#: cupsd.conf.5:107
 #, no-wrap
 msgid "B<DefaultPaperSize >I<sizename>"
 msgstr ""
 
 #. #DefaultPolicy
 #. type: Plain text
-#: cupsd.conf.5:112
+#: cupsd.conf.5:113
 msgid ""
 "Specifies the default paper size for new print queues. \"Auto\" uses a "
 "locale-specific default, while \"None\" specifies there is no default paper "
@@ -2532,48 +2533,48 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:112
+#: cupsd.conf.5:113
 #, no-wrap
 msgid "B<DefaultPolicy >I<policy-name>"
 msgstr ""
 
 #. #DefaultShared
 #. type: Plain text
-#: cupsd.conf.5:117
+#: cupsd.conf.5:118
 msgid ""
 "Specifies the default access policy to use.  The default access policy is "
 "\"default\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:117
+#: cupsd.conf.5:118
 #, no-wrap
 msgid "B<DefaultShared Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:119
+#: cupsd.conf.5:120
 #, no-wrap
 msgid "B<DefaultShared No>"
 msgstr ""
 
 #. #DirtyCleanInterval
 #. type: Plain text
-#: cupsd.conf.5:124
+#: cupsd.conf.5:125
 msgid ""
 "Specifies whether local printers are shared by default.  The default is "
 "\"Yes\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:124
+#: cupsd.conf.5:125
 #, no-wrap
 msgid "B<DirtyCleanInterval >I<seconds>"
 msgstr ""
 
 #. #DNSSDHostName
 #. type: Plain text
-#: cupsd.conf.5:130
+#: cupsd.conf.5:131
 msgid ""
 "Specifies the delay for updating of configuration and state files.  A value "
 "of 0 causes the update to happen as soon as possible, typically within a few "
@@ -2581,81 +2582,81 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:130
+#: cupsd.conf.5:131
 #, no-wrap
 msgid "B<DNSSDHostName>I<hostname.example.com>"
 msgstr ""
 
 #. #ErrorPolicy
 #. type: Plain text
-#: cupsd.conf.5:135
+#: cupsd.conf.5:136
 msgid ""
 "Specifies the fully-qualified domain name for the server that is used for "
 "Bonjour sharing.  The default is typically the server's \".local\" hostname."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:135
+#: cupsd.conf.5:136
 #, no-wrap
 msgid "B<ErrorPolicy abort-job>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:138
+#: cupsd.conf.5:139
 msgid ""
 "Specifies that a failed print job should be aborted (discarded) unless "
 "otherwise specified for the printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:138
+#: cupsd.conf.5:139
 #, no-wrap
 msgid "B<ErrorPolicy retry-current-job>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:141
+#: cupsd.conf.5:142
 msgid ""
 "Specifies that a failed print job should be retried immediately unless "
 "otherwise specified for the printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:141
+#: cupsd.conf.5:142
 #, no-wrap
 msgid "B<ErrorPolicy retry-job>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:144
+#: cupsd.conf.5:145
 msgid ""
 "Specifies that a failed print job should be retried at a later time unless "
 "otherwise specified for the printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:144
+#: cupsd.conf.5:145
 #, no-wrap
 msgid "B<ErrorPolicy stop-printer>"
 msgstr ""
 
 #. #FilterLimit
 #. type: Plain text
-#: cupsd.conf.5:148
+#: cupsd.conf.5:149
 msgid ""
 "Specifies that a failed print job should stop the printer unless otherwise "
 "specified for the printer. The 'stop-printer' error policy is the default."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:148
+#: cupsd.conf.5:149
 #, no-wrap
 msgid "B<FilterLimit >I<limit>"
 msgstr ""
 
 #. #FilterNice
 #. type: Plain text
-#: cupsd.conf.5:157
+#: cupsd.conf.5:158
 msgid ""
 "Specifies the maximum cost of filters that are run concurrently, which can "
 "be used to minimize disk, memory, and CPU resource problems.  A limit of 0 "
@@ -2667,14 +2668,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:157
+#: cupsd.conf.5:158
 #, no-wrap
 msgid "B<FilterNice >I<nice-value>"
 msgstr ""
 
 #. #GSSServiceName
 #. type: Plain text
-#: cupsd.conf.5:165
+#: cupsd.conf.5:166
 msgid ""
 "Specifies the scheduling priority ( B<nice>(8)  value) of filters that are "
 "run to print a job.  The nice value ranges from 0, the highest priority, to "
@@ -2682,7 +2683,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:169
+#: cupsd.conf.5:170
 msgid ""
 "Specifies the service name when using Kerberos authentication.  The default "
 "service name is \"http.\""
@@ -2690,26 +2691,26 @@ msgstr ""
 
 #. #HostNameLookups
 #. type: TP
-#: cupsd.conf.5:169
+#: cupsd.conf.5:170
 #, no-wrap
 msgid "B<HostNameLookups On>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:172
+#: cupsd.conf.5:173
 #, no-wrap
 msgid "B<HostNameLookups Off>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:174
+#: cupsd.conf.5:175
 #, no-wrap
 msgid "B<HostNameLookups Double>"
 msgstr ""
 
 #. #IdleExitTimeout
 #. type: Plain text
-#: cupsd.conf.5:184
+#: cupsd.conf.5:185
 msgid ""
 "Specifies whether to do reverse lookups on connecting clients.  The "
 "\"Double\" setting causes B<cupsd>(8)  to verify that the hostname resolved "
@@ -2721,14 +2722,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:184
+#: cupsd.conf.5:185
 #, no-wrap
 msgid "B<IdleExitTimeout >I<seconds>"
 msgstr ""
 
 #. #JobKillDelay
 #. type: Plain text
-#: cupsd.conf.5:192
+#: cupsd.conf.5:193
 msgid ""
 "Specifies the length of time to wait before shutting down due to "
 "inactivity.  The default is \"60\" seconds.  Note: Only applicable when "
@@ -2736,28 +2737,28 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:192
+#: cupsd.conf.5:193
 #, no-wrap
 msgid "B<JobKillDelay >I<seconds>"
 msgstr ""
 
 #. #JobRetryInterval
 #. type: Plain text
-#: cupsd.conf.5:197
+#: cupsd.conf.5:198
 msgid ""
 "Specifies the number of seconds to wait before killing the filters and "
 "backend associated with a canceled or held job.  The default is \"30\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:197
+#: cupsd.conf.5:198
 #, no-wrap
 msgid "B<JobRetryInterval >I<seconds>"
 msgstr ""
 
 #. #JobRetryLimit
 #. type: Plain text
-#: cupsd.conf.5:203
+#: cupsd.conf.5:204
 msgid ""
 "Specifies the interval between retries of jobs in seconds.  This is "
 "typically used for fax queues but can also be used with normal print queues "
@@ -2766,14 +2767,14 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:203
+#: cupsd.conf.5:204
 #, no-wrap
 msgid "B<JobRetryLimit >I<count>"
 msgstr ""
 
 #. #KeepAlive
 #. type: Plain text
-#: cupsd.conf.5:209
+#: cupsd.conf.5:210
 msgid ""
 "Specifies the number of retries that are done for jobs.  This is typically "
 "used for fax queues but can also be used with normal print queues whose "
@@ -2782,48 +2783,48 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:209
+#: cupsd.conf.5:210
 #, no-wrap
 msgid "B<KeepAlive Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:211
+#: cupsd.conf.5:212
 #, no-wrap
 msgid "B<KeepAlive No>"
 msgstr ""
 
 #. #KeepAliveTimeout
 #. type: Plain text
-#: cupsd.conf.5:216
+#: cupsd.conf.5:217
 msgid ""
 "Specifies whether to support HTTP keep-alive connections.  The default is "
 "\"Yes\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:216
+#: cupsd.conf.5:217
 #, no-wrap
 msgid "B<KeepAliveTimeout >I<seconds>"
 msgstr ""
 
 #. #LimitIPP
 #. type: Plain text
-#: cupsd.conf.5:221
+#: cupsd.conf.5:222
 msgid ""
 "Specifies how long an idle client connection remains open.  The default is "
 "\"30\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:221
+#: cupsd.conf.5:222
 #, no-wrap
 msgid "B<E<lt>Limit >I<operation >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 msgstr ""
 
 #. #Limit
 #. type: Plain text
-#: cupsd.conf.5:225
+#: cupsd.conf.5:226
 msgid ""
 "Specifies the IPP operations that are being limited inside a Policy "
 "section. IPP operation names are listed below in the section \"IPP OPERATION "
@@ -2831,20 +2832,20 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:225
+#: cupsd.conf.5:226
 #, no-wrap
 msgid "B<E<lt>Limit >I<method >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:228
+#: cupsd.conf.5:229
 #, no-wrap
 msgid "B<E<lt>LimitExcept >I<method >...B<E<gt> >... B<E<lt>/LimitExceptE<gt>>"
 msgstr ""
 
 #. #LimitRequestBody
 #. type: Plain text
-#: cupsd.conf.5:232
+#: cupsd.conf.5:233
 msgid ""
 "Specifies the HTTP methods that are being limited inside a Location "
 "section. HTTP method names are listed below in the section \"HTTP METHOD "
@@ -2852,62 +2853,65 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:232
+#: cupsd.conf.5:233
 #, no-wrap
 msgid "B<LimitRequestBody >I<size>"
 msgstr ""
 
 #. #Listen
 #. type: Plain text
-#: cupsd.conf.5:237
+#: cupsd.conf.5:238
 msgid ""
 "Specifies the maximum size of print files, IPP requests, and HTML form "
 "data.  The default is \"0\" which disables the limit check."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:237
+#: cupsd.conf.5:238
 #, no-wrap
 msgid "B<Listen >I<ipv4-address>B<:>I<port>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:239
+#: cupsd.conf.5:240
 #, no-wrap
 msgid "B<Listen [>I<ipv6-address>B<]:>I<port>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:241
+#: cupsd.conf.5:242
 #, no-wrap
 msgid "B<Listen *:>I<port>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:243
+#: cupsd.conf.5:244
 #, no-wrap
 msgid "B<Listen >I</path/to/domain/socket>"
 msgstr ""
 
 #. #ListenBackLog
 #. type: Plain text
-#: cupsd.conf.5:249
+#: cupsd.conf.5:251
 msgid ""
 "Listens to the specified address and port or domain socket path for "
 "connections.  Multiple Listen directives can be provided to listen on "
 "multiple addresses.  The Listen directive is similar to the Port directive "
-"but allows you to restrict access to specific interfaces or networks."
+"but allows you to restrict access to specific interfaces or networks.  Note: "
+"\"Listen *:I<port>\" and \"Port I<port>\" effectively listen on all IP "
+"addresses, so you cannot combine them with Listen directives for explicit "
+"IPv4 or IPv6 addresses on the same port."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:249
+#: cupsd.conf.5:251
 #, no-wrap
 msgid "B<ListenBackLog >I<number>"
 msgstr ""
 
 #. #Location
 #. type: Plain text
-#: cupsd.conf.5:256
+#: cupsd.conf.5:258
 msgid ""
 "Specifies the number of pending connections that will be allowed.  This "
 "normally only affects very busy servers that have reached the MaxClients "
@@ -2919,28 +2923,28 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:256
+#: cupsd.conf.5:258
 #, no-wrap
 msgid "B<E<lt>Location >I</path>B<E<gt> >... B<E<lt>/LocationE<gt>>"
 msgstr ""
 
 #. #LogDebugHistory
 #. type: Plain text
-#: cupsd.conf.5:261
+#: cupsd.conf.5:263
 msgid ""
 "Specifies access control for the named location.  Paths are documented below "
 "in the section \"LOCATION PATHS\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:261
+#: cupsd.conf.5:263
 #, no-wrap
 msgid "B<LogDebugHistory >I<number>"
 msgstr ""
 
 #. #LogLevel
 #. type: Plain text
-#: cupsd.conf.5:265
+#: cupsd.conf.5:267
 msgid ""
 "Specifies the number of debugging messages that are retained for logging if "
 "an error occurs in a print job. Debug messages are logged regardless of the "
@@ -2948,68 +2952,68 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:265
+#: cupsd.conf.5:267
 #, no-wrap
 msgid "B<LogLevel >none"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:267
+#: cupsd.conf.5:269
 #, no-wrap
 msgid "B<LogLevel >emerg"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:269
+#: cupsd.conf.5:271
 #, no-wrap
 msgid "B<LogLevel >alert"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:271
+#: cupsd.conf.5:273
 #, no-wrap
 msgid "B<LogLevel >crit"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:273
+#: cupsd.conf.5:275
 #, no-wrap
 msgid "B<LogLevel >error"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:275
+#: cupsd.conf.5:277
 #, no-wrap
 msgid "B<LogLevel >warn"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:277
+#: cupsd.conf.5:279
 #, no-wrap
 msgid "B<LogLevel >notice"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:279
+#: cupsd.conf.5:281
 #, no-wrap
 msgid "B<LogLevel >info"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:281
+#: cupsd.conf.5:283
 #, no-wrap
 msgid "B<LogLevel >debug"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:283
+#: cupsd.conf.5:285
 #, no-wrap
 msgid "B<LogLevel >debug2"
 msgstr ""
 
 #. #LogTimeFormat
 #. type: Plain text
-#: cupsd.conf.5:289
+#: cupsd.conf.5:291
 msgid ""
 "Specifies the level of logging for the ErrorLog file.  The value \"none\" "
 "stops all logging while \"debug2\" logs everything.  The default is "
@@ -3017,20 +3021,20 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:289
+#: cupsd.conf.5:291
 #, no-wrap
 msgid "B<LogTimeFormat >standard"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:291
+#: cupsd.conf.5:293
 #, no-wrap
 msgid "B<LogTimeFormat >usecs"
 msgstr ""
 
 #. #MaxClients
 #. type: Plain text
-#: cupsd.conf.5:296
+#: cupsd.conf.5:298
 msgid ""
 "Specifies the format of the date and time in the log files.  The value "
 "\"standard\" is the default and logs whole seconds while \"usecs\" logs "
@@ -3038,56 +3042,56 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:296
+#: cupsd.conf.5:298
 #, no-wrap
 msgid "B<MaxClients >I<number>"
 msgstr ""
 
 #. #MaxClientPerHost
 #. type: Plain text
-#: cupsd.conf.5:301
+#: cupsd.conf.5:303
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed by the "
 "scheduler.  The default is \"100\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:301
+#: cupsd.conf.5:303
 #, no-wrap
 msgid "B<MaxClientsPerHost >I<number>"
 msgstr ""
 
 #. #MaxCopies
 #. type: Plain text
-#: cupsd.conf.5:307
+#: cupsd.conf.5:309
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed from a "
 "single address.  The default is the MaxClients value."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:307
+#: cupsd.conf.5:309
 #, no-wrap
 msgid "B<MaxCopies >I<number>"
 msgstr ""
 
 #. #MaxHoldTime
 #. type: Plain text
-#: cupsd.conf.5:312
+#: cupsd.conf.5:314
 msgid ""
 "Specifies the maximum number of copies that a user can print of each job.  "
 "The default is \"9999\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:312
+#: cupsd.conf.5:314
 #, no-wrap
 msgid "B<MaxHoldTime >I<seconds>"
 msgstr ""
 
 #. #MaxJobs
 #. type: Plain text
-#: cupsd.conf.5:317
+#: cupsd.conf.5:319
 msgid ""
 "Specifies the maximum time a job may remain in the \"indefinite\" hold state "
 "before it is canceled.  The default is \"0\" which disables cancellation of "
@@ -3095,56 +3099,56 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:317
+#: cupsd.conf.5:319
 #, no-wrap
 msgid "B<MaxJobs >I<number>"
 msgstr ""
 
 #. #MaxJobsPerPrinter
 #. type: Plain text
-#: cupsd.conf.5:323
+#: cupsd.conf.5:325
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed.  Set to "
 "\"0\" to allow an unlimited number of jobs.  The default is \"500\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:323
+#: cupsd.conf.5:325
 #, no-wrap
 msgid "B<MaxJobsPerPrinter >I<number>"
 msgstr ""
 
 #. #MaxJobsPerUser
 #. type: Plain text
-#: cupsd.conf.5:328
+#: cupsd.conf.5:330
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "printer.  The default is \"0\" which allows up to MaxJobs jobs per printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:328
+#: cupsd.conf.5:330
 #, no-wrap
 msgid "B<MaxJobsPerUser >I<number>"
 msgstr ""
 
 #. #MaxJobTime
 #. type: Plain text
-#: cupsd.conf.5:333
+#: cupsd.conf.5:335
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "user.  The default is \"0\" which allows up to MaxJobs jobs per user."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:333
+#: cupsd.conf.5:335
 #, no-wrap
 msgid "B<MaxJobTime >I<seconds>"
 msgstr ""
 
 #. #MaxLogSize
 #. type: Plain text
-#: cupsd.conf.5:339
+#: cupsd.conf.5:341
 msgid ""
 "Specifies the maximum time a job may take to print before it is canceled.  "
 "Set to \"0\" to disable cancellation of \"stuck\" jobs.  The default is "
@@ -3152,78 +3156,78 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:339
+#: cupsd.conf.5:341
 #, no-wrap
 msgid "B<MaxLogSize >I<size>"
 msgstr ""
 
 #. #MultipleOperationTimeout
 #. type: Plain text
-#: cupsd.conf.5:345
+#: cupsd.conf.5:347
 msgid ""
 "Specifies the maximum size of the log files before they are rotated.  The "
 "value \"0\" disables log rotation.  The default is \"1048576\" (1MB)."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:345
+#: cupsd.conf.5:347
 #, no-wrap
 msgid "B<MultipleOperationTimeout >I<seconds>"
 msgstr ""
 
 #. #Policy
 #. type: Plain text
-#: cupsd.conf.5:350
+#: cupsd.conf.5:352
 msgid ""
 "Specifies the maximum amount of time to allow between files in a multiple "
 "file print job.  The default is \"900\" (15 minutes)."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:350
+#: cupsd.conf.5:352
 #, no-wrap
 msgid "B<E<lt>Policy >I<name>B<E<gt> >... B<E<lt>/PolicyE<gt>>"
 msgstr ""
 
 #. #Port
 #. type: Plain text
-#: cupsd.conf.5:354
+#: cupsd.conf.5:356
 msgid "Specifies access control for the named policy."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:354
+#: cupsd.conf.5:356
 #, no-wrap
 msgid "B<Port >I<number>"
 msgstr ""
 
 #. #PreserveJobFiles
 #. type: Plain text
-#: cupsd.conf.5:358
+#: cupsd.conf.5:360
 msgid "Listens to the specified port number for connections."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:358
+#: cupsd.conf.5:360
 #, no-wrap
 msgid "B<PreserveJobFiles Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:360
+#: cupsd.conf.5:362
 #, no-wrap
 msgid "B<PreserveJobFiles No>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:362
+#: cupsd.conf.5:364
 #, no-wrap
 msgid "B<PreserveJobFiles >I<seconds>"
 msgstr ""
 
 #. #PreserveJobHistory
 #. type: Plain text
-#: cupsd.conf.5:368
+#: cupsd.conf.5:370
 msgid ""
 "Specifies whether job files (documents) are preserved after a job is "
 "printed.  If a numeric value is specified, job files are preserved for the "
@@ -3232,26 +3236,26 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:368
+#: cupsd.conf.5:370
 #, no-wrap
 msgid "B<PreserveJobHistory Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:370
+#: cupsd.conf.5:372
 #, no-wrap
 msgid "B<PreserveJobHistory No>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:372
+#: cupsd.conf.5:374
 #, no-wrap
 msgid "B<PreserveJobHistory >I<seconds>"
 msgstr ""
 
 #. #ReloadTimeout
 #. type: Plain text
-#: cupsd.conf.5:379
+#: cupsd.conf.5:381
 msgid ""
 "Specifies whether the job history is preserved after a job is printed.  If a "
 "numeric value is specified, the job history is preserved for the indicated "
@@ -3260,48 +3264,48 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:379
+#: cupsd.conf.5:381
 #, no-wrap
 msgid "B<ReloadTimeout >I<seconds>"
 msgstr ""
 
 #. #ServerAdmin
 #. type: Plain text
-#: cupsd.conf.5:384
+#: cupsd.conf.5:386
 msgid ""
 "Specifies the amount of time to wait for job completion before restarting "
 "the scheduler.  The default is \"30\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:384
+#: cupsd.conf.5:386
 #, no-wrap
 msgid "B<ServerAdmin >I<email-address>"
 msgstr ""
 
 #. #ServerAlias
 #. type: Plain text
-#: cupsd.conf.5:389
+#: cupsd.conf.5:391
 msgid ""
 "Specifies the email address of the server administrator.  The default value "
 "is \"root@ServerName\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:389
+#: cupsd.conf.5:391
 #, no-wrap
 msgid "B<ServerAlias >I<hostname >[ ... I<hostname >]"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:391
+#: cupsd.conf.5:393
 #, no-wrap
 msgid "B<ServerAlias *>"
 msgstr ""
 
 #. #ServerName
 #. type: Plain text
-#: cupsd.conf.5:397
+#: cupsd.conf.5:399
 msgid ""
 "The ServerAlias directive is used for HTTP Host header validation when "
 "clients connect to the scheduler from external interfaces.  Using the "
@@ -3312,64 +3316,64 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:397
+#: cupsd.conf.5:399
 #, no-wrap
 msgid "B<ServerName >I<hostname>"
 msgstr ""
 
 #. #ServerTokens
 #. type: Plain text
-#: cupsd.conf.5:404
+#: cupsd.conf.5:406
 msgid ""
 "Specifies the fully-qualified hostname of the server.  The default is the "
 "value reported by the B<hostname>(1)  command."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:404
+#: cupsd.conf.5:406
 #, no-wrap
 msgid "B<ServerTokens None>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:406
+#: cupsd.conf.5:408
 #, no-wrap
 msgid "B<ServerTokens ProductOnly>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:408
+#: cupsd.conf.5:410
 #, no-wrap
 msgid "B<ServerTokens Major>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:410
+#: cupsd.conf.5:412
 #, no-wrap
 msgid "B<ServerTokens Minor>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:412
+#: cupsd.conf.5:414
 #, no-wrap
 msgid "B<ServerTokens Minimal>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:414
+#: cupsd.conf.5:416
 #, no-wrap
 msgid "B<ServerTokens OS>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:416
+#: cupsd.conf.5:418
 #, no-wrap
 msgid "B<ServerTokens Full>"
 msgstr ""
 
 #. #SSLListen
 #. type: Plain text
-#: cupsd.conf.5:428
+#: cupsd.conf.5:430
 msgid ""
 "Specifies what information is included in the Server header of HTTP "
 "responses.  \"None\" disables the Server header.  \"ProductOnly\" reports "
@@ -3381,879 +3385,879 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:428
+#: cupsd.conf.5:430
 #, no-wrap
 msgid "B<SSLListen >I<ipv4-address>B<:>I<port>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:430
+#: cupsd.conf.5:432
 #, no-wrap
 msgid "B<SSLListen [>I<ipv6-address>B<]:>I<port>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:432
+#: cupsd.conf.5:434
 #, no-wrap
 msgid "B<SSLListen *:>I<port>"
 msgstr ""
 
 #. #SSLOptions
 #. type: Plain text
-#: cupsd.conf.5:436
+#: cupsd.conf.5:438
 msgid "Listens on the specified address and port for encrypted connections."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:454
+#: cupsd.conf.5:456
 #, no-wrap
 msgid "B<SSLPort >I<port>"
 msgstr ""
 
 #. #StrictConformance
 #. type: Plain text
-#: cupsd.conf.5:458
+#: cupsd.conf.5:460
 msgid "Listens on the specified port for encrypted connections."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:458
+#: cupsd.conf.5:460
 #, no-wrap
 msgid "B<StrictConformance Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:460
+#: cupsd.conf.5:462
 #, no-wrap
 msgid "B<StrictConformance No>"
 msgstr ""
 
 #. #Timeout
 #. type: Plain text
-#: cupsd.conf.5:465
+#: cupsd.conf.5:467
 msgid ""
 "Specifies whether the scheduler requires clients to strictly adhere to the "
 "IPP specifications.  The default is \"No\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:465
+#: cupsd.conf.5:467
 #, no-wrap
 msgid "B<Timeout >I<seconds>"
 msgstr ""
 
 #. #WebInterface
 #. type: Plain text
-#: cupsd.conf.5:470
+#: cupsd.conf.5:472
 msgid "Specifies the HTTP request timeout.  The default is \"900\" (15 minutes)."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:470
+#: cupsd.conf.5:472
 #, no-wrap
 msgid "B<WebInterface yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:472
+#: cupsd.conf.5:474
 #, no-wrap
 msgid "B<WebInterface no>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:476
+#: cupsd.conf.5:478
 msgid "Specifies whether the web interface is enabled.  The default is \"No\"."
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.5:476
+#: cupsd.conf.5:478
 #, no-wrap
 msgid "HTTP METHOD NAMES"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:479
+#: cupsd.conf.5:481
 msgid "The following HTTP methods are supported by B<cupsd>(8):"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:479
+#: cupsd.conf.5:481
 #, no-wrap
 msgid "GET"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:482
+#: cupsd.conf.5:484
 msgid ""
 "Used by a client to download icons and other printer resources and to access "
 "the CUPS web interface."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:482
+#: cupsd.conf.5:484
 #, no-wrap
 msgid "HEAD"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:485
+#: cupsd.conf.5:487
 msgid "Used by a client to get the type, size, and modification date of resources."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:488
+#: cupsd.conf.5:490
 msgid "Used by a client to establish a secure (SSL/TLS) connection."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:488
+#: cupsd.conf.5:490
 #, no-wrap
 msgid "POST"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:491
+#: cupsd.conf.5:493
 msgid ""
 "Used by a client to submit IPP requests and HTML forms from the CUPS web "
 "interface."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:491
+#: cupsd.conf.5:493
 #, no-wrap
 msgid "PUT"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:494
+#: cupsd.conf.5:496
 msgid "Used by a client to upload configuration files."
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.5:494
+#: cupsd.conf.5:496
 #, no-wrap
 msgid "IPP OPERATION NAMES"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:497
+#: cupsd.conf.5:499
 msgid "The following IPP operations are supported by B<cupsd>(8):"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:497
+#: cupsd.conf.5:499
 #, no-wrap
 msgid "CUPS-Accept-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:500
+#: cupsd.conf.5:502
 msgid "Allows a printer to accept new jobs."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:500
+#: cupsd.conf.5:502
 #, no-wrap
 msgid "CUPS-Add-Modify-Class"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:503
+#: cupsd.conf.5:505
 msgid "Adds or modifies a printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:503
+#: cupsd.conf.5:505
 #, no-wrap
 msgid "CUPS-Add-Modify-Printer"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:506
+#: cupsd.conf.5:508
 msgid "Adds or modifies a printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:506
+#: cupsd.conf.5:508
 #, no-wrap
 msgid "CUPS-Authenticate-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:509
+#: cupsd.conf.5:511
 msgid "Releases a job that is held for authentication."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:509
+#: cupsd.conf.5:511
 #, no-wrap
 msgid "CUPS-Delete-Class"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:512
+#: cupsd.conf.5:514
 msgid "Deletes a printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:512
+#: cupsd.conf.5:514
 #, no-wrap
 msgid "CUPS-Delete-Printer"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:515
+#: cupsd.conf.5:517
 msgid "Deletes a printer."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:515
+#: cupsd.conf.5:517
 #, no-wrap
 msgid "CUPS-Get-Classes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:518
+#: cupsd.conf.5:520
 msgid "Gets a list of printer classes."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:518
+#: cupsd.conf.5:520
 #, no-wrap
 msgid "CUPS-Get-Default"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:521
+#: cupsd.conf.5:523
 msgid "Gets the server default printer or printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:521
+#: cupsd.conf.5:523
 #, no-wrap
 msgid "CUPS-Get-Devices"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:524
+#: cupsd.conf.5:526
 msgid "Gets a list of devices that are currently available."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:524
+#: cupsd.conf.5:526
 #, no-wrap
 msgid "CUPS-Get-Document"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:527
+#: cupsd.conf.5:529
 msgid "Gets a document file for a job."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:527
+#: cupsd.conf.5:529
 #, no-wrap
 msgid "CUPS-Get-PPD"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:530
+#: cupsd.conf.5:532
 msgid "Gets a PPD file."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:530
+#: cupsd.conf.5:532
 #, no-wrap
 msgid "CUPS-Get-PPDs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:533
+#: cupsd.conf.5:535
 msgid "Gets a list of installed PPD files."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:533
+#: cupsd.conf.5:535
 #, no-wrap
 msgid "CUPS-Get-Printers"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:536
+#: cupsd.conf.5:538
 msgid "Gets a list of printers."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:536
+#: cupsd.conf.5:538
 #, no-wrap
 msgid "CUPS-Move-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:539
+#: cupsd.conf.5:541
 msgid "Moves a job."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:539
+#: cupsd.conf.5:541
 #, no-wrap
 msgid "CUPS-Reject-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:542
+#: cupsd.conf.5:544
 msgid "Prevents a printer from accepting new jobs."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:542
+#: cupsd.conf.5:544
 #, no-wrap
 msgid "CUPS-Set-Default"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:545
+#: cupsd.conf.5:547
 msgid "Sets the server default printer or printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:545
+#: cupsd.conf.5:547
 #, no-wrap
 msgid "Cancel-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:548
+#: cupsd.conf.5:550
 msgid "Cancels a job."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:548
+#: cupsd.conf.5:550
 #, no-wrap
 msgid "Cancel-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:551
+#: cupsd.conf.5:553
 msgid "Cancels one or more jobs."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:551
+#: cupsd.conf.5:553
 #, no-wrap
 msgid "Cancel-My-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:554
+#: cupsd.conf.5:556
 msgid "Cancels one or more jobs creates by a user."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:554
+#: cupsd.conf.5:556
 #, no-wrap
 msgid "Cancel-Subscription"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:557
+#: cupsd.conf.5:559
 msgid "Cancels a subscription."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:557
+#: cupsd.conf.5:559
 #, no-wrap
 msgid "Close-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:560
+#: cupsd.conf.5:562
 msgid "Closes a job that is waiting for more documents."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:560
+#: cupsd.conf.5:562
 #, no-wrap
 msgid "Create-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:563
+#: cupsd.conf.5:565
 msgid "Creates a new job with no documents."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:563
+#: cupsd.conf.5:565
 #, no-wrap
 msgid "Create-Job-Subscriptions"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:566
+#: cupsd.conf.5:568
 msgid "Creates a subscription for job events."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:566
+#: cupsd.conf.5:568
 #, no-wrap
 msgid "Create-Printer-Subscriptions"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:569
+#: cupsd.conf.5:571
 msgid "Creates a subscription for printer events."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:569
+#: cupsd.conf.5:571
 #, no-wrap
 msgid "Get-Job-Attributes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:572
+#: cupsd.conf.5:574
 msgid "Gets information about a job."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:572
+#: cupsd.conf.5:574
 #, no-wrap
 msgid "Get-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:575
+#: cupsd.conf.5:577
 msgid "Gets a list of jobs."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:575
+#: cupsd.conf.5:577
 #, no-wrap
 msgid "Get-Notifications"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:578
+#: cupsd.conf.5:580
 msgid "Gets a list of event notifications for a subscription."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:578
+#: cupsd.conf.5:580
 #, no-wrap
 msgid "Get-Printer-Attributes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:581
+#: cupsd.conf.5:583
 msgid "Gets information about a printer or printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:581
+#: cupsd.conf.5:583
 #, no-wrap
 msgid "Get-Subscription-Attributes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:584
+#: cupsd.conf.5:586
 msgid "Gets information about a subscription."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:584
+#: cupsd.conf.5:586
 #, no-wrap
 msgid "Get-Subscriptions"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:587
+#: cupsd.conf.5:589
 msgid "Gets a list of subscriptions."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:587
+#: cupsd.conf.5:589
 #, no-wrap
 msgid "Hold-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:590
+#: cupsd.conf.5:592
 msgid "Holds a job from printing."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:590
+#: cupsd.conf.5:592
 #, no-wrap
 msgid "Hold-New-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:593
+#: cupsd.conf.5:595
 msgid "Holds all new jobs from printing."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:593
+#: cupsd.conf.5:595
 #, no-wrap
 msgid "Pause-Printer"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:596
+#: cupsd.conf.5:598
 msgid "Stops processing of jobs by a printer or printer class."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:596
+#: cupsd.conf.5:598
 #, no-wrap
 msgid "Pause-Printer-After-Current-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:599
+#: cupsd.conf.5:601
 msgid ""
 "Stops processing of jobs by a printer or printer class after the current job "
 "is finished."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:599
+#: cupsd.conf.5:601
 #, no-wrap
 msgid "Print-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:602
+#: cupsd.conf.5:604
 msgid "Creates a new job with a single document."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:602
+#: cupsd.conf.5:604
 #, no-wrap
 msgid "Purge-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:605
+#: cupsd.conf.5:607
 msgid "Cancels one or more jobs and deletes the job history."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:605
+#: cupsd.conf.5:607
 #, no-wrap
 msgid "Release-Held-New-Jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:608
+#: cupsd.conf.5:610
 msgid "Allows previously held jobs to print."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:608
+#: cupsd.conf.5:610
 #, no-wrap
 msgid "Release-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:611
+#: cupsd.conf.5:613
 msgid "Allows a job to print."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:611
+#: cupsd.conf.5:613
 #, no-wrap
 msgid "Renew-Subscription"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:614
+#: cupsd.conf.5:616
 msgid "Renews a subscription."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:614
+#: cupsd.conf.5:616
 #, no-wrap
 msgid "Restart-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:617
+#: cupsd.conf.5:619
 msgid "Reprints a job, if possible."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:617
+#: cupsd.conf.5:619
 #, no-wrap
 msgid "Send-Document"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:620
+#: cupsd.conf.5:622
 msgid "Adds a document to a job."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:620
+#: cupsd.conf.5:622
 #, no-wrap
 msgid "Set-Job-Attributes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:623
+#: cupsd.conf.5:625
 msgid "Changes job information."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:623
+#: cupsd.conf.5:625
 #, no-wrap
 msgid "Set-Printer-Attributes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:626
+#: cupsd.conf.5:628
 msgid "Changes printer or printer class information."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:626
+#: cupsd.conf.5:628
 #, no-wrap
 msgid "Validate-Job"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:629
+#: cupsd.conf.5:631
 msgid "Validates options for a new job."
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.5:629
+#: cupsd.conf.5:631
 #, no-wrap
 msgid "LOCATION PATHS"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:632
+#: cupsd.conf.5:634
 msgid "The following paths are commonly used when configuring B<cupsd>(8):"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:632
+#: cupsd.conf.5:634
 #, no-wrap
 msgid "/"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:635
+#: cupsd.conf.5:637
 msgid "The path for all get operations (get-printers, get-jobs, etc.)"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:635
+#: cupsd.conf.5:637
 #, no-wrap
 msgid "/admin"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:638
+#: cupsd.conf.5:640
 msgid ""
 "The path for all administration operations (add-printer, delete-printer, "
 "start-printer, etc.)"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:638
+#: cupsd.conf.5:640
 #, no-wrap
 msgid "/admin/conf"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:641
+#: cupsd.conf.5:643
 msgid ""
 "The path for access to the CUPS configuration files (cupsd.conf, "
 "client.conf, etc.)"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:641
+#: cupsd.conf.5:643
 #, no-wrap
 msgid "/admin/log"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:644
+#: cupsd.conf.5:646
 msgid "The path for access to the CUPS log files (access_log, error_log, page_log)"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:644
+#: cupsd.conf.5:646
 #, no-wrap
 msgid "/classes"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:647
+#: cupsd.conf.5:649
 msgid "The path for all printer classes"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:647
+#: cupsd.conf.5:649
 #, no-wrap
 msgid "/classes/name"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:650
+#: cupsd.conf.5:652
 msgid "The resource for the named printer class"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:650
+#: cupsd.conf.5:652
 #, no-wrap
 msgid "/jobs"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:653
+#: cupsd.conf.5:655
 msgid "The path for all jobs (hold-job, release-job, etc.)"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:653
+#: cupsd.conf.5:655
 #, no-wrap
 msgid "/jobs/id"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:656
+#: cupsd.conf.5:658
 msgid "The path for the specified job"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:656
+#: cupsd.conf.5:658
 #, no-wrap
 msgid "/printers"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:659
+#: cupsd.conf.5:661
 msgid "The path for all printers"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:659
+#: cupsd.conf.5:661
 #, no-wrap
 msgid "/printers/name"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:662
+#: cupsd.conf.5:664
 msgid "The path for the named printer"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:662
+#: cupsd.conf.5:664
 #, no-wrap
 msgid "/printers/name.png"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:665
+#: cupsd.conf.5:667
 msgid "The icon file path for the named printer"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:665
+#: cupsd.conf.5:667
 #, no-wrap
 msgid "/printers/name.ppd"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:668
+#: cupsd.conf.5:670
 msgid "The PPD file path for the named printer"
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.5:668
+#: cupsd.conf.5:670
 #, no-wrap
 msgid "DIRECTIVES VALID WITHIN LOCATION AND LIMIT SECTIONS"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:670
+#: cupsd.conf.5:672
 msgid ""
 "The following directives may be placed inside Location and Limit sections in "
 "the B<cupsd.conf> file:"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:670
+#: cupsd.conf.5:672
 #, no-wrap
 msgid "B<Allow all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:672
+#: cupsd.conf.5:674
 #, no-wrap
 msgid "B<Allow none>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:674
+#: cupsd.conf.5:676
 #, no-wrap
 msgid "B<Allow >I<host.domain.com>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:676
+#: cupsd.conf.5:678
 #, no-wrap
 msgid "B<Allow *.>I<domain.com>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:678
+#: cupsd.conf.5:680
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:680
+#: cupsd.conf.5:682
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>B</>I<netmask>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:682
+#: cupsd.conf.5:684
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>B</>I<mm>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:684
+#: cupsd.conf.5:686
 #, no-wrap
 msgid "B<Allow [>I<ipv6-address>B<]>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:686
+#: cupsd.conf.5:688
 #, no-wrap
 msgid "B<Allow [>I<ipv6-address>B<]/>I<mm>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:688
+#: cupsd.conf.5:690
 #, no-wrap
 msgid "B<Allow @IF(>I<name>B<)>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:690
+#: cupsd.conf.5:692
 #, no-wrap
 msgid "B<Allow @LOCAL>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:696
+#: cupsd.conf.5:698
 msgid ""
 "Allows access from the named hosts, domains, addresses, or interfaces.  The "
 "@IF(name) form uses the current subnets configured for the named interface.  "
@@ -4264,104 +4268,104 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:696
+#: cupsd.conf.5:698
 #, no-wrap
 msgid "B<AuthType None>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:698
+#: cupsd.conf.5:700
 #, no-wrap
 msgid "B<AuthType Basic>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:700
+#: cupsd.conf.5:702
 #, no-wrap
 msgid "B<AuthType Default>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:702
+#: cupsd.conf.5:704
 #, no-wrap
 msgid "B<AuthType Negotiate>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:706
+#: cupsd.conf.5:708
 msgid ""
 "Specifies the type of authentication required.  The value \"Default\" "
 "corresponds to the DefaultAuthType value."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:706
+#: cupsd.conf.5:708
 #, no-wrap
 msgid "B<Deny all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:708
+#: cupsd.conf.5:710
 #, no-wrap
 msgid "B<Deny none>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:710
+#: cupsd.conf.5:712
 #, no-wrap
 msgid "B<Deny >I<host.domain.com>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:712
+#: cupsd.conf.5:714
 #, no-wrap
 msgid "B<Deny *.>I<domain.com>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:714
+#: cupsd.conf.5:716
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:716
+#: cupsd.conf.5:718
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>B</>I<netmask>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:718
+#: cupsd.conf.5:720
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>B</>I<mm>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:720
+#: cupsd.conf.5:722
 #, no-wrap
 msgid "B<Deny [>I<ipv6-address>B<]>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:722
+#: cupsd.conf.5:724
 #, no-wrap
 msgid "B<Deny [>I<ipv6-address>B<]/>I<mm>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:724
+#: cupsd.conf.5:726
 #, no-wrap
 msgid "B<Deny @IF(>I<name>B<)>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:726
+#: cupsd.conf.5:728
 #, no-wrap
 msgid "B<Deny @LOCAL>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:732
+#: cupsd.conf.5:734
 msgid ""
 "Denies access from the named hosts, domains, addresses, or interfaces.  The "
 "@IF(name) form uses the current subnets configured for the named interface.  "
@@ -4372,20 +4376,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:740
+#: cupsd.conf.5:742
 msgid ""
 "Specifies the level of encryption that is required for a particular "
 "location.  The default value is \"IfRequested\"."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:740
+#: cupsd.conf.5:742
 #, no-wrap
 msgid "B<Order allow,deny>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:743
+#: cupsd.conf.5:745
 msgid ""
 "Specifies that access is denied by default. Allow lines are then processed "
 "followed by Deny lines to determine whether a client may access a particular "
@@ -4393,13 +4397,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:743
+#: cupsd.conf.5:745
 #, no-wrap
 msgid "B<Order deny,allow>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:746
+#: cupsd.conf.5:748
 msgid ""
 "Specifies that access is allowed by default. Deny lines are then processed "
 "followed by Allow lines to determine whether a client may access a "
@@ -4407,26 +4411,26 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:746
+#: cupsd.conf.5:748
 #, no-wrap
 msgid "B<Require group >I<group-name >[ I<group-name >... ]"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:749
+#: cupsd.conf.5:751
 msgid ""
 "Specifies that an authenticated user must be a member of one of the named "
 "groups."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:749
+#: cupsd.conf.5:751
 #, no-wrap
 msgid "B<Require user {>I<user-name>|B<@>I<group-name>} ..."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:757
+#: cupsd.conf.5:759
 msgid ""
 "Specifies that an authenticated user must match one of the named users or be "
 "a member of one of the named groups.  The group name \"@SYSTEM\" corresponds "
@@ -4438,37 +4442,37 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:757
+#: cupsd.conf.5:759
 #, no-wrap
 msgid "B<Require valid-user>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:760
+#: cupsd.conf.5:762
 msgid "Specifies that any authenticated user is acceptable."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:760
+#: cupsd.conf.5:762
 #, no-wrap
 msgid "B<Satisfy all>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:763
+#: cupsd.conf.5:765
 msgid ""
 "Specifies that all Allow, AuthType, Deny, Order, and Require conditions must "
 "be satisfied to allow access."
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:763
+#: cupsd.conf.5:765
 #, no-wrap
 msgid "B<Satisfy any>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:767
+#: cupsd.conf.5:769
 msgid ""
 "Specifies that any a client may access a resource if either the "
 "authentication (AuthType/Require) or address (Allow/Deny/Order) conditions "
@@ -4477,38 +4481,38 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.5:767
+#: cupsd.conf.5:769
 #, no-wrap
 msgid "DIRECTIVES VALID WITHIN POLICY SECTIONS"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:769
+#: cupsd.conf.5:771
 msgid ""
 "The following directives may be placed inside Policy sections in the "
 "B<cupsd.conf> file:"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:769
+#: cupsd.conf.5:771
 #, no-wrap
 msgid "B<JobPrivateAccess all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:771
+#: cupsd.conf.5:773
 #, no-wrap
 msgid "B<JobPrivateAccess default>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:773
+#: cupsd.conf.5:775
 #, no-wrap
 msgid "B<JobPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:782
+#: cupsd.conf.5:784
 msgid ""
 "Specifies an access list for a job's private values.  The \"default\" access "
 "list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's "
@@ -4518,31 +4522,31 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:782
+#: cupsd.conf.5:784
 #, no-wrap
 msgid "B<JobPrivateValues all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:784
+#: cupsd.conf.5:786
 #, no-wrap
 msgid "B<JobPrivateValues default>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:786
+#: cupsd.conf.5:788
 #, no-wrap
 msgid "B<JobPrivateValues none>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:788
+#: cupsd.conf.5:790
 #, no-wrap
 msgid "B<JobPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:792
+#: cupsd.conf.5:794
 msgid ""
 "Specifies the list of job values to make private.  The \"default\" values "
 "are \"job-name\", \"job-originating-host-name\", "
@@ -4550,19 +4554,19 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:792
+#: cupsd.conf.5:794
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:794
+#: cupsd.conf.5:796
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess default>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:796
+#: cupsd.conf.5:798
 #, no-wrap
 msgid ""
 "B<SubscriptionPrivateAccess "
@@ -4570,7 +4574,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:805
+#: cupsd.conf.5:807
 msgid ""
 "Specifies an access list for a subscription's private values.  The "
 "\"default\" access list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the "
@@ -4580,31 +4584,31 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:805
+#: cupsd.conf.5:807
 #, no-wrap
 msgid "B<SubscriptionPrivateValues all>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:807
+#: cupsd.conf.5:809
 #, no-wrap
 msgid "B<SubscriptionPrivateValues default>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:809
+#: cupsd.conf.5:811
 #, no-wrap
 msgid "B<SubscriptionPrivateValues none>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:811
+#: cupsd.conf.5:813
 #, no-wrap
 msgid "B<SubscriptionPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:815
+#: cupsd.conf.5:817
 msgid ""
 "Specifies the list of subscription values to make private.  The \"default\" "
 "values are \"notify-events\", \"notify-pull-method\", "
@@ -4613,28 +4617,28 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: cupsd.conf.5:815 cups-files.conf.5:236
+#: cupsd.conf.5:817 cups-files.conf.5:236
 #, no-wrap
 msgid "DEPRECATED DIRECTIVES"
 msgstr ""
 
 #. #Classification
 #. type: Plain text
-#: cupsd.conf.5:818
+#: cupsd.conf.5:820
 msgid ""
 "The following directives are deprecated and will be removed in a future "
 "release of CUPS:"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:818
+#: cupsd.conf.5:820
 #, no-wrap
 msgid "B<Classification >I<banner>"
 msgstr ""
 
 #. #ClassifyOverride
 #. type: Plain text
-#: cupsd.conf.5:825
+#: cupsd.conf.5:827
 msgid ""
 "Specifies the security classification of the server.  Any valid banner name "
 "can be used, including \"classified\", \"confidential\", \"secret\", "
@@ -4643,20 +4647,20 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:825
+#: cupsd.conf.5:827
 #, no-wrap
 msgid "B<ClassifyOverride Yes>"
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:827
+#: cupsd.conf.5:829
 #, no-wrap
 msgid "B<ClassifyOverride No>"
 msgstr ""
 
 #. #PageLogFormat
 #. type: Plain text
-#: cupsd.conf.5:833
+#: cupsd.conf.5:835
 msgid ""
 "Specifies whether users may override the classification (cover page) of "
 "individual print jobs using the \"job-sheets\" option.  The default is "
@@ -4664,13 +4668,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:833
+#: cupsd.conf.5:835
 #, no-wrap
 msgid "B<PageLogFormat >I<format-string>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:838
+#: cupsd.conf.5:840
 msgid ""
 "Specifies the format of PageLog lines.  Sequences beginning with percent (%) "
 "characters are replaced with the corresponding information, while all other "
@@ -4679,7 +4683,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:848
+#: cupsd.conf.5:850
 #, no-wrap
 msgid ""
 "    \"%%\" inserts a single percent character.\n"
@@ -4694,7 +4698,7 @@ msgstr ""
 
 #. #RIPCache
 #. type: Plain text
-#: cupsd.conf.5:854
+#: cupsd.conf.5:856
 msgid ""
 "The default is the empty string, which disables page logging.  The string "
 "\"%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} "
@@ -4705,20 +4709,20 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: cupsd.conf.5:854
+#: cupsd.conf.5:856
 #, no-wrap
 msgid "B<RIPCache >I<size>"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:858
+#: cupsd.conf.5:860
 msgid ""
 "Specifies the maximum amount of memory to use when converting documents into "
 "bitmaps for a printer.  The default is \"128m\"."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:862
+#: cupsd.conf.5:864
 msgid ""
 "File, directory, and user configuration directives that used to be allowed "
 "in the B<cupsd.conf> file are now stored in the B<cups-files.conf>(5)  file "
@@ -4726,7 +4730,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:869
+#: cupsd.conf.5:871
 msgid ""
 "The scheduler MUST be restarted manually after making changes to the "
 "B<cupsd.conf> file.  On Linux this is typically done using the "
@@ -4735,26 +4739,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:873
+#: cupsd.conf.5:875
 msgid ""
 "The @LOCAL macro name can be confusing since the system running B<cupsd> "
 "often belongs to a different set of subnets from its clients."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:875
+#: cupsd.conf.5:877
 msgid ""
 "The B<cupsd.conf> file format is based on the Apache HTTP Server "
 "configuration file format."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:877
+#: cupsd.conf.5:879
 msgid "Log everything with a maximum log file size of 32 megabytes:"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:882
+#: cupsd.conf.5:884
 #, no-wrap
 msgid ""
 "    AccessLogLevel all\n"
@@ -4763,12 +4767,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:885
+#: cupsd.conf.5:887
 msgid "Require authentication for accesses from outside the 10. network:"
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:894
+#: cupsd.conf.5:896
 #, no-wrap
 msgid ""
 "    E<lt>Location /E<gt>\n"
@@ -4781,13 +4785,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:904
+#: cupsd.conf.5:906
 msgid ""
 "B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<mime.convs>(5), "
 "B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), CUPS Online "
 "Help (http://localhost:631/help)"
 msgstr ""
 
+#. type: Plain text
+#: cupsd.conf.5:908 cups-files.conf.5:298
+msgid "Copyright \\[co] 2020 by Michael R Sweet"
+msgstr ""
+
 #. type: TH
 #: cupsd-helper.8:10
 #, no-wrap
@@ -6342,13 +6351,6 @@ msgid ""
 "B<subscriptions.conf>(5), CUPS Online Help (http://localhost:631/help)"
 msgstr ""
 
-#. type: Plain text
-#: cups-files.conf.5:298 cups-lpd.8:118
-msgid ""
-"Copyright \\[co] 2020 by Michael R Sweet Copyright \\[co] 2007-2019 by Apple "
-"Inc."
-msgstr ""
-
 #. type: TH
 #: cupsfilter.8:9
 #, no-wrap
@@ -6792,6 +6794,13 @@ msgid ""
 "Online Help (http://localhost:631/help), RFC 2569"
 msgstr ""
 
+#. type: Plain text
+#: cups-lpd.8:118
+msgid ""
+"Copyright \\[co] 2020 by Michael R Sweet Copyright \\[co] 2007-2019 by Apple "
+"Inc."
+msgstr ""
+
 #. type: TH
 #: cups-snmp.8:9
 #, no-wrap
diff --git a/debian/manpage-po4a/po/de.po b/debian/manpage-po4a/po/de.po
index 7f58827d3..b02e703a9 100644
--- a/debian/manpage-po4a/po/de.po
+++ b/debian/manpage-po4a/po/de.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cups man pages 2.3.3op1-2\n"
-"POT-Creation-Date: 2020-11-27 16:31+0100\n"
+"POT-Creation-Date: 2021-02-03 18:08+0100\n"
 "PO-Revision-Date: 2020-12-02 19:50+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -29,7 +29,7 @@ msgstr "Backend"
 
 #. type: TH
 #: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
-#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:11
 #: cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:11
 #: cupsfilter.8:9 cups-lpd.8:11 cups-snmp.8:9 cups-snmp.conf.5:10
 #: cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ipptool.1:9
@@ -57,7 +57,7 @@ msgstr "26. April 2019"
 
 #. type: TH
 #: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
-#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:11
 #: cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:11
 #: cupsfilter.8:9 cups-lpd.8:11 cups-snmp.8:9 cups-snmp.conf.5:10
 #: cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ippfind.1:9
@@ -72,7 +72,7 @@ msgstr "Apple Inc."
 
 #. type: SH
 #: backend.7:11 cancel.1:11 classes.conf.5:11 client.conf.5:11 cups.1:11
-#: cupsaccept.8:11 cups-config.1:11 cupsctl.8:11 cupsd.8:11 cupsd.conf.5:11
+#: cupsaccept.8:11 cups-config.1:11 cupsctl.8:11 cupsd.8:11 cupsd.conf.5:12
 #: cupsd-helper.8:11 cupsd-logs.5:11 cupsenable.8:11 cups-files.conf.5:12
 #: cupsfilter.8:10 cups-lpd.8:12 cups-snmp.8:10 cups-snmp.conf.5:11
 #: cupstestppd.1:11 filter.7:11 ippevepcl.7:10 ippeveprinter.1:10 ippfind.1:10
@@ -181,7 +181,7 @@ msgstr ""
 
 #. type: SH
 #: backend.7:49 cancel.1:37 classes.conf.5:13 client.conf.5:13 cups.1:13
-#: cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:13
+#: cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:14
 #: cupsd-helper.8:46 cupsd-logs.5:13 cupsenable.8:46 cups-files.conf.5:14
 #: cupsfilter.8:54 cups-lpd.8:24 cups-snmp.8:23 cups-snmp.conf.5:13
 #: cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:84 ippfind.1:32
@@ -630,7 +630,7 @@ msgstr "I</etc/cups/cups-files.conf>"
 
 #. type: SH
 #: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:126
-#: cups.1:122 cupsd.conf.5:858 cupsd-helper.8:77 cups-files.conf.5:279
+#: cups.1:122 cupsd.conf.5:860 cupsd-helper.8:77 cups-files.conf.5:279
 #: cupsfilter.8:117 cups-lpd.8:61 cups-snmp.8:44 cups-snmp.conf.5:58
 #: cupstestppd.1:138 filter.7:201 lpadmin.8:203 lpc.8:40 lpinfo.8:117 lpr.1:151
 #: mime.convs.5:50 ppdc.1:90 ppdcfile.5:149 ppdhtml.1:35 ppdi.1:42
@@ -691,7 +691,7 @@ msgstr ""
 
 #. type: SH
 #: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:138 cups.1:126
-#: cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:895
+#: cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:897
 #: cupsd-helper.8:81 cupsd-logs.5:216 cupsenable.8:88 cups-files.conf.5:286
 #: cupsfilter.8:131 cups-lpd.8:108 cups-snmp.8:49 cups-snmp.conf.5:62
 #: cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:268
@@ -720,7 +720,7 @@ msgstr "CUPS-Online-Hilfe (http://localhost:631/help)"
 
 #. type: SH
 #: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:142 cups.1:142
-#: cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:904
+#: cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:906
 #: cupsd-helper.8:89 cupsd-logs.5:221 cupsenable.8:96 cups-files.conf.5:296
 #: cupsfilter.8:138 cups-lpd.8:116 cups-snmp.8:55 cups-snmp.conf.5:65
 #: cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:272
@@ -735,14 +735,15 @@ msgstr "COPYRIGHT"
 
 #. type: Plain text
 #: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:143 cups.1:143
-#: cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:905
-#: cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cupsfilter.8:139
-#: cups-snmp.8:56 cups-snmp.conf.5:66 cupstestppd.1:147 filter.7:221
-#: ippeveprinter.1:273 ipptool.1:252 ipptoolfile.5:655 lp.1:229 lpadmin.8:231
-#: lpc.8:58 lpinfo.8:125 lpmove.8:74 lpoptions.1:118 lpq.1:64 lpr.1:181
-#: lprm.1:82 lpstat.1:148 mailto.conf.5:44 mime.convs.5:62 mime.types.5:108
-#: notifier.7:36 ppdc.1:102 ppdcfile.5:161 ppdhtml.1:47 ppdi.1:54 ppdmerge.1:50
-#: ppdpo.1:54 printers.conf.5:28 subscriptions.conf.5:31
+#: cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:909
+#: cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cups-files.conf.5:299
+#: cupsfilter.8:139 cups-snmp.8:56 cups-snmp.conf.5:66 cupstestppd.1:147
+#: filter.7:221 ippeveprinter.1:273 ipptool.1:252 ipptoolfile.5:655 lp.1:229
+#: lpadmin.8:231 lpc.8:58 lpinfo.8:125 lpmove.8:74 lpoptions.1:118 lpq.1:64
+#: lpr.1:181 lprm.1:82 lpstat.1:148 mailto.conf.5:44 mime.convs.5:62
+#: mime.types.5:108 notifier.7:36 ppdc.1:102 ppdcfile.5:161 ppdhtml.1:47
+#: ppdi.1:54 ppdmerge.1:50 ppdpo.1:54 printers.conf.5:28
+#: subscriptions.conf.5:31
 msgid "Copyright \\[co] 2007-2019 by Apple Inc."
 msgstr "Copyright \\[co] 2007-2019 by Apple Inc."
 
@@ -780,7 +781,7 @@ msgstr ""
 
 #. type: SH
 #: cancel.1:40 cupsaccept.8:50 cups-config.1:52 cupsctl.8:40 cupsd.8:37
-#: cupsd.conf.5:485 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:33
+#: cupsd.conf.5:487 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:33
 #: cupstestppd.1:58 filter.7:60 ippeveprinter.1:87 ippfind.1:191 ipptool.1:88
 #: lp.1:94 lpadmin.8:73 lpinfo.8:63 lpmove.8:39 lpoptions.1:68 lpq.1:36
 #: lpr.1:64 lprm.1:36 lpstat.1:68 ppdc.1:48 ppdhtml.1:25 ppdi.1:30
@@ -871,7 +872,7 @@ msgid "Deletes job data files in addition to canceling."
 msgstr "Löscht Auftragsdatendateien zusätzlich zum Abbruch."
 
 #. type: SH
-#: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:873
+#: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:875
 #: cupsenable.8:77 cups-lpd.8:47 cups-snmp.8:47 filter.7:199
 #: ippeveprinter.1:207 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97
 #: lpoptions.1:108 lprm.1:52 lpstat.1:133
@@ -891,7 +892,7 @@ msgstr ""
 "sind Drucker- und Klassennamen I<unabhängig> von der Groß-/Kleinschreibung."
 
 #. type: SH
-#: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:875
+#: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:877
 #: cupstestppd.1:125 ippeveprinter.1:252 ippfind.1:242 ipptool.1:233 lp.1:201
 #: lpinfo.8:99 lpmove.8:50 lpr.1:153 lprm.1:56 mime.convs.5:43 mime.types.5:89
 #, no-wrap
@@ -1127,19 +1128,19 @@ msgstr ""
 "die Unterstützung für den ursprünglichen MD5-Hash-Algorithmus."
 
 #. type: TP
-#: client.conf.5:45 cupsd.conf.5:732
+#: client.conf.5:45 cupsd.conf.5:734
 #, no-wrap
 msgid "B<Encryption IfRequested>"
 msgstr "B<Encryption IfRequested>"
 
 #. type: TP
-#: client.conf.5:47 cupsd.conf.5:734
+#: client.conf.5:47 cupsd.conf.5:736
 #, no-wrap
 msgid "B<Encryption Never>"
 msgstr "B<Encryption Never>"
 
 #. type: TP
-#: client.conf.5:49 cupsd.conf.5:736
+#: client.conf.5:49 cupsd.conf.5:738
 #, no-wrap
 msgid "B<Encryption Required>"
 msgstr "B<Encryption Required>"
@@ -1151,7 +1152,7 @@ msgid "Specifies the level of encryption that should be used."
 msgstr "Legt die zu verwendende Verschlüsselungsstufe fest."
 
 #. type: TP
-#: client.conf.5:53 cupsd.conf.5:165
+#: client.conf.5:53 cupsd.conf.5:166
 #, no-wrap
 msgid "B<GSSServiceName >I<name>"
 msgstr "B<GSSServiceName >I<Name>"
@@ -1208,20 +1209,20 @@ msgstr ""
 "verwandt werden sollen, auf dem CUPS 1.3.12 oder älter läuft, fest."
 
 #. type: TP
-#: client.conf.5:68 cupsd.conf.5:437
+#: client.conf.5:68 cupsd.conf.5:439
 #, no-wrap
 msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>] [I<MaxTLS1.0>] [I<MaxTLS1.1>] [I<MaxTLS1.2>] [I<MaxTLS1.3>] [I<MinTLS1.0>] [I<MinTLS1.1>] [I<MinTLS1.2>] [I<MinTLS1.3>]"
 msgstr "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>] [I<MaxTLS1.0>] [I<MaxTLS1.1>] [I<MaxTLS1.2>] [I<MaxTLS1.3>] [I<MinTLS1.0>] [I<MinTLS1.1>] [I<MinTLS1.2>] [I<MinTLS1.3>]"
 
 #. type: TP
-#: client.conf.5:70 cupsd.conf.5:439
+#: client.conf.5:70 cupsd.conf.5:441
 #, no-wrap
 msgid "B<SSLOptions None>"
 msgstr "B<SSLOptions None>"
 
 #. #SSLPort
 #. type: Plain text
-#: client.conf.5:85 cupsd.conf.5:454
+#: client.conf.5:85 cupsd.conf.5:456
 msgid ""
 "Sets encryption options (only in /etc/cups/client.conf).  By default, CUPS "
 "only supports encryption using TLS v1.0 or higher using known secure cipher "
@@ -2662,24 +2663,25 @@ msgstr ""
 "conf>(5), B<systemd>(8), CUPS-Online-Hilfe (http://localhost:631/help)"
 
 #. type: TH
-#: cupsd.conf.5:10
+#: cupsd.conf.5:11
 #, no-wrap
 msgid "cupsd.conf"
 msgstr "cupsd.conf"
 
 #. type: TH
-#: cupsd.conf.5:10
-#, no-wrap
-msgid "16 July 2019"
-msgstr "16. Juli 2019"
+#: cupsd.conf.5:11
+#, fuzzy, no-wrap
+#| msgid "14 November 2020"
+msgid "28 November 2020"
+msgstr "14. November 2020"
 
 #. type: Plain text
-#: cupsd.conf.5:13
+#: cupsd.conf.5:14
 msgid "cupsd.conf - server configuration file for cups"
 msgstr "cupsd.conf - Server-Konfigurationsdatei für CUPS"
 
 #. type: Plain text
-#: cupsd.conf.5:25
+#: cupsd.conf.5:26
 msgid ""
 "The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
 "normally located in the I</etc/cups> directory.  Each line in the file can "
@@ -2697,39 +2699,39 @@ msgstr ""
 "nicht relevant. Kommentarzeilen beginnen mit dem Zeichen »#«. "
 
 #. type: SS
-#: cupsd.conf.5:25 ipptoolfile.5:83
+#: cupsd.conf.5:26 ipptoolfile.5:83
 #, no-wrap
 msgid "TOP-LEVEL DIRECTIVES"
 msgstr "OBERSTE DIREKTIVEN"
 
 #. #AccessLogLevel
 #. type: Plain text
-#: cupsd.conf.5:29
+#: cupsd.conf.5:30
 msgid "The following top-level directives are understood by B<cupsd>(8):"
 msgstr ""
 "Die nachfolgenden obersten Direktiven werden von B<cupsd>(8) verstanden:"
 
 #. type: TP
-#: cupsd.conf.5:29
+#: cupsd.conf.5:30
 #, no-wrap
 msgid "B<AccessLogLevel config>"
 msgstr "B<AccessLogLevel config>"
 
 #. type: TP
-#: cupsd.conf.5:31
+#: cupsd.conf.5:32
 #, no-wrap
 msgid "B<AccessLogLevel actions>"
 msgstr "B<AccessLogLevel actions>"
 
 #. type: TP
-#: cupsd.conf.5:33
+#: cupsd.conf.5:34
 #, no-wrap
 msgid "B<AccessLogLevel all>"
 msgstr "B<AccessLogLevel all>"
 
 #. #AutoPurgeJobs
 #. type: Plain text
-#: cupsd.conf.5:41
+#: cupsd.conf.5:42
 msgid ""
 "Specifies the logging level for the AccessLog file.  The \"config\" level "
 "logs when printers and classes are added, deleted, or modified and when "
@@ -2747,20 +2749,20 @@ msgstr ""
 "Anfragen. Die Vorgabestufe ist »actions«."
 
 #. type: TP
-#: cupsd.conf.5:41
+#: cupsd.conf.5:42
 #, no-wrap
 msgid "B<AutoPurgeJobs Yes>"
 msgstr "B<AutoPurgeJobs Yes>"
 
 #. type: TP
-#: cupsd.conf.5:43
+#: cupsd.conf.5:44
 #, no-wrap
 msgid "B<AutoPurgeJobs No>"
 msgstr "B<AutoPurgeJobs No>"
 
 #. #BrowseDNSSDSubTypes
 #. type: Plain text
-#: cupsd.conf.5:49
+#: cupsd.conf.5:50
 msgid ""
 "Specifies whether to purge job history data automatically when it is no "
 "longer required for quotas.  The default is \"No\"."
@@ -2770,14 +2772,14 @@ msgstr ""
 "Die Vorgabe ist »No«."
 
 #. type: TP
-#: cupsd.conf.5:49
+#: cupsd.conf.5:50
 #, no-wrap
 msgid "B<BrowseDNSSDSubTypes>I<_subtype[,...]>"
 msgstr "B<BrowseDNSSDSubTypes>I<_Untertyp[,…]>"
 
 #. #BrowseLocalProtocols
 #. type: Plain text
-#: cupsd.conf.5:55
+#: cupsd.conf.5:56
 msgid ""
 "Specifies a list of Bonjour sub-types to advertise for each shared printer.  "
 "For example, \"BrowseDNSSDSubTypes _cups,_print\" will tell network clients "
@@ -2793,26 +2795,26 @@ msgstr ""
 "Systemen notwendig ist."
 
 #. type: TP
-#: cupsd.conf.5:55
+#: cupsd.conf.5:56
 #, no-wrap
 msgid "B<BrowseLocalProtocols all>"
 msgstr "B<BrowseLocalProtocols all>"
 
 #. type: TP
-#: cupsd.conf.5:57
+#: cupsd.conf.5:58
 #, no-wrap
 msgid "B<BrowseLocalProtocols dnssd>"
 msgstr "B<BrowseLocalProtocols dnssd>"
 
 #. type: TP
-#: cupsd.conf.5:59
+#: cupsd.conf.5:60
 #, no-wrap
 msgid "B<BrowseLocalProtocols none>"
 msgstr "B<BrowseLocalProtocols none>"
 
 #. #BrowseWebIF
 #. type: Plain text
-#: cupsd.conf.5:64
+#: cupsd.conf.5:65
 msgid ""
 "Specifies which protocols to use for local printer sharing.  The default is "
 "\"dnssd\" on systems that support Bonjour and \"none\" otherwise."
@@ -2822,20 +2824,20 @@ msgstr ""
 "andernfalls »none«."
 
 #. type: TP
-#: cupsd.conf.5:64
+#: cupsd.conf.5:65
 #, no-wrap
 msgid "B<BrowseWebIF Yes>"
 msgstr "B<BrowseWebIF Yes>"
 
 #. type: TP
-#: cupsd.conf.5:66
+#: cupsd.conf.5:67
 #, no-wrap
 msgid "B<BrowseWebIF No>"
 msgstr "B<BrowseWebIF No>"
 
 #. #Browsing
 #. type: Plain text
-#: cupsd.conf.5:72
+#: cupsd.conf.5:73
 msgid ""
 "Specifies whether the CUPS web interface is advertised.  The default is \"No"
 "\"."
@@ -2844,20 +2846,20 @@ msgstr ""
 "ist »No«."
 
 #. type: TP
-#: cupsd.conf.5:72
+#: cupsd.conf.5:73
 #, no-wrap
 msgid "B<Browsing Yes>"
 msgstr "B<Browsing Yes>"
 
 #. type: TP
-#: cupsd.conf.5:74
+#: cupsd.conf.5:75
 #, no-wrap
 msgid "B<Browsing No>"
 msgstr "B<Browsing No>"
 
 #. #DefaultAuthType
 #. type: Plain text
-#: cupsd.conf.5:80
+#: cupsd.conf.5:81
 msgid ""
 "Specifies whether shared printers are advertised.  The default is \"No\"."
 msgstr ""
@@ -2865,20 +2867,20 @@ msgstr ""
 "»No«."
 
 #. type: TP
-#: cupsd.conf.5:80
+#: cupsd.conf.5:81
 #, no-wrap
 msgid "B<DefaultAuthType Basic>"
 msgstr "B<DefaultAuthType Basic>"
 
 #. type: TP
-#: cupsd.conf.5:82
+#: cupsd.conf.5:83
 #, no-wrap
 msgid "B<DefaultAuthType Negotiate>"
 msgstr "B<DefaultAuthType Negotiate>"
 
 #. #DefaultEncryption
 #. type: Plain text
-#: cupsd.conf.5:88
+#: cupsd.conf.5:89
 msgid ""
 "Specifies the default type of authentication to use.  The default is \"Basic"
 "\"."
@@ -2887,26 +2889,26 @@ msgstr ""
 "Vorgabe ist »Basic«."
 
 #. type: TP
-#: cupsd.conf.5:88
+#: cupsd.conf.5:89
 #, no-wrap
 msgid "B<DefaultEncryption Never>"
 msgstr "B<DefaultEncryption Never>"
 
 #. type: TP
-#: cupsd.conf.5:90
+#: cupsd.conf.5:91
 #, no-wrap
 msgid "B<DefaultEncryption IfRequested>"
 msgstr "B<DefaultEncryption IfRequested>"
 
 #. type: TP
-#: cupsd.conf.5:92
+#: cupsd.conf.5:93
 #, no-wrap
 msgid "B<DefaultEncryption Required>"
 msgstr "B<DefaultEncryption Required>"
 
 #. #DefaultLanguage
 #. type: Plain text
-#: cupsd.conf.5:97
+#: cupsd.conf.5:98
 msgid ""
 "Specifies whether encryption will be used for authenticated requests.  The "
 "default is \"Required\"."
@@ -2915,14 +2917,14 @@ msgstr ""
 "soll. Die Vorgabe ist »Required«."
 
 #. type: TP
-#: cupsd.conf.5:97
+#: cupsd.conf.5:98
 #, no-wrap
 msgid "B<DefaultLanguage >I<locale>"
 msgstr "B<DefaultLanguage >I<Standorteinstellung>"
 
 #. #DefaultPaperSize
 #. type: Plain text
-#: cupsd.conf.5:102
+#: cupsd.conf.5:103
 msgid ""
 "Specifies the default language to use for text and web content.  The default "
 "is \"en\"."
@@ -2931,26 +2933,26 @@ msgstr ""
 "fest. Die Vorgabe ist »en«."
 
 #. type: TP
-#: cupsd.conf.5:102
+#: cupsd.conf.5:103
 #, no-wrap
 msgid "B<DefaultPaperSize Auto>"
 msgstr "B<DefaultPaperSize Auto>"
 
 #. type: TP
-#: cupsd.conf.5:104
+#: cupsd.conf.5:105
 #, no-wrap
 msgid "B<DefaultPaperSize None>"
 msgstr "B<DefaultPaperSize None>"
 
 #. type: TP
-#: cupsd.conf.5:106
+#: cupsd.conf.5:107
 #, no-wrap
 msgid "B<DefaultPaperSize >I<sizename>"
 msgstr "B<DefaultPaperSize >I<Größenname>"
 
 #. #DefaultPolicy
 #. type: Plain text
-#: cupsd.conf.5:112
+#: cupsd.conf.5:113
 msgid ""
 "Specifies the default paper size for new print queues. \"Auto\" uses a "
 "locale-specific default, while \"None\" specifies there is no default paper "
@@ -2963,14 +2965,14 @@ msgstr ""
 "»Letter« oder »A4«. Die Vorgabe ist »Auto«."
 
 #. type: TP
-#: cupsd.conf.5:112
+#: cupsd.conf.5:113
 #, no-wrap
 msgid "B<DefaultPolicy >I<policy-name>"
 msgstr "B<DefaultPolicy >I<Richtlinienname>"
 
 #. #DefaultShared
 #. type: Plain text
-#: cupsd.conf.5:117
+#: cupsd.conf.5:118
 msgid ""
 "Specifies the default access policy to use.  The default access policy is "
 "\"default\"."
@@ -2979,20 +2981,20 @@ msgstr ""
 "Standardzugriffsrichtlinie ist »default«."
 
 #. type: TP
-#: cupsd.conf.5:117
+#: cupsd.conf.5:118
 #, no-wrap
 msgid "B<DefaultShared Yes>"
 msgstr "B<DefaultShared Yes>"
 
 #. type: TP
-#: cupsd.conf.5:119
+#: cupsd.conf.5:120
 #, no-wrap
 msgid "B<DefaultShared No>"
 msgstr "B<DefaultShared No>"
 
 #. #DirtyCleanInterval
 #. type: Plain text
-#: cupsd.conf.5:124
+#: cupsd.conf.5:125
 msgid ""
 "Specifies whether local printers are shared by default.  The default is \"Yes"
 "\"."
@@ -3001,14 +3003,14 @@ msgstr ""
 "»Yes«."
 
 #. type: TP
-#: cupsd.conf.5:124
+#: cupsd.conf.5:125
 #, no-wrap
 msgid "B<DirtyCleanInterval >I<seconds>"
 msgstr "B<DirtyCleanInterval >I<Sekunden>"
 
 #. #DNSSDHostName
 #. type: Plain text
-#: cupsd.conf.5:130
+#: cupsd.conf.5:131
 msgid ""
 "Specifies the delay for updating of configuration and state files.  A value "
 "of 0 causes the update to happen as soon as possible, typically within a few "
@@ -3020,14 +3022,14 @@ msgstr ""
 "Millisekunden. Die Vorgabe ist »30«."
 
 #. type: TP
-#: cupsd.conf.5:130
+#: cupsd.conf.5:131
 #, no-wrap
 msgid "B<DNSSDHostName>I<hostname.example.com>"
 msgstr "B<DNSSDHostName>I<Rechnername.example.com>"
 
 #. #ErrorPolicy
 #. type: Plain text
-#: cupsd.conf.5:135
+#: cupsd.conf.5:136
 msgid ""
 "Specifies the fully-qualified domain name for the server that is used for "
 "Bonjour sharing.  The default is typically the server's \".local\" hostname."
@@ -3037,13 +3039,13 @@ msgstr ""
 "typischerweise der ».local«-Rechnername des Servers."
 
 #. type: TP
-#: cupsd.conf.5:135
+#: cupsd.conf.5:136
 #, no-wrap
 msgid "B<ErrorPolicy abort-job>"
 msgstr "B<ErrorPolicy abort-job>"
 
 #. type: Plain text
-#: cupsd.conf.5:138
+#: cupsd.conf.5:139
 msgid ""
 "Specifies that a failed print job should be aborted (discarded) unless "
 "otherwise specified for the printer."
@@ -3052,13 +3054,13 @@ msgstr ""
 "werden soll, es sei denn, es wurde anders für den Drucker festgelegt."
 
 #. type: TP
-#: cupsd.conf.5:138
+#: cupsd.conf.5:139
 #, no-wrap
 msgid "B<ErrorPolicy retry-current-job>"
 msgstr "B<ErrorPolicy retry-current-job>"
 
 #. type: Plain text
-#: cupsd.conf.5:141
+#: cupsd.conf.5:142
 msgid ""
 "Specifies that a failed print job should be retried immediately unless "
 "otherwise specified for the printer."
@@ -3067,13 +3069,13 @@ msgstr ""
 "soll, es sei denn, es wurde anders für den Drucker festgelegt."
 
 #. type: TP
-#: cupsd.conf.5:141
+#: cupsd.conf.5:142
 #, no-wrap
 msgid "B<ErrorPolicy retry-job>"
 msgstr "B<ErrorPolicy retry-job>"
 
 #. type: Plain text
-#: cupsd.conf.5:144
+#: cupsd.conf.5:145
 msgid ""
 "Specifies that a failed print job should be retried at a later time unless "
 "otherwise specified for the printer."
@@ -3083,14 +3085,14 @@ msgstr ""
 "Drucker festgelegt."
 
 #. type: TP
-#: cupsd.conf.5:144
+#: cupsd.conf.5:145
 #, no-wrap
 msgid "B<ErrorPolicy stop-printer>"
 msgstr "B<ErrorPolicy stop-printer>"
 
 #. #FilterLimit
 #. type: Plain text
-#: cupsd.conf.5:148
+#: cupsd.conf.5:149
 msgid ""
 "Specifies that a failed print job should stop the printer unless otherwise "
 "specified for the printer. The 'stop-printer' error policy is the default."
@@ -3100,14 +3102,14 @@ msgstr ""
 "»stop-printer« ist die Vorgabe."
 
 #. type: TP
-#: cupsd.conf.5:148
+#: cupsd.conf.5:149
 #, no-wrap
 msgid "B<FilterLimit >I<limit>"
 msgstr "B<FilterLimit >I<Beschränkung>"
 
 #. #FilterNice
 #. type: Plain text
-#: cupsd.conf.5:157
+#: cupsd.conf.5:158
 msgid ""
 "Specifies the maximum cost of filters that are run concurrently, which can "
 "be used to minimize disk, memory, and CPU resource problems.  A limit of 0 "
@@ -3128,14 +3130,14 @@ msgstr ""
 "»0«."
 
 #. type: TP
-#: cupsd.conf.5:157
+#: cupsd.conf.5:158
 #, no-wrap
 msgid "B<FilterNice >I<nice-value>"
 msgstr "B<FilterNice >I<Nice-Wert>"
 
 #. #GSSServiceName
 #. type: Plain text
-#: cupsd.conf.5:165
+#: cupsd.conf.5:166
 msgid ""
 "Specifies the scheduling priority ( B<nice>(8)  value) of filters that are "
 "run to print a job.  The nice value ranges from 0, the highest priority, to "
@@ -3147,7 +3149,7 @@ msgstr ""
 "Vorgabe ist 0."
 
 #. type: Plain text
-#: cupsd.conf.5:169
+#: cupsd.conf.5:170
 msgid ""
 "Specifies the service name when using Kerberos authentication.  The default "
 "service name is \"http.\""
@@ -3157,26 +3159,26 @@ msgstr ""
 
 #. #HostNameLookups
 #. type: TP
-#: cupsd.conf.5:169
+#: cupsd.conf.5:170
 #, no-wrap
 msgid "B<HostNameLookups On>"
 msgstr "B<HostNameLookups On>"
 
 #. type: TP
-#: cupsd.conf.5:172
+#: cupsd.conf.5:173
 #, no-wrap
 msgid "B<HostNameLookups Off>"
 msgstr "B<HostNameLookups Off>"
 
 #. type: TP
-#: cupsd.conf.5:174
+#: cupsd.conf.5:175
 #, no-wrap
 msgid "B<HostNameLookups Double>"
 msgstr "B<HostNameLookups Double>"
 
 #. #IdleExitTimeout
 #. type: Plain text
-#: cupsd.conf.5:184
+#: cupsd.conf.5:185
 msgid ""
 "Specifies whether to do reverse lookups on connecting clients.  The \"Double"
 "\" setting causes B<cupsd>(8)  to verify that the hostname resolved from the "
@@ -3197,14 +3199,14 @@ msgstr ""
 "erforderlich ist. "
 
 #. type: TP
-#: cupsd.conf.5:184
+#: cupsd.conf.5:185
 #, no-wrap
 msgid "B<IdleExitTimeout >I<seconds>"
 msgstr "B<IdleExitTimeout >I<Sekunden>"
 
 #. #JobKillDelay
 #. type: Plain text
-#: cupsd.conf.5:192
+#: cupsd.conf.5:193
 msgid ""
 "Specifies the length of time to wait before shutting down due to "
 "inactivity.  The default is \"60\" seconds.  Note: Only applicable when "
@@ -3215,14 +3217,14 @@ msgstr ""
 "B<cupsd>(8) auf Anforderung (z.B. mit B<-l>) läuft."
 
 #. type: TP
-#: cupsd.conf.5:192
+#: cupsd.conf.5:193
 #, no-wrap
 msgid "B<JobKillDelay >I<seconds>"
 msgstr "B<JobKillDelay >I<Sekunden>"
 
 #. #JobRetryInterval
 #. type: Plain text
-#: cupsd.conf.5:197
+#: cupsd.conf.5:198
 msgid ""
 "Specifies the number of seconds to wait before killing the filters and "
 "backend associated with a canceled or held job.  The default is \"30\"."
@@ -3232,14 +3234,14 @@ msgstr ""
 "verbunden sind, fest. Die Vorgabe ist »30«."
 
 #. type: TP
-#: cupsd.conf.5:197
+#: cupsd.conf.5:198
 #, no-wrap
 msgid "B<JobRetryInterval >I<seconds>"
 msgstr "B<JobRetryInterval >I<Sekunden>"
 
 #. #JobRetryLimit
 #. type: Plain text
-#: cupsd.conf.5:203
+#: cupsd.conf.5:204
 msgid ""
 "Specifies the interval between retries of jobs in seconds.  This is "
 "typically used for fax queues but can also be used with normal print queues "
@@ -3253,14 +3255,14 @@ msgstr ""
 "»30«."
 
 #. type: TP
-#: cupsd.conf.5:203
+#: cupsd.conf.5:204
 #, no-wrap
 msgid "B<JobRetryLimit >I<count>"
 msgstr "B<JobRetryLimit >I<Anzahl>"
 
 #. #KeepAlive
 #. type: Plain text
-#: cupsd.conf.5:209
+#: cupsd.conf.5:210
 msgid ""
 "Specifies the number of retries that are done for jobs.  This is typically "
 "used for fax queues but can also be used with normal print queues whose "
@@ -3273,20 +3275,20 @@ msgstr ""
 "oder »retry-current-job« ist. Die Vorgabe ist »5«."
 
 #. type: TP
-#: cupsd.conf.5:209
+#: cupsd.conf.5:210
 #, no-wrap
 msgid "B<KeepAlive Yes>"
 msgstr "B<KeepAlive Yes>"
 
 #. type: TP
-#: cupsd.conf.5:211
+#: cupsd.conf.5:212
 #, no-wrap
 msgid "B<KeepAlive No>"
 msgstr "B<KeepAlive No>"
 
 #. #KeepAliveTimeout
 #. type: Plain text
-#: cupsd.conf.5:216
+#: cupsd.conf.5:217
 msgid ""
 "Specifies whether to support HTTP keep-alive connections.  The default is "
 "\"Yes\"."
@@ -3295,14 +3297,14 @@ msgstr ""
 "ist »Yes«."
 
 #. type: TP
-#: cupsd.conf.5:216
+#: cupsd.conf.5:217
 #, no-wrap
 msgid "B<KeepAliveTimeout >I<seconds>"
 msgstr "B<KeepAliveTimeout >I<Sekunden>"
 
 #. #LimitIPP
 #. type: Plain text
-#: cupsd.conf.5:221
+#: cupsd.conf.5:222
 msgid ""
 "Specifies how long an idle client connection remains open.  The default is "
 "\"30\"."
@@ -3311,14 +3313,14 @@ msgstr ""
 "Die Vorgabe ist »30«."
 
 #. type: TP
-#: cupsd.conf.5:221
+#: cupsd.conf.5:222
 #, no-wrap
 msgid "B<E<lt>Limit >I<operation >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 msgstr "B<E<lt>Limit >I<Vorgang >…B<E<gt> >… B<E<lt>/LimitE<gt>>"
 
 #. #Limit
 #. type: Plain text
-#: cupsd.conf.5:225
+#: cupsd.conf.5:226
 msgid ""
 "Specifies the IPP operations that are being limited inside a Policy section. "
 "IPP operation names are listed below in the section \"IPP OPERATION NAMES\"."
@@ -3328,20 +3330,20 @@ msgstr ""
 "VORGANGSNAMEN« beschrieben."
 
 #. type: TP
-#: cupsd.conf.5:225
+#: cupsd.conf.5:226
 #, no-wrap
 msgid "B<E<lt>Limit >I<method >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 msgstr "B<E<lt>Limit >I<Methode >…B<E<gt> >… B<E<lt>/LimitE<gt>>"
 
 #. type: TP
-#: cupsd.conf.5:228
+#: cupsd.conf.5:229
 #, no-wrap
 msgid "B<E<lt>LimitExcept >I<method >...B<E<gt> >... B<E<lt>/LimitExceptE<gt>>"
 msgstr "B<E<lt>LimitExcept >I<Methode >…B<E<gt> >… B<E<lt>/LimitExceptE<gt>>"
 
 #. #LimitRequestBody
 #. type: Plain text
-#: cupsd.conf.5:232
+#: cupsd.conf.5:233
 msgid ""
 "Specifies the HTTP methods that are being limited inside a Location section. "
 "HTTP method names are listed below in the section \"HTTP METHOD NAMES\"."
@@ -3351,14 +3353,14 @@ msgstr ""
 "METHODENNAMEN« aufgeführt."
 
 #. type: TP
-#: cupsd.conf.5:232
+#: cupsd.conf.5:233
 #, no-wrap
 msgid "B<LimitRequestBody >I<size>"
 msgstr "B<LimitRequestBody >I<Größe>"
 
 #. #Listen
 #. type: Plain text
-#: cupsd.conf.5:237
+#: cupsd.conf.5:238
 msgid ""
 "Specifies the maximum size of print files, IPP requests, and HTML form "
 "data.  The default is \"0\" which disables the limit check."
@@ -3368,37 +3370,47 @@ msgstr ""
 "wird."
 
 #. type: TP
-#: cupsd.conf.5:237
+#: cupsd.conf.5:238
 #, no-wrap
 msgid "B<Listen >I<ipv4-address>B<:>I<port>"
 msgstr "B<Listen >I<IPv4-Adresse>B<:>I<Port>"
 
 #. type: TP
-#: cupsd.conf.5:239
+#: cupsd.conf.5:240
 #, no-wrap
 msgid "B<Listen [>I<ipv6-address>B<]:>I<port>"
 msgstr "B<Listen [>I<IPv6-Adresse>B<]:>I<Port>"
 
 #. type: TP
-#: cupsd.conf.5:241
+#: cupsd.conf.5:242
 #, no-wrap
 msgid "B<Listen *:>I<port>"
 msgstr "B<Listen *:>I<Port>"
 
 #. type: TP
-#: cupsd.conf.5:243
+#: cupsd.conf.5:244
 #, no-wrap
 msgid "B<Listen >I</path/to/domain/socket>"
 msgstr "B<Listen >I</Pfad/zu/Domain/Socket>"
 
 #. #ListenBackLog
 #. type: Plain text
-#: cupsd.conf.5:249
+#: cupsd.conf.5:251
+#, fuzzy
+#| msgid ""
+#| "Listens to the specified address and port or domain socket path for "
+#| "connections.  Multiple Listen directives can be provided to listen on "
+#| "multiple addresses.  The Listen directive is similar to the Port "
+#| "directive but allows you to restrict access to specific interfaces or "
+#| "networks."
 msgid ""
 "Listens to the specified address and port or domain socket path for "
 "connections.  Multiple Listen directives can be provided to listen on "
 "multiple addresses.  The Listen directive is similar to the Port directive "
-"but allows you to restrict access to specific interfaces or networks."
+"but allows you to restrict access to specific interfaces or networks.  Note: "
+"\"Listen *:I<port>\" and \"Port I<port>\" effectively listen on all IP "
+"addresses, so you cannot combine them with Listen directives for explicit "
+"IPv4 or IPv6 addresses on the same port."
 msgstr ""
 "Wartet auf den angegebenen Adressen und Ports oder Domain-Socketpfaden auf "
 "Anfragen. Mehrere »Listen«-Direktiven können angegeben werden, um auf "
@@ -3407,14 +3419,14 @@ msgstr ""
 "Schnittstellen oder Netze zu beschränken."
 
 #. type: TP
-#: cupsd.conf.5:249
+#: cupsd.conf.5:251
 #, no-wrap
 msgid "B<ListenBackLog >I<number>"
 msgstr "B<ListenBackLog >I<Anzahl>"
 
 #. #Location
 #. type: Plain text
-#: cupsd.conf.5:256
+#: cupsd.conf.5:258
 msgid ""
 "Specifies the number of pending connections that will be allowed.  This "
 "normally only affects very busy servers that have reached the MaxClients "
@@ -3434,14 +3446,14 @@ msgstr ""
 "Betriebssystemen oder »128« auf neueren Betriebssystemen."
 
 #. type: TP
-#: cupsd.conf.5:256
+#: cupsd.conf.5:258
 #, no-wrap
 msgid "B<E<lt>Location >I</path>B<E<gt> >... B<E<lt>/LocationE<gt>>"
 msgstr "B<E<lt>Location >I</Pfad>B<E<gt> >… B<E<lt>/LocationE<gt>>"
 
 #. #LogDebugHistory
 #. type: Plain text
-#: cupsd.conf.5:261
+#: cupsd.conf.5:263
 msgid ""
 "Specifies access control for the named location.  Paths are documented below "
 "in the section \"LOCATION PATHS\"."
@@ -3450,14 +3462,14 @@ msgstr ""
 "unten im Abschnitt »ORTSPFADE« beschrieben."
 
 #. type: TP
-#: cupsd.conf.5:261
+#: cupsd.conf.5:263
 #, no-wrap
 msgid "B<LogDebugHistory >I<number>"
 msgstr "B<LogDebugHistory >I<Anzahl>"
 
 #. #LogLevel
 #. type: Plain text
-#: cupsd.conf.5:265
+#: cupsd.conf.5:267
 msgid ""
 "Specifies the number of debugging messages that are retained for logging if "
 "an error occurs in a print job. Debug messages are logged regardless of the "
@@ -3469,68 +3481,68 @@ msgstr ""
 "protokolliert."
 
 #. type: TP
-#: cupsd.conf.5:265
+#: cupsd.conf.5:267
 #, no-wrap
 msgid "B<LogLevel >none"
 msgstr "B<LogLevel >none"
 
 #. type: TP
-#: cupsd.conf.5:267
+#: cupsd.conf.5:269
 #, no-wrap
 msgid "B<LogLevel >emerg"
 msgstr "B<LogLevel >emerg"
 
 #. type: TP
-#: cupsd.conf.5:269
+#: cupsd.conf.5:271
 #, no-wrap
 msgid "B<LogLevel >alert"
 msgstr "B<LogLevel >alert"
 
 #. type: TP
-#: cupsd.conf.5:271
+#: cupsd.conf.5:273
 #, no-wrap
 msgid "B<LogLevel >crit"
 msgstr "B<LogLevel >crit"
 
 #. type: TP
-#: cupsd.conf.5:273
+#: cupsd.conf.5:275
 #, no-wrap
 msgid "B<LogLevel >error"
 msgstr "B<LogLevel >error"
 
 #. type: TP
-#: cupsd.conf.5:275
+#: cupsd.conf.5:277
 #, no-wrap
 msgid "B<LogLevel >warn"
 msgstr "B<LogLevel >warn"
 
 #. type: TP
-#: cupsd.conf.5:277
+#: cupsd.conf.5:279
 #, no-wrap
 msgid "B<LogLevel >notice"
 msgstr "B<LogLevel >notice"
 
 #. type: TP
-#: cupsd.conf.5:279
+#: cupsd.conf.5:281
 #, no-wrap
 msgid "B<LogLevel >info"
 msgstr "B<LogLevel >info"
 
 #. type: TP
-#: cupsd.conf.5:281
+#: cupsd.conf.5:283
 #, no-wrap
 msgid "B<LogLevel >debug"
 msgstr "B<LogLevel >debug"
 
 #. type: TP
-#: cupsd.conf.5:283
+#: cupsd.conf.5:285
 #, no-wrap
 msgid "B<LogLevel >debug2"
 msgstr "B<LogLevel >debug2"
 
 #. #LogTimeFormat
 #. type: Plain text
-#: cupsd.conf.5:289
+#: cupsd.conf.5:291
 msgid ""
 "Specifies the level of logging for the ErrorLog file.  The value \"none\" "
 "stops all logging while \"debug2\" logs everything.  The default is \"warn\"."
@@ -3540,20 +3552,20 @@ msgstr ""
 "Vorgabe ist »warn«."
 
 #. type: TP
-#: cupsd.conf.5:289
+#: cupsd.conf.5:291
 #, no-wrap
 msgid "B<LogTimeFormat >standard"
 msgstr "B<LogTimeFormat >standard"
 
 #. type: TP
-#: cupsd.conf.5:291
+#: cupsd.conf.5:293
 #, no-wrap
 msgid "B<LogTimeFormat >usecs"
 msgstr "B<LogTimeFormat >usecs"
 
 #. #MaxClients
 #. type: Plain text
-#: cupsd.conf.5:296
+#: cupsd.conf.5:298
 msgid ""
 "Specifies the format of the date and time in the log files.  The value "
 "\"standard\" is the default and logs whole seconds while \"usecs\" logs "
@@ -3564,14 +3576,14 @@ msgstr ""
 "»usecs« in Mikrosekunden protokolliert."
 
 #. type: TP
-#: cupsd.conf.5:296
+#: cupsd.conf.5:298
 #, no-wrap
 msgid "B<MaxClients >I<number>"
 msgstr "B<MaxClients >I<Anzahl>"
 
 #. #MaxClientPerHost
 #. type: Plain text
-#: cupsd.conf.5:301
+#: cupsd.conf.5:303
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed by the "
 "scheduler.  The default is \"100\"."
@@ -3580,14 +3592,14 @@ msgstr ""
 "erlaubt werden, fest. Die Vorgabe ist »100«."
 
 #. type: TP
-#: cupsd.conf.5:301
+#: cupsd.conf.5:303
 #, no-wrap
 msgid "B<MaxClientsPerHost >I<number>"
 msgstr "B<MaxClientsPerHost >I<Anzahl>"
 
 #. #MaxCopies
 #. type: Plain text
-#: cupsd.conf.5:307
+#: cupsd.conf.5:309
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed from a "
 "single address.  The default is the MaxClients value."
@@ -3596,14 +3608,14 @@ msgstr ""
 "Adresse erlaubt sind, fest. Die Vorgabe ist der Wert MaxClients."
 
 #. type: TP
-#: cupsd.conf.5:307
+#: cupsd.conf.5:309
 #, no-wrap
 msgid "B<MaxCopies >I<number>"
 msgstr "B<MaxCopies >I<Anzahl>"
 
 #. #MaxHoldTime
 #. type: Plain text
-#: cupsd.conf.5:312
+#: cupsd.conf.5:314
 msgid ""
 "Specifies the maximum number of copies that a user can print of each job.  "
 "The default is \"9999\"."
@@ -3612,14 +3624,14 @@ msgstr ""
 "drucken kann, fest. Die Vorgabe ist »9999«."
 
 #. type: TP
-#: cupsd.conf.5:312
+#: cupsd.conf.5:314
 #, no-wrap
 msgid "B<MaxHoldTime >I<seconds>"
 msgstr "B<MaxHoldTime >I<Sekunden>"
 
 #. #MaxJobs
 #. type: Plain text
-#: cupsd.conf.5:317
+#: cupsd.conf.5:319
 msgid ""
 "Specifies the maximum time a job may remain in the \"indefinite\" hold state "
 "before it is canceled.  The default is \"0\" which disables cancellation of "
@@ -3630,14 +3642,14 @@ msgstr ""
 "gehaltene Aufträge abgebrochen werden."
 
 #. type: TP
-#: cupsd.conf.5:317
+#: cupsd.conf.5:319
 #, no-wrap
 msgid "B<MaxJobs >I<number>"
 msgstr "B<MaxJobs >I<Anzahl>"
 
 #. #MaxJobsPerPrinter
 #. type: Plain text
-#: cupsd.conf.5:323
+#: cupsd.conf.5:325
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed.  Set to "
 "\"0\" to allow an unlimited number of jobs.  The default is \"500\"."
@@ -3647,14 +3659,14 @@ msgstr ""
 "erlauben. Die Vorgabe ist »500«."
 
 #. type: TP
-#: cupsd.conf.5:323
+#: cupsd.conf.5:325
 #, no-wrap
 msgid "B<MaxJobsPerPrinter >I<number>"
 msgstr "B<MaxJobsPerPrinter >I<Anzahl>"
 
 #. #MaxJobsPerUser
 #. type: Plain text
-#: cupsd.conf.5:328
+#: cupsd.conf.5:330
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "printer.  The default is \"0\" which allows up to MaxJobs jobs per printer."
@@ -3664,14 +3676,14 @@ msgstr ""
 "erlaubt sind."
 
 #. type: TP
-#: cupsd.conf.5:328
+#: cupsd.conf.5:330
 #, no-wrap
 msgid "B<MaxJobsPerUser >I<number>"
 msgstr "B<MaxJobsPerUser >I<Anzahl>"
 
 #. #MaxJobTime
 #. type: Plain text
-#: cupsd.conf.5:333
+#: cupsd.conf.5:335
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "user.  The default is \"0\" which allows up to MaxJobs jobs per user."
@@ -3681,14 +3693,14 @@ msgstr ""
 "erlaubt sind."
 
 #. type: TP
-#: cupsd.conf.5:333
+#: cupsd.conf.5:335
 #, no-wrap
 msgid "B<MaxJobTime >I<seconds>"
 msgstr "B<MaxJobTime >I<Sekunden>"
 
 #. #MaxLogSize
 #. type: Plain text
-#: cupsd.conf.5:339
+#: cupsd.conf.5:341
 msgid ""
 "Specifies the maximum time a job may take to print before it is canceled.  "
 "Set to \"0\" to disable cancellation of \"stuck\" jobs.  The default is "
@@ -3700,14 +3712,14 @@ msgstr ""
 "Stunden)."
 
 #. type: TP
-#: cupsd.conf.5:339
+#: cupsd.conf.5:341
 #, no-wrap
 msgid "B<MaxLogSize >I<size>"
 msgstr "B<MaxLogSize >I<Größe>"
 
 #. #MultipleOperationTimeout
 #. type: Plain text
-#: cupsd.conf.5:345
+#: cupsd.conf.5:347
 msgid ""
 "Specifies the maximum size of the log files before they are rotated.  The "
 "value \"0\" disables log rotation.  The default is \"1048576\" (1MB)."
@@ -3717,14 +3729,14 @@ msgstr ""
 "Vorgabe ist »1048576« (1 MB)."
 
 #. type: TP
-#: cupsd.conf.5:345
+#: cupsd.conf.5:347
 #, no-wrap
 msgid "B<MultipleOperationTimeout >I<seconds>"
 msgstr "B<MultipleOperationTimeout >I<Sekunden>"
 
 #. #Policy
 #. type: Plain text
-#: cupsd.conf.5:350
+#: cupsd.conf.5:352
 msgid ""
 "Specifies the maximum amount of time to allow between files in a multiple "
 "file print job.  The default is \"900\" (15 minutes)."
@@ -3733,50 +3745,50 @@ msgstr ""
 "mehreren Dateien fest. Die Vorgabe ist »900« (15 Minuten)."
 
 #. type: TP
-#: cupsd.conf.5:350
+#: cupsd.conf.5:352
 #, no-wrap
 msgid "B<E<lt>Policy >I<name>B<E<gt> >... B<E<lt>/PolicyE<gt>>"
 msgstr "B<E<lt>Policy >I<Name>B<E<gt> >… B<E<lt>/PolicyE<gt>>"
 
 #. #Port
 #. type: Plain text
-#: cupsd.conf.5:354
+#: cupsd.conf.5:356
 msgid "Specifies access control for the named policy."
 msgstr "Legt die Zugriffskontrolle für die genannte Richtlinie fest."
 
 #. type: TP
-#: cupsd.conf.5:354
+#: cupsd.conf.5:356
 #, no-wrap
 msgid "B<Port >I<number>"
 msgstr "B<Port >I<Nummer>"
 
 #. #PreserveJobFiles
 #. type: Plain text
-#: cupsd.conf.5:358
+#: cupsd.conf.5:360
 msgid "Listens to the specified port number for connections."
 msgstr "Wartet auf der angegebenen Portnummer auf Verbindungen."
 
 #. type: TP
-#: cupsd.conf.5:358
+#: cupsd.conf.5:360
 #, no-wrap
 msgid "B<PreserveJobFiles Yes>"
 msgstr "B<PreserveJobFiles Yes>"
 
 #. type: TP
-#: cupsd.conf.5:360
+#: cupsd.conf.5:362
 #, no-wrap
 msgid "B<PreserveJobFiles No>"
 msgstr "B<PreserveJobFiles No>"
 
 #. type: TP
-#: cupsd.conf.5:362
+#: cupsd.conf.5:364
 #, no-wrap
 msgid "B<PreserveJobFiles >I<seconds>"
 msgstr "B<PreserveJobFiles >I<Sekunden>"
 
 #. #PreserveJobHistory
 #. type: Plain text
-#: cupsd.conf.5:368
+#: cupsd.conf.5:370
 msgid ""
 "Specifies whether job files (documents) are preserved after a job is "
 "printed.  If a numeric value is specified, job files are preserved for the "
@@ -3789,26 +3801,26 @@ msgstr ""
 "erhalten. Die Vorgabe ist »86400« (einen Tag erhalten)."
 
 #. type: TP
-#: cupsd.conf.5:368
+#: cupsd.conf.5:370
 #, no-wrap
 msgid "B<PreserveJobHistory Yes>"
 msgstr "B<PreserveJobHistory Yes>"
 
 #. type: TP
-#: cupsd.conf.5:370
+#: cupsd.conf.5:372
 #, no-wrap
 msgid "B<PreserveJobHistory No>"
 msgstr "B<PreserveJobHistory No>"
 
 #. type: TP
-#: cupsd.conf.5:372
+#: cupsd.conf.5:374
 #, no-wrap
 msgid "B<PreserveJobHistory >I<seconds>"
 msgstr "B<PreserveJobHistory >I<Sekunden>"
 
 #. #ReloadTimeout
 #. type: Plain text
-#: cupsd.conf.5:379
+#: cupsd.conf.5:381
 msgid ""
 "Specifies whether the job history is preserved after a job is printed.  If a "
 "numeric value is specified, the job history is preserved for the indicated "
@@ -3822,14 +3834,14 @@ msgstr ""
 "Vorgabe ist »Yes«."
 
 #. type: TP
-#: cupsd.conf.5:379
+#: cupsd.conf.5:381
 #, no-wrap
 msgid "B<ReloadTimeout >I<seconds>"
 msgstr "B<ReloadTimeout >I<Sekunden>"
 
 #. #ServerAdmin
 #. type: Plain text
-#: cupsd.conf.5:384
+#: cupsd.conf.5:386
 msgid ""
 "Specifies the amount of time to wait for job completion before restarting "
 "the scheduler.  The default is \"30\"."
@@ -3839,14 +3851,14 @@ msgstr ""
 "Die Vorgabe ist »30«."
 
 #. type: TP
-#: cupsd.conf.5:384
+#: cupsd.conf.5:386
 #, no-wrap
 msgid "B<ServerAdmin >I<email-address>"
 msgstr "B<ServerAdmin >I<E-Mail-Adresse>"
 
 #. #ServerAlias
 #. type: Plain text
-#: cupsd.conf.5:389
+#: cupsd.conf.5:391
 msgid ""
 "Specifies the email address of the server administrator.  The default value "
 "is \"root@ServerName\"."
@@ -3855,20 +3867,20 @@ msgstr ""
 "»root@ServerName«."
 
 #. type: TP
-#: cupsd.conf.5:389
+#: cupsd.conf.5:391
 #, no-wrap
 msgid "B<ServerAlias >I<hostname >[ ... I<hostname >]"
 msgstr "B<ServerAlias >I<Rechnername >[ … I<Rechnername >]"
 
 #. type: TP
-#: cupsd.conf.5:391
+#: cupsd.conf.5:393
 #, no-wrap
 msgid "B<ServerAlias *>"
 msgstr "B<ServerAlias *>"
 
 #. #ServerName
 #. type: Plain text
-#: cupsd.conf.5:397
+#: cupsd.conf.5:399
 msgid ""
 "The ServerAlias directive is used for HTTP Host header validation when "
 "clients connect to the scheduler from external interfaces.  Using the "
@@ -3887,14 +3899,14 @@ msgstr ""
 "verwenden."
 
 #. type: TP
-#: cupsd.conf.5:397
+#: cupsd.conf.5:399
 #, no-wrap
 msgid "B<ServerName >I<hostname>"
 msgstr "B<ServerName >I<Rechnername>"
 
 #. #ServerTokens
 #. type: Plain text
-#: cupsd.conf.5:404
+#: cupsd.conf.5:406
 msgid ""
 "Specifies the fully-qualified hostname of the server.  The default is the "
 "value reported by the B<hostname>(1)  command."
@@ -3903,50 +3915,50 @@ msgstr ""
 "der Wert, der von dem Befehl B<hostname>(1) berichtet wird."
 
 #. type: TP
-#: cupsd.conf.5:404
+#: cupsd.conf.5:406
 #, no-wrap
 msgid "B<ServerTokens None>"
 msgstr "B<ServerTokens None>"
 
 #. type: TP
-#: cupsd.conf.5:406
+#: cupsd.conf.5:408
 #, no-wrap
 msgid "B<ServerTokens ProductOnly>"
 msgstr "B<ServerTokens ProductOnly>"
 
 #. type: TP
-#: cupsd.conf.5:408
+#: cupsd.conf.5:410
 #, no-wrap
 msgid "B<ServerTokens Major>"
 msgstr "B<ServerTokens Major>"
 
 #. type: TP
-#: cupsd.conf.5:410
+#: cupsd.conf.5:412
 #, no-wrap
 msgid "B<ServerTokens Minor>"
 msgstr "B<ServerTokens Minor>"
 
 #. type: TP
-#: cupsd.conf.5:412
+#: cupsd.conf.5:414
 #, no-wrap
 msgid "B<ServerTokens Minimal>"
 msgstr "B<ServerTokens Minimal>"
 
 #. type: TP
-#: cupsd.conf.5:414
+#: cupsd.conf.5:416
 #, no-wrap
 msgid "B<ServerTokens OS>"
 msgstr "B<ServerTokens OS>"
 
 #. type: TP
-#: cupsd.conf.5:416
+#: cupsd.conf.5:418
 #, no-wrap
 msgid "B<ServerTokens Full>"
 msgstr "B<ServerTokens Full>"
 
 #. #SSLListen
 #. type: Plain text
-#: cupsd.conf.5:428
+#: cupsd.conf.5:430
 msgid ""
 "Specifies what information is included in the Server header of HTTP "
 "responses.  \"None\" disables the Server header.  \"ProductOnly\" reports "
@@ -3965,58 +3977,58 @@ msgstr ""
 "IPP/2.1«. Die Vorgabe ist »Minimal«."
 
 #. type: TP
-#: cupsd.conf.5:428
+#: cupsd.conf.5:430
 #, no-wrap
 msgid "B<SSLListen >I<ipv4-address>B<:>I<port>"
 msgstr "B<SSLListen >I<IPv4-Adresse>B<:>I<Port>"
 
 #. type: TP
-#: cupsd.conf.5:430
+#: cupsd.conf.5:432
 #, no-wrap
 msgid "B<SSLListen [>I<ipv6-address>B<]:>I<port>"
 msgstr "B<SSLListen [>I<IPv6-Adresse>B<]:>I<Port>"
 
 #. type: TP
-#: cupsd.conf.5:432
+#: cupsd.conf.5:434
 #, no-wrap
 msgid "B<SSLListen *:>I<port>"
 msgstr "B<SSLListen *:>I<Port>"
 
 #. #SSLOptions
 #. type: Plain text
-#: cupsd.conf.5:436
+#: cupsd.conf.5:438
 msgid "Listens on the specified address and port for encrypted connections."
 msgstr ""
 "Wartet auf der angegebenen Adresse und dem Port auf verschlüsselte "
 "Verbindungen."
 
 #. type: TP
-#: cupsd.conf.5:454
+#: cupsd.conf.5:456
 #, no-wrap
 msgid "B<SSLPort >I<port>"
 msgstr "B<SSLPort >I<Port>"
 
 #. #StrictConformance
 #. type: Plain text
-#: cupsd.conf.5:458
+#: cupsd.conf.5:460
 msgid "Listens on the specified port for encrypted connections."
 msgstr "Wartet auf dem angegebenen Port auf verschlüsselte Verbindungen."
 
 #. type: TP
-#: cupsd.conf.5:458
+#: cupsd.conf.5:460
 #, no-wrap
 msgid "B<StrictConformance Yes>"
 msgstr "B<StrictConformance Yes>"
 
 #. type: TP
-#: cupsd.conf.5:460
+#: cupsd.conf.5:462
 #, no-wrap
 msgid "B<StrictConformance No>"
 msgstr "B<StrictConformance No>"
 
 #. #Timeout
 #. type: Plain text
-#: cupsd.conf.5:465
+#: cupsd.conf.5:467
 msgid ""
 "Specifies whether the scheduler requires clients to strictly adhere to the "
 "IPP specifications.  The default is \"No\"."
@@ -4025,56 +4037,56 @@ msgstr ""
 "den IPP-Spezifikationen folgen. Die Vorgabe ist »No«."
 
 #. type: TP
-#: cupsd.conf.5:465
+#: cupsd.conf.5:467
 #, no-wrap
 msgid "B<Timeout >I<seconds>"
 msgstr "B<Timeout >I<Sekunden>"
 
 #. #WebInterface
 #. type: Plain text
-#: cupsd.conf.5:470
+#: cupsd.conf.5:472
 msgid ""
 "Specifies the HTTP request timeout.  The default is \"900\" (15 minutes)."
 msgstr ""
 "Legt die HTTP-Zeitüberschreitung fest. Die Vorgabe ist »900« (15 Minuten)."
 
 #. type: TP
-#: cupsd.conf.5:470
+#: cupsd.conf.5:472
 #, no-wrap
 msgid "B<WebInterface yes>"
 msgstr "B<WebInterface yes>"
 
 #. type: TP
-#: cupsd.conf.5:472
+#: cupsd.conf.5:474
 #, no-wrap
 msgid "B<WebInterface no>"
 msgstr "B<WebInterface no>"
 
 #. type: Plain text
-#: cupsd.conf.5:476
+#: cupsd.conf.5:478
 msgid "Specifies whether the web interface is enabled.  The default is \"No\"."
 msgstr ""
 "Legt fest, ob die Webschnittstelle freigegeben ist. Die Vorgabe ist »No«."
 
 #. type: SS
-#: cupsd.conf.5:476
+#: cupsd.conf.5:478
 #, no-wrap
 msgid "HTTP METHOD NAMES"
 msgstr "HTTP-METHODENNAMEN"
 
 #. type: Plain text
-#: cupsd.conf.5:479
+#: cupsd.conf.5:481
 msgid "The following HTTP methods are supported by B<cupsd>(8):"
 msgstr "Die folgenden HTTP-Methoden werden von B<cupsd>(8) unterstützt:"
 
 #. type: TP
-#: cupsd.conf.5:479
+#: cupsd.conf.5:481
 #, no-wrap
 msgid "GET"
 msgstr "GET"
 
 #. type: Plain text
-#: cupsd.conf.5:482
+#: cupsd.conf.5:484
 msgid ""
 "Used by a client to download icons and other printer resources and to access "
 "the CUPS web interface."
@@ -4083,13 +4095,13 @@ msgstr ""
 "Druckressourcen und zum Zugriff auf die CUPS-Webschnittstelle verwandt."
 
 #. type: TP
-#: cupsd.conf.5:482
+#: cupsd.conf.5:484
 #, no-wrap
 msgid "HEAD"
 msgstr "HEAD"
 
 #. type: Plain text
-#: cupsd.conf.5:485
+#: cupsd.conf.5:487
 msgid ""
 "Used by a client to get the type, size, and modification date of resources."
 msgstr ""
@@ -4097,19 +4109,19 @@ msgstr ""
 "von Ressourcen zu erhalten."
 
 #. type: Plain text
-#: cupsd.conf.5:488
+#: cupsd.conf.5:490
 msgid "Used by a client to establish a secure (SSL/TLS) connection."
 msgstr ""
 "Wird vom Client verwandt, um eine sichere (SSL/TLS)-Verbindung zu etablieren."
 
 #. type: TP
-#: cupsd.conf.5:488
+#: cupsd.conf.5:490
 #, no-wrap
 msgid "POST"
 msgstr "POST"
 
 #. type: Plain text
-#: cupsd.conf.5:491
+#: cupsd.conf.5:493
 msgid ""
 "Used by a client to submit IPP requests and HTML forms from the CUPS web "
 "interface."
@@ -4118,402 +4130,402 @@ msgstr ""
 "aus der CUPS-Webschnittstelle verwandt."
 
 #. type: TP
-#: cupsd.conf.5:491
+#: cupsd.conf.5:493
 #, no-wrap
 msgid "PUT"
 msgstr "PUT"
 
 #. type: Plain text
-#: cupsd.conf.5:494
+#: cupsd.conf.5:496
 msgid "Used by a client to upload configuration files."
 msgstr ""
 "Wird von einem Client zum Hochladen von Konfigurationsdateien verwandt."
 
 #. type: SS
-#: cupsd.conf.5:494
+#: cupsd.conf.5:496
 #, no-wrap
 msgid "IPP OPERATION NAMES"
 msgstr "IPP-VORGANGSNAMEN"
 
 #. type: Plain text
-#: cupsd.conf.5:497
+#: cupsd.conf.5:499
 msgid "The following IPP operations are supported by B<cupsd>(8):"
 msgstr "Die folgenden IPP-Vorgänge werden von B<cupsd>(8) unterstützt:"
 
 #. type: TP
-#: cupsd.conf.5:497
+#: cupsd.conf.5:499
 #, no-wrap
 msgid "CUPS-Accept-Jobs"
 msgstr "CUPS-Accept-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:500
+#: cupsd.conf.5:502
 msgid "Allows a printer to accept new jobs."
 msgstr "Erlaubt es einem Drucker, neue Aufträge zu akzeptieren."
 
 #. type: TP
-#: cupsd.conf.5:500
+#: cupsd.conf.5:502
 #, no-wrap
 msgid "CUPS-Add-Modify-Class"
 msgstr "CUPS-Add-Modify-Class"
 
 #. type: Plain text
-#: cupsd.conf.5:503
+#: cupsd.conf.5:505
 msgid "Adds or modifies a printer class."
 msgstr "Fügt eine Druckerklasse hinzu oder ändert sie."
 
 #. type: TP
-#: cupsd.conf.5:503
+#: cupsd.conf.5:505
 #, no-wrap
 msgid "CUPS-Add-Modify-Printer"
 msgstr "CUPS-Add-Modify-Printer"
 
 #. type: Plain text
-#: cupsd.conf.5:506
+#: cupsd.conf.5:508
 msgid "Adds or modifies a printer."
 msgstr "Fügt einen Drucker hinzu oder ändert ihn."
 
 #. type: TP
-#: cupsd.conf.5:506
+#: cupsd.conf.5:508
 #, no-wrap
 msgid "CUPS-Authenticate-Job"
 msgstr "CUPS-Authenticate-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:509
+#: cupsd.conf.5:511
 msgid "Releases a job that is held for authentication."
 msgstr "Gibt einen Auftrag frei, der für Authentifizierung gehalten ist."
 
 #. type: TP
-#: cupsd.conf.5:509
+#: cupsd.conf.5:511
 #, no-wrap
 msgid "CUPS-Delete-Class"
 msgstr "CUPS-Delete-Class"
 
 #. type: Plain text
-#: cupsd.conf.5:512
+#: cupsd.conf.5:514
 msgid "Deletes a printer class."
 msgstr "Löscht eine Druckerklasse."
 
 #. type: TP
-#: cupsd.conf.5:512
+#: cupsd.conf.5:514
 #, no-wrap
 msgid "CUPS-Delete-Printer"
 msgstr "CUPS-Delete-Printer"
 
 #. type: Plain text
-#: cupsd.conf.5:515
+#: cupsd.conf.5:517
 msgid "Deletes a printer."
 msgstr "Löscht einen Drucker."
 
 #. type: TP
-#: cupsd.conf.5:515
+#: cupsd.conf.5:517
 #, no-wrap
 msgid "CUPS-Get-Classes"
 msgstr "CUPS-Get-Classes"
 
 #. type: Plain text
-#: cupsd.conf.5:518
+#: cupsd.conf.5:520
 msgid "Gets a list of printer classes."
 msgstr "Ermittelt eine Liste von Druckerklassen."
 
 #. type: TP
-#: cupsd.conf.5:518
+#: cupsd.conf.5:520
 #, no-wrap
 msgid "CUPS-Get-Default"
 msgstr "CUPS-Get-Default"
 
 #. type: Plain text
-#: cupsd.conf.5:521
+#: cupsd.conf.5:523
 msgid "Gets the server default printer or printer class."
 msgstr "Ermittelt die Servervorgabe für den Drucker oder die Druckerklasse."
 
 #. type: TP
-#: cupsd.conf.5:521
+#: cupsd.conf.5:523
 #, no-wrap
 msgid "CUPS-Get-Devices"
 msgstr "CUPS-Get-Devices"
 
 #. type: Plain text
-#: cupsd.conf.5:524
+#: cupsd.conf.5:526
 msgid "Gets a list of devices that are currently available."
 msgstr "Ermittelt eine Liste von derzeit verfügbaren Geräten."
 
 #. type: TP
-#: cupsd.conf.5:524
+#: cupsd.conf.5:526
 #, no-wrap
 msgid "CUPS-Get-Document"
 msgstr "CUPS-Get-Document"
 
 #. type: Plain text
-#: cupsd.conf.5:527
+#: cupsd.conf.5:529
 msgid "Gets a document file for a job."
 msgstr "Ermittelt eine Dokumentendatei für einen Auftrag."
 
 #. type: TP
-#: cupsd.conf.5:527
+#: cupsd.conf.5:529
 #, no-wrap
 msgid "CUPS-Get-PPD"
 msgstr "CUPS-Get-PPD"
 
 #. type: Plain text
-#: cupsd.conf.5:530
+#: cupsd.conf.5:532
 msgid "Gets a PPD file."
 msgstr "Ermittelt eine PPD-Datei."
 
 #. type: TP
-#: cupsd.conf.5:530
+#: cupsd.conf.5:532
 #, no-wrap
 msgid "CUPS-Get-PPDs"
 msgstr "CUPS-Get-PPDs"
 
 #. type: Plain text
-#: cupsd.conf.5:533
+#: cupsd.conf.5:535
 msgid "Gets a list of installed PPD files."
 msgstr "Ermittelt eine Liste von installierten PPD-Dateien."
 
 #. type: TP
-#: cupsd.conf.5:533
+#: cupsd.conf.5:535
 #, no-wrap
 msgid "CUPS-Get-Printers"
 msgstr "CUPS-Get-Printers"
 
 #. type: Plain text
-#: cupsd.conf.5:536
+#: cupsd.conf.5:538
 msgid "Gets a list of printers."
 msgstr "Ermittelt eine Liste von Druckern."
 
 #. type: TP
-#: cupsd.conf.5:536
+#: cupsd.conf.5:538
 #, no-wrap
 msgid "CUPS-Move-Job"
 msgstr "CUPS-Move-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:539
+#: cupsd.conf.5:541
 msgid "Moves a job."
 msgstr "Verschiebt einen Auftrag."
 
 #. type: TP
-#: cupsd.conf.5:539
+#: cupsd.conf.5:541
 #, no-wrap
 msgid "CUPS-Reject-Jobs"
 msgstr "CUPS-Reject-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:542
+#: cupsd.conf.5:544
 msgid "Prevents a printer from accepting new jobs."
 msgstr "Verhindert, dass ein Drucker neue Aufträge akzeptiert."
 
 #. type: TP
-#: cupsd.conf.5:542
+#: cupsd.conf.5:544
 #, no-wrap
 msgid "CUPS-Set-Default"
 msgstr "CUPS-Set-Default"
 
 #. type: Plain text
-#: cupsd.conf.5:545
+#: cupsd.conf.5:547
 msgid "Sets the server default printer or printer class."
 msgstr "Setzt die Server-Vorgabe für einen Drucker oder eine Druckerklasse."
 
 #. type: TP
-#: cupsd.conf.5:545
+#: cupsd.conf.5:547
 #, no-wrap
 msgid "Cancel-Job"
 msgstr "Cancel-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:548
+#: cupsd.conf.5:550
 msgid "Cancels a job."
 msgstr "Bricht einen Auftrag ab."
 
 #. type: TP
-#: cupsd.conf.5:548
+#: cupsd.conf.5:550
 #, no-wrap
 msgid "Cancel-Jobs"
 msgstr "Cancel-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:551
+#: cupsd.conf.5:553
 msgid "Cancels one or more jobs."
 msgstr "Bricht einen oder mehrere Aufträge ab."
 
 #. type: TP
-#: cupsd.conf.5:551
+#: cupsd.conf.5:553
 #, no-wrap
 msgid "Cancel-My-Jobs"
 msgstr "Cancel-My-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:554
+#: cupsd.conf.5:556
 msgid "Cancels one or more jobs creates by a user."
 msgstr "Bricht einen oder mehrere von einem Benutzer erstellte Aufträge ab."
 
 #. type: TP
-#: cupsd.conf.5:554
+#: cupsd.conf.5:556
 #, no-wrap
 msgid "Cancel-Subscription"
 msgstr "Cancel-Subscription"
 
 #. type: Plain text
-#: cupsd.conf.5:557
+#: cupsd.conf.5:559
 msgid "Cancels a subscription."
 msgstr "Beendet ein Abonnement."
 
 #. type: TP
-#: cupsd.conf.5:557
+#: cupsd.conf.5:559
 #, no-wrap
 msgid "Close-Job"
 msgstr "Close-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:560
+#: cupsd.conf.5:562
 msgid "Closes a job that is waiting for more documents."
 msgstr "Schließt einen Auftrag, der auf weitere Dokumente wartet."
 
 #. type: TP
-#: cupsd.conf.5:560
+#: cupsd.conf.5:562
 #, no-wrap
 msgid "Create-Job"
 msgstr "Create-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:563
+#: cupsd.conf.5:565
 msgid "Creates a new job with no documents."
 msgstr "Erstellt einen neuen Auftrag ohne Dokumente."
 
 #. type: TP
-#: cupsd.conf.5:563
+#: cupsd.conf.5:565
 #, no-wrap
 msgid "Create-Job-Subscriptions"
 msgstr "Create-Job-Subscriptions"
 
 #. type: Plain text
-#: cupsd.conf.5:566
+#: cupsd.conf.5:568
 msgid "Creates a subscription for job events."
 msgstr "Erstellt ein Abonnement für Auftragsereignisse."
 
 #. type: TP
-#: cupsd.conf.5:566
+#: cupsd.conf.5:568
 #, no-wrap
 msgid "Create-Printer-Subscriptions"
 msgstr "Create-Printer-Subscriptions"
 
 #. type: Plain text
-#: cupsd.conf.5:569
+#: cupsd.conf.5:571
 msgid "Creates a subscription for printer events."
 msgstr "Erstellt ein Abonnement für Druckerereignisse."
 
 #. type: TP
-#: cupsd.conf.5:569
+#: cupsd.conf.5:571
 #, no-wrap
 msgid "Get-Job-Attributes"
 msgstr "Get-Job-Attributes"
 
 #. type: Plain text
-#: cupsd.conf.5:572
+#: cupsd.conf.5:574
 msgid "Gets information about a job."
 msgstr "Ermittelt Informationen über einen Auftrag."
 
 #. type: TP
-#: cupsd.conf.5:572
+#: cupsd.conf.5:574
 #, no-wrap
 msgid "Get-Jobs"
 msgstr "Get-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:575
+#: cupsd.conf.5:577
 msgid "Gets a list of jobs."
 msgstr "Ermittelt eine Liste von Aufträgen."
 
 #. type: TP
-#: cupsd.conf.5:575
+#: cupsd.conf.5:577
 #, no-wrap
 msgid "Get-Notifications"
 msgstr "Get-Notifications"
 
 #. type: Plain text
-#: cupsd.conf.5:578
+#: cupsd.conf.5:580
 msgid "Gets a list of event notifications for a subscription."
 msgstr ""
 "Ermittelt eine Liste von Ereignisbenachrichtigungen für ein Abonnement."
 
 #. type: TP
-#: cupsd.conf.5:578
+#: cupsd.conf.5:580
 #, no-wrap
 msgid "Get-Printer-Attributes"
 msgstr "Get-Printer-Attributes"
 
 #. type: Plain text
-#: cupsd.conf.5:581
+#: cupsd.conf.5:583
 msgid "Gets information about a printer or printer class."
 msgstr "Ermittelt Informationen über einen Drucker oder eine Druckerklasse."
 
 #. type: TP
-#: cupsd.conf.5:581
+#: cupsd.conf.5:583
 #, no-wrap
 msgid "Get-Subscription-Attributes"
 msgstr "Get-Subscription-Attributes"
 
 #. type: Plain text
-#: cupsd.conf.5:584
+#: cupsd.conf.5:586
 msgid "Gets information about a subscription."
 msgstr "Ermittelt Informationen über ein Abonnement."
 
 #. type: TP
-#: cupsd.conf.5:584
+#: cupsd.conf.5:586
 #, no-wrap
 msgid "Get-Subscriptions"
 msgstr "Get-Subscriptions"
 
 #. type: Plain text
-#: cupsd.conf.5:587
+#: cupsd.conf.5:589
 msgid "Gets a list of subscriptions."
 msgstr "Ermittelt eine Liste von Abonnements."
 
 #. type: TP
-#: cupsd.conf.5:587
+#: cupsd.conf.5:589
 #, no-wrap
 msgid "Hold-Job"
 msgstr "Hold-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:590
+#: cupsd.conf.5:592
 msgid "Holds a job from printing."
 msgstr "Hält einen Auftrag vom Druck zurück."
 
 #. type: TP
-#: cupsd.conf.5:590
+#: cupsd.conf.5:592
 #, no-wrap
 msgid "Hold-New-Jobs"
 msgstr "Hold-New-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:593
+#: cupsd.conf.5:595
 msgid "Holds all new jobs from printing."
 msgstr "Hält alle neuen Aufträge vom Druck zurück."
 
 #. type: TP
-#: cupsd.conf.5:593
+#: cupsd.conf.5:595
 #, no-wrap
 msgid "Pause-Printer"
 msgstr "Pause-Printer"
 
 #. type: Plain text
-#: cupsd.conf.5:596
+#: cupsd.conf.5:598
 msgid "Stops processing of jobs by a printer or printer class."
 msgstr ""
 "Beendet die Verarbeitung von Aufträgen von einem Drucker oder einer "
 "Druckerklasse."
 
 #. type: TP
-#: cupsd.conf.5:596
+#: cupsd.conf.5:598
 #, no-wrap
 msgid "Pause-Printer-After-Current-Job"
 msgstr "Pause-Printer-After-Current-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:599
+#: cupsd.conf.5:601
 msgid ""
 "Stops processing of jobs by a printer or printer class after the current job "
 "is finished."
@@ -4522,147 +4534,147 @@ msgstr ""
 "Druckerklasse, nachdem der aktuelle Auftrag beendet wurde."
 
 #. type: TP
-#: cupsd.conf.5:599
+#: cupsd.conf.5:601
 #, no-wrap
 msgid "Print-Job"
 msgstr "Print-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:602
+#: cupsd.conf.5:604
 msgid "Creates a new job with a single document."
 msgstr "Erstellt einen neuen Auftrag mit einem einzelnen Dokument."
 
 #. type: TP
-#: cupsd.conf.5:602
+#: cupsd.conf.5:604
 #, no-wrap
 msgid "Purge-Jobs"
 msgstr "Purge-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:605
+#: cupsd.conf.5:607
 msgid "Cancels one or more jobs and deletes the job history."
 msgstr "Bricht einen oder mehrere Aufträge ab und löscht die Auftragschronik."
 
 #. type: TP
-#: cupsd.conf.5:605
+#: cupsd.conf.5:607
 #, no-wrap
 msgid "Release-Held-New-Jobs"
 msgstr "Release-Held-New-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:608
+#: cupsd.conf.5:610
 msgid "Allows previously held jobs to print."
 msgstr "Erlaubt, vorher angehaltenen Aufträgen zu drucken."
 
 #. type: TP
-#: cupsd.conf.5:608
+#: cupsd.conf.5:610
 #, no-wrap
 msgid "Release-Job"
 msgstr "Release-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:611
+#: cupsd.conf.5:613
 msgid "Allows a job to print."
 msgstr "Erlaubt einem Auftrag, zu drucken."
 
 #. type: TP
-#: cupsd.conf.5:611
+#: cupsd.conf.5:613
 #, no-wrap
 msgid "Renew-Subscription"
 msgstr "Renew-Subscription"
 
 #. type: Plain text
-#: cupsd.conf.5:614
+#: cupsd.conf.5:616
 msgid "Renews a subscription."
 msgstr "Erneuert ein Abonnement."
 
 #. type: TP
-#: cupsd.conf.5:614
+#: cupsd.conf.5:616
 #, no-wrap
 msgid "Restart-Job"
 msgstr "Restart-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:617
+#: cupsd.conf.5:619
 msgid "Reprints a job, if possible."
 msgstr "Druckt falls möglich einen Auftrag erneut."
 
 #. type: TP
-#: cupsd.conf.5:617
+#: cupsd.conf.5:619
 #, no-wrap
 msgid "Send-Document"
 msgstr "Send-Document"
 
 #. type: Plain text
-#: cupsd.conf.5:620
+#: cupsd.conf.5:622
 msgid "Adds a document to a job."
 msgstr "Fügt ein Dokument zu einem Auftrag hinzu."
 
 #. type: TP
-#: cupsd.conf.5:620
+#: cupsd.conf.5:622
 #, no-wrap
 msgid "Set-Job-Attributes"
 msgstr "Set-Job-Attributes"
 
 #. type: Plain text
-#: cupsd.conf.5:623
+#: cupsd.conf.5:625
 msgid "Changes job information."
 msgstr "Ändert Auftragsinformationen."
 
 #. type: TP
-#: cupsd.conf.5:623
+#: cupsd.conf.5:625
 #, no-wrap
 msgid "Set-Printer-Attributes"
 msgstr "Set-Printer-Attributes"
 
 #. type: Plain text
-#: cupsd.conf.5:626
+#: cupsd.conf.5:628
 msgid "Changes printer or printer class information."
 msgstr "Ändert Drucker- oder Druckerklasseninformationen."
 
 #. type: TP
-#: cupsd.conf.5:626
+#: cupsd.conf.5:628
 #, no-wrap
 msgid "Validate-Job"
 msgstr "Validate-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:629
+#: cupsd.conf.5:631
 msgid "Validates options for a new job."
 msgstr "Validiert Optionen für einen neuen Auftrag."
 
 #. type: SS
-#: cupsd.conf.5:629
+#: cupsd.conf.5:631
 #, no-wrap
 msgid "LOCATION PATHS"
 msgstr "ORTSPFADE"
 
 #. type: Plain text
-#: cupsd.conf.5:632
+#: cupsd.conf.5:634
 msgid "The following paths are commonly used when configuring B<cupsd>(8):"
 msgstr ""
 "Die folgenden Pfade werden bei der Konfiguration von B<cupsd>(8) häufig "
 "verwandt:"
 
 #. type: TP
-#: cupsd.conf.5:632
+#: cupsd.conf.5:634
 #, no-wrap
 msgid "/"
 msgstr "/"
 
 #. type: Plain text
-#: cupsd.conf.5:635
+#: cupsd.conf.5:637
 msgid "The path for all get operations (get-printers, get-jobs, etc.)"
 msgstr "Der Pfad für alle »get«-Vorgänge (get-printers, get-jobs, usw.)"
 
 #. type: TP
-#: cupsd.conf.5:635
+#: cupsd.conf.5:637
 #, no-wrap
 msgid "/admin"
 msgstr "/admin"
 
 #. type: Plain text
-#: cupsd.conf.5:638
+#: cupsd.conf.5:640
 msgid ""
 "The path for all administration operations (add-printer, delete-printer, "
 "start-printer, etc.)"
@@ -4671,13 +4683,13 @@ msgstr ""
 "start-printer, usw.)"
 
 #. type: TP
-#: cupsd.conf.5:638
+#: cupsd.conf.5:640
 #, no-wrap
 msgid "/admin/conf"
 msgstr "/admin/conf"
 
 #. type: Plain text
-#: cupsd.conf.5:641
+#: cupsd.conf.5:643
 msgid ""
 "The path for access to the CUPS configuration files (cupsd.conf, client."
 "conf, etc.)"
@@ -4686,13 +4698,13 @@ msgstr ""
 "usw.) zuzugreifen"
 
 #. type: TP
-#: cupsd.conf.5:641
+#: cupsd.conf.5:643
 #, no-wrap
 msgid "/admin/log"
 msgstr "/admin/log"
 
 #. type: Plain text
-#: cupsd.conf.5:644
+#: cupsd.conf.5:646
 msgid ""
 "The path for access to the CUPS log files (access_log, error_log, page_log)"
 msgstr ""
@@ -4700,101 +4712,101 @@ msgstr ""
 "zuzugreifen"
 
 #. type: TP
-#: cupsd.conf.5:644
+#: cupsd.conf.5:646
 #, no-wrap
 msgid "/classes"
 msgstr "/classes"
 
 #. type: Plain text
-#: cupsd.conf.5:647
+#: cupsd.conf.5:649
 msgid "The path for all printer classes"
 msgstr "Der Pfad für alle Druckerklassen"
 
 #. type: TP
-#: cupsd.conf.5:647
+#: cupsd.conf.5:649
 #, no-wrap
 msgid "/classes/name"
 msgstr "/classes/name"
 
 #. type: Plain text
-#: cupsd.conf.5:650
+#: cupsd.conf.5:652
 msgid "The resource for the named printer class"
 msgstr "Die Ressourcen für die benannte Druckerklasse"
 
 #. type: TP
-#: cupsd.conf.5:650
+#: cupsd.conf.5:652
 #, no-wrap
 msgid "/jobs"
 msgstr "/jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:653
+#: cupsd.conf.5:655
 msgid "The path for all jobs (hold-job, release-job, etc.)"
 msgstr "Der Pfad für alle Aufträge (hold-job, release-job, usw.)"
 
 #. type: TP
-#: cupsd.conf.5:653
+#: cupsd.conf.5:655
 #, no-wrap
 msgid "/jobs/id"
 msgstr "/jobs/id"
 
 #. type: Plain text
-#: cupsd.conf.5:656
+#: cupsd.conf.5:658
 msgid "The path for the specified job"
 msgstr "Der Pfad für den angegebenen Auftrag"
 
 #. type: TP
-#: cupsd.conf.5:656
+#: cupsd.conf.5:658
 #, no-wrap
 msgid "/printers"
 msgstr "/printers"
 
 #. type: Plain text
-#: cupsd.conf.5:659
+#: cupsd.conf.5:661
 msgid "The path for all printers"
 msgstr "Der Pfad für alle Drucker"
 
 #. type: TP
-#: cupsd.conf.5:659
+#: cupsd.conf.5:661
 #, no-wrap
 msgid "/printers/name"
 msgstr "/printers/name"
 
 #. type: Plain text
-#: cupsd.conf.5:662
+#: cupsd.conf.5:664
 msgid "The path for the named printer"
 msgstr "Der Pfad für den benannten Drucker"
 
 #. type: TP
-#: cupsd.conf.5:662
+#: cupsd.conf.5:664
 #, no-wrap
 msgid "/printers/name.png"
 msgstr "/printers/name.png"
 
 #. type: Plain text
-#: cupsd.conf.5:665
+#: cupsd.conf.5:667
 msgid "The icon file path for the named printer"
 msgstr "Der Icon-Dateipfad für den benannten Drucker"
 
 #. type: TP
-#: cupsd.conf.5:665
+#: cupsd.conf.5:667
 #, no-wrap
 msgid "/printers/name.ppd"
 msgstr "/printers/name.ppd"
 
 #. type: Plain text
-#: cupsd.conf.5:668
+#: cupsd.conf.5:670
 msgid "The PPD file path for the named printer"
 msgstr "Der PPD-Dateipfad für den benannten Drucker"
 
 #. type: SS
-#: cupsd.conf.5:668
+#: cupsd.conf.5:670
 #, no-wrap
 msgid "DIRECTIVES VALID WITHIN LOCATION AND LIMIT SECTIONS"
 msgstr "DIREKTIVEN, DIE INNERHALB VON ORTS- UND EINSCHRÄNKUNGSABSCHNITTEN GÜLTIG SIND"
 
 #. type: Plain text
-#: cupsd.conf.5:670
+#: cupsd.conf.5:672
 msgid ""
 "The following directives may be placed inside Location and Limit sections in "
 "the B<cupsd.conf> file:"
@@ -4803,73 +4815,73 @@ msgstr ""
 "Einschränkungsabschnitten in der Datei B<cupsd.conf> eingetragen werden:"
 
 #. type: TP
-#: cupsd.conf.5:670
+#: cupsd.conf.5:672
 #, no-wrap
 msgid "B<Allow all>"
 msgstr "B<Allow all>"
 
 #. type: TP
-#: cupsd.conf.5:672
+#: cupsd.conf.5:674
 #, no-wrap
 msgid "B<Allow none>"
 msgstr "B<Allow none>"
 
 #. type: TP
-#: cupsd.conf.5:674
+#: cupsd.conf.5:676
 #, no-wrap
 msgid "B<Allow >I<host.domain.com>"
 msgstr "B<Allow >I<Rechner.domain.com>"
 
 #. type: TP
-#: cupsd.conf.5:676
+#: cupsd.conf.5:678
 #, no-wrap
 msgid "B<Allow *.>I<domain.com>"
 msgstr "B<Allow *.>I<domain.com>"
 
 #. type: TP
-#: cupsd.conf.5:678
+#: cupsd.conf.5:680
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>"
 msgstr "B<Allow >I<IPv4-Adresse>"
 
 #. type: TP
-#: cupsd.conf.5:680
+#: cupsd.conf.5:682
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>B</>I<netmask>"
 msgstr "B<Allow >I<IPv4-Adresse>B</>I<Netzmaske>"
 
 #. type: TP
-#: cupsd.conf.5:682
+#: cupsd.conf.5:684
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>B</>I<mm>"
 msgstr "B<Allow >I<IPv4-Adresse>B</>I<mm>"
 
 #. type: TP
-#: cupsd.conf.5:684
+#: cupsd.conf.5:686
 #, no-wrap
 msgid "B<Allow [>I<ipv6-address>B<]>"
 msgstr "B<Allow [>I<IPv6-Adresse>B<]>"
 
 #. type: TP
-#: cupsd.conf.5:686
+#: cupsd.conf.5:688
 #, no-wrap
 msgid "B<Allow [>I<ipv6-address>B<]/>I<mm>"
 msgstr "B<Allow [>I<IPv6-Adresse>B<]/>I<mm>"
 
 #. type: TP
-#: cupsd.conf.5:688
+#: cupsd.conf.5:690
 #, no-wrap
 msgid "B<Allow @IF(>I<name>B<)>"
 msgstr "B<Allow @IF(>I<Name>B<)>"
 
 #. type: TP
-#: cupsd.conf.5:690
+#: cupsd.conf.5:692
 #, no-wrap
 msgid "B<Allow @LOCAL>"
 msgstr "B<Allow @LOCAL>"
 
 #. type: Plain text
-#: cupsd.conf.5:696
+#: cupsd.conf.5:698
 msgid ""
 "Allows access from the named hosts, domains, addresses, or interfaces.  The "
 "@IF(name) form uses the current subnets configured for the named interface.  "
@@ -4887,31 +4899,31 @@ msgstr ""
 "ob »Allow«-Zeilen vor oder nach »Deny«-Zeilen ausgewertet werden."
 
 #. type: TP
-#: cupsd.conf.5:696
+#: cupsd.conf.5:698
 #, no-wrap
 msgid "B<AuthType None>"
 msgstr "B<AuthType None>"
 
 #. type: TP
-#: cupsd.conf.5:698
+#: cupsd.conf.5:700
 #, no-wrap
 msgid "B<AuthType Basic>"
 msgstr "B<AuthType Basic>"
 
 #. type: TP
-#: cupsd.conf.5:700
+#: cupsd.conf.5:702
 #, no-wrap
 msgid "B<AuthType Default>"
 msgstr "B<AuthType Default>"
 
 #. type: TP
-#: cupsd.conf.5:702
+#: cupsd.conf.5:704
 #, no-wrap
 msgid "B<AuthType Negotiate>"
 msgstr "B<AuthType Negotiate>"
 
 #. type: Plain text
-#: cupsd.conf.5:706
+#: cupsd.conf.5:708
 msgid ""
 "Specifies the type of authentication required.  The value \"Default\" "
 "corresponds to the DefaultAuthType value."
@@ -4920,73 +4932,73 @@ msgstr ""
 "entspricht dem Wert »DefaultAuthType«."
 
 #. type: TP
-#: cupsd.conf.5:706
+#: cupsd.conf.5:708
 #, no-wrap
 msgid "B<Deny all>"
 msgstr "B<Deny all>"
 
 #. type: TP
-#: cupsd.conf.5:708
+#: cupsd.conf.5:710
 #, no-wrap
 msgid "B<Deny none>"
 msgstr "B<Deny none>"
 
 #. type: TP
-#: cupsd.conf.5:710
+#: cupsd.conf.5:712
 #, no-wrap
 msgid "B<Deny >I<host.domain.com>"
 msgstr "B<Deny >I<Rechner.domain.com>"
 
 #. type: TP
-#: cupsd.conf.5:712
+#: cupsd.conf.5:714
 #, no-wrap
 msgid "B<Deny *.>I<domain.com>"
 msgstr "B<Deny *.>I<domain.com>"
 
 #. type: TP
-#: cupsd.conf.5:714
+#: cupsd.conf.5:716
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>"
 msgstr "B<Deny >I<IPv4-Adresse>"
 
 #. type: TP
-#: cupsd.conf.5:716
+#: cupsd.conf.5:718
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>B</>I<netmask>"
 msgstr "B<Deny >I<IPv4-Adresse>B</>I<Netzmaske>"
 
 #. type: TP
-#: cupsd.conf.5:718
+#: cupsd.conf.5:720
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>B</>I<mm>"
 msgstr "B<Deny >I<IPv4-Adresse>B</>I<mm>"
 
 #. type: TP
-#: cupsd.conf.5:720
+#: cupsd.conf.5:722
 #, no-wrap
 msgid "B<Deny [>I<ipv6-address>B<]>"
 msgstr "B<Deny [>I<IPv6-Adresse>B<]>"
 
 #. type: TP
-#: cupsd.conf.5:722
+#: cupsd.conf.5:724
 #, no-wrap
 msgid "B<Deny [>I<ipv6-address>B<]/>I<mm>"
 msgstr "B<Deny [>I<IPv6-Adresse>B<]/>I<mm>"
 
 #. type: TP
-#: cupsd.conf.5:724
+#: cupsd.conf.5:726
 #, no-wrap
 msgid "B<Deny @IF(>I<name>B<)>"
 msgstr "B<Deny @IF(>I<Name>B<)>"
 
 #. type: TP
-#: cupsd.conf.5:726
+#: cupsd.conf.5:728
 #, no-wrap
 msgid "B<Deny @LOCAL>"
 msgstr "B<Deny @LOCAL>"
 
 #. type: Plain text
-#: cupsd.conf.5:732
+#: cupsd.conf.5:734
 msgid ""
 "Denies access from the named hosts, domains, addresses, or interfaces.  The "
 "@IF(name) form uses the current subnets configured for the named interface.  "
@@ -5004,7 +5016,7 @@ msgstr ""
 "ob »Allow«-Zeilen vor oder nach »Deny«-Zeilen ausgewertet werden."
 
 #. type: Plain text
-#: cupsd.conf.5:740
+#: cupsd.conf.5:742
 msgid ""
 "Specifies the level of encryption that is required for a particular "
 "location.  The default value is \"IfRequested\"."
@@ -5013,13 +5025,13 @@ msgstr ""
 "fest. Der Vorgabewert ist »IfRequested«."
 
 #. type: TP
-#: cupsd.conf.5:740
+#: cupsd.conf.5:742
 #, no-wrap
 msgid "B<Order allow,deny>"
 msgstr "B<Order allow,deny>"
 
 #. type: Plain text
-#: cupsd.conf.5:743
+#: cupsd.conf.5:745
 msgid ""
 "Specifies that access is denied by default. Allow lines are then processed "
 "followed by Deny lines to determine whether a client may access a particular "
@@ -5030,13 +5042,13 @@ msgstr ""
 "auf eine bestimmte Ressource zugreifen darf."
 
 #. type: TP
-#: cupsd.conf.5:743
+#: cupsd.conf.5:745
 #, no-wrap
 msgid "B<Order deny,allow>"
 msgstr "B<Order deny,allow>"
 
 #. type: Plain text
-#: cupsd.conf.5:746
+#: cupsd.conf.5:748
 msgid ""
 "Specifies that access is allowed by default. Deny lines are then processed "
 "followed by Allow lines to determine whether a client may access a "
@@ -5047,13 +5059,13 @@ msgstr ""
 "eine bestimmte Ressource zugreifen darf."
 
 #. type: TP
-#: cupsd.conf.5:746
+#: cupsd.conf.5:748
 #, no-wrap
 msgid "B<Require group >I<group-name >[ I<group-name >... ]"
 msgstr "B<Require group >I<Gruppenname >[ I<Gruppenname >… ]"
 
 #. type: Plain text
-#: cupsd.conf.5:749
+#: cupsd.conf.5:751
 msgid ""
 "Specifies that an authenticated user must be a member of one of the named "
 "groups."
@@ -5062,13 +5074,13 @@ msgstr ""
 "benannten Gruppen sein muss."
 
 #. type: TP
-#: cupsd.conf.5:749
+#: cupsd.conf.5:751
 #, no-wrap
 msgid "B<Require user {>I<user-name>|B<@>I<group-name>} ..."
 msgstr "B<Require user {>I<Benutzername>|B<@>I<Gruppenname>} …"
 
 #. type: Plain text
-#: cupsd.conf.5:757
+#: cupsd.conf.5:759
 msgid ""
 "Specifies that an authenticated user must match one of the named users or be "
 "a member of one of the named groups.  The group name \"@SYSTEM\" corresponds "
@@ -5088,24 +5100,24 @@ msgstr ""
 "Benutzerkonto übertragen werden."
 
 #. type: TP
-#: cupsd.conf.5:757
+#: cupsd.conf.5:759
 #, no-wrap
 msgid "B<Require valid-user>"
 msgstr "B<Require valid-user>"
 
 #. type: Plain text
-#: cupsd.conf.5:760
+#: cupsd.conf.5:762
 msgid "Specifies that any authenticated user is acceptable."
 msgstr "Legt fest, dass jeder authentifizierte Benutzer akzeptiert wird."
 
 #. type: TP
-#: cupsd.conf.5:760
+#: cupsd.conf.5:762
 #, no-wrap
 msgid "B<Satisfy all>"
 msgstr "B<Satisfy all>"
 
 #. type: Plain text
-#: cupsd.conf.5:763
+#: cupsd.conf.5:765
 msgid ""
 "Specifies that all Allow, AuthType, Deny, Order, and Require conditions must "
 "be satisfied to allow access."
@@ -5114,13 +5126,13 @@ msgstr ""
 "Bedingungen erfüllt sein müssen, damit der Zugriff erlaubt wird."
 
 #. type: TP
-#: cupsd.conf.5:763
+#: cupsd.conf.5:765
 #, no-wrap
 msgid "B<Satisfy any>"
 msgstr "B<Satisfy any>"
 
 #. type: Plain text
-#: cupsd.conf.5:767
+#: cupsd.conf.5:769
 msgid ""
 "Specifies that any a client may access a resource if either the "
 "authentication (AuthType/Require) or address (Allow/Deny/Order) conditions "
@@ -5133,13 +5145,13 @@ msgstr ""
 "werden, Authentifizierung nur bei Zugriff aus der Ferne zu verlangen."
 
 #. type: SS
-#: cupsd.conf.5:767
+#: cupsd.conf.5:769
 #, no-wrap
 msgid "DIRECTIVES VALID WITHIN POLICY SECTIONS"
 msgstr "DIREKTIVEN, DIE INNERHALB VON POLICY-ABSCHNITTEN GÜLTIG SIND"
 
 #. type: Plain text
-#: cupsd.conf.5:769
+#: cupsd.conf.5:771
 msgid ""
 "The following directives may be placed inside Policy sections in the B<cupsd."
 "conf> file:"
@@ -5148,25 +5160,25 @@ msgstr ""
 "Datei B<cupsd.conf> gesetzt werden."
 
 #. type: TP
-#: cupsd.conf.5:769
+#: cupsd.conf.5:771
 #, no-wrap
 msgid "B<JobPrivateAccess all>"
 msgstr "B<JobPrivateAccess all>"
 
 #. type: TP
-#: cupsd.conf.5:771
+#: cupsd.conf.5:773
 #, no-wrap
 msgid "B<JobPrivateAccess default>"
 msgstr "B<JobPrivateAccess default>"
 
 #. type: TP
-#: cupsd.conf.5:773
+#: cupsd.conf.5:775
 #, no-wrap
 msgid "B<JobPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 msgstr "B<JobPrivateAccess >{I<Benutzer>|B<@>I<Gruppe>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} …"
 
 #. type: Plain text
-#: cupsd.conf.5:782
+#: cupsd.conf.5:784
 msgid ""
 "Specifies an access list for a job's private values.  The \"default\" access "
 "list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's requesting-user-"
@@ -5182,31 +5194,31 @@ msgstr ""
 "aufgeführten Gruppen."
 
 #. type: TP
-#: cupsd.conf.5:782
+#: cupsd.conf.5:784
 #, no-wrap
 msgid "B<JobPrivateValues all>"
 msgstr "B<JobPrivateValues all>"
 
 #. type: TP
-#: cupsd.conf.5:784
+#: cupsd.conf.5:786
 #, no-wrap
 msgid "B<JobPrivateValues default>"
 msgstr "B<JobPrivateValues default>"
 
 #. type: TP
-#: cupsd.conf.5:786
+#: cupsd.conf.5:788
 #, no-wrap
 msgid "B<JobPrivateValues none>"
 msgstr "B<JobPrivateValues none>"
 
 #. type: TP
-#: cupsd.conf.5:788
+#: cupsd.conf.5:790
 #, no-wrap
 msgid "B<JobPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
 msgstr "B<JobPrivateValues >I<Attributename >[ … I<Attributname >]"
 
 #. type: Plain text
-#: cupsd.conf.5:792
+#: cupsd.conf.5:794
 msgid ""
 "Specifies the list of job values to make private.  The \"default\" values "
 "are \"job-name\", \"job-originating-host-name\", \"job-originating-user-name"
@@ -5217,25 +5229,25 @@ msgstr ""
 "»job-originating-user-name« und »phone«."
 
 #. type: TP
-#: cupsd.conf.5:792
+#: cupsd.conf.5:794
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess all>"
 msgstr "B<SubscriptionPrivateAccess all>"
 
 #. type: TP
-#: cupsd.conf.5:794
+#: cupsd.conf.5:796
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess default>"
 msgstr "B<SubscriptionPrivateAccess default>"
 
 #. type: TP
-#: cupsd.conf.5:796
+#: cupsd.conf.5:798
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 msgstr "B<SubscriptionPrivateAccess >{I<Benutzer>|B<@>I<Gruppe>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} …"
 
 #. type: Plain text
-#: cupsd.conf.5:805
+#: cupsd.conf.5:807
 msgid ""
 "Specifies an access list for a subscription's private values.  The \"default"
 "\" access list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's "
@@ -5251,31 +5263,31 @@ msgstr ""
 "aufgeführten Gruppen."
 
 #. type: TP
-#: cupsd.conf.5:805
+#: cupsd.conf.5:807
 #, no-wrap
 msgid "B<SubscriptionPrivateValues all>"
 msgstr "B<SubscriptionPrivateValues all>"
 
 #. type: TP
-#: cupsd.conf.5:807
+#: cupsd.conf.5:809
 #, no-wrap
 msgid "B<SubscriptionPrivateValues default>"
 msgstr "B<SubscriptionPrivateValues default>"
 
 #. type: TP
-#: cupsd.conf.5:809
+#: cupsd.conf.5:811
 #, no-wrap
 msgid "B<SubscriptionPrivateValues none>"
 msgstr "B<SubscriptionPrivateValues none>"
 
 #. type: TP
-#: cupsd.conf.5:811
+#: cupsd.conf.5:813
 #, no-wrap
 msgid "B<SubscriptionPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
 msgstr "B<SubscriptionPrivateValues >I<Attributname >[ … I<Attributname >]"
 
 #. type: Plain text
-#: cupsd.conf.5:815
+#: cupsd.conf.5:817
 msgid ""
 "Specifies the list of subscription values to make private.  The \"default\" "
 "values are \"notify-events\", \"notify-pull-method\", \"notify-recipient-uri"
@@ -5286,14 +5298,14 @@ msgstr ""
 "»notify-recipient-uri«, »notify-subscriber-user-name« und »notify-user-data«."
 
 #. type: SS
-#: cupsd.conf.5:815 cups-files.conf.5:236
+#: cupsd.conf.5:817 cups-files.conf.5:236
 #, no-wrap
 msgid "DEPRECATED DIRECTIVES"
 msgstr "VERALTETE DIREKTIVEN"
 
 #. #Classification
 #. type: Plain text
-#: cupsd.conf.5:818
+#: cupsd.conf.5:820
 msgid ""
 "The following directives are deprecated and will be removed in a future "
 "release of CUPS:"
@@ -5302,14 +5314,14 @@ msgstr ""
 "Veröffentlichung von CUPS entfernt werden>:"
 
 #. type: TP
-#: cupsd.conf.5:818
+#: cupsd.conf.5:820
 #, no-wrap
 msgid "B<Classification >I<banner>"
 msgstr "B<Classification >I<Deckblatt>"
 
 #. #ClassifyOverride
 #. type: Plain text
-#: cupsd.conf.5:825
+#: cupsd.conf.5:827
 msgid ""
 "Specifies the security classification of the server.  Any valid banner name "
 "can be used, including \"classified\", \"confidential\", \"secret\", "
@@ -5323,20 +5335,20 @@ msgstr ""
 "gibt es kein Einstufungsdeckblatt."
 
 #. type: TP
-#: cupsd.conf.5:825
+#: cupsd.conf.5:827
 #, no-wrap
 msgid "B<ClassifyOverride Yes>"
 msgstr "B<ClassifyOverride Yes>"
 
 #. type: TP
-#: cupsd.conf.5:827
+#: cupsd.conf.5:829
 #, no-wrap
 msgid "B<ClassifyOverride No>"
 msgstr "B<ClassifyOverride No>"
 
 #. #PageLogFormat
 #. type: Plain text
-#: cupsd.conf.5:833
+#: cupsd.conf.5:835
 msgid ""
 "Specifies whether users may override the classification (cover page) of "
 "individual print jobs using the \"job-sheets\" option.  The default is \"No"
@@ -5347,13 +5359,13 @@ msgstr ""
 "Vorgabe ist »No«."
 
 #. type: TP
-#: cupsd.conf.5:833
+#: cupsd.conf.5:835
 #, no-wrap
 msgid "B<PageLogFormat >I<format-string>"
 msgstr "B<PageLogFormat >I<Formatzeichenkette>"
 
 #. type: Plain text
-#: cupsd.conf.5:838
+#: cupsd.conf.5:840
 msgid ""
 "Specifies the format of PageLog lines.  Sequences beginning with percent (%) "
 "characters are replaced with the corresponding information, while all other "
@@ -5366,7 +5378,7 @@ msgstr ""
 "Prozentsequenzen werden erkannt:"
 
 #. type: Plain text
-#: cupsd.conf.5:848
+#: cupsd.conf.5:850
 #, no-wrap
 msgid ""
 "    \"%%\" inserts a single percent character.\n"
@@ -5389,7 +5401,7 @@ msgstr ""
 
 #. #RIPCache
 #. type: Plain text
-#: cupsd.conf.5:854
+#: cupsd.conf.5:856
 msgid ""
 "The default is the empty string, which disables page logging.  The string "
 "\"%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} "
@@ -5406,13 +5418,13 @@ msgstr ""
 "media-sheets-completed}«, um die Anzahl der gedruckten Blätter einzufügen."
 
 #. type: TP
-#: cupsd.conf.5:854
+#: cupsd.conf.5:856
 #, no-wrap
 msgid "B<RIPCache >I<size>"
 msgstr "B<RIPCache >I<Größe>"
 
 #. type: Plain text
-#: cupsd.conf.5:858
+#: cupsd.conf.5:860
 msgid ""
 "Specifies the maximum amount of memory to use when converting documents into "
 "bitmaps for a printer.  The default is \"128m\"."
@@ -5421,7 +5433,7 @@ msgstr ""
 "Dokumenten in Bitmaps für den Drucker fest. Die Vorgabe ist »128m«."
 
 #. type: Plain text
-#: cupsd.conf.5:862
+#: cupsd.conf.5:864
 msgid ""
 "File, directory, and user configuration directives that used to be allowed "
 "in the B<cupsd.conf> file are now stored in the B<cups-files.conf>(5)  file "
@@ -5433,7 +5445,7 @@ msgstr ""
 "Rechteerweiterung zu vermeiden."
 
 #. type: Plain text
-#: cupsd.conf.5:869
+#: cupsd.conf.5:871
 msgid ""
 "The scheduler MUST be restarted manually after making changes to the B<cupsd."
 "conf> file.  On Linux this is typically done using the B<systemctl>(8)  "
@@ -5445,7 +5457,7 @@ msgstr ""
 "Befehl B<launchctl>(8) verwandt wird."
 
 #. type: Plain text
-#: cupsd.conf.5:873
+#: cupsd.conf.5:875
 msgid ""
 "The @LOCAL macro name can be confusing since the system running B<cupsd> "
 "often belongs to a different set of subnets from its clients."
@@ -5455,7 +5467,7 @@ msgstr ""
 "Clients."
 
 #. type: Plain text
-#: cupsd.conf.5:875
+#: cupsd.conf.5:877
 msgid ""
 "The B<cupsd.conf> file format is based on the Apache HTTP Server "
 "configuration file format."
@@ -5464,14 +5476,14 @@ msgstr ""
 "Konfigurationsdateiformat."
 
 #. type: Plain text
-#: cupsd.conf.5:877
+#: cupsd.conf.5:879
 msgid "Log everything with a maximum log file size of 32 megabytes:"
 msgstr ""
 "Alles protokollieren, mit einer maximalen Protokolldateigröße von 32 "
 "Megabytes:"
 
 #. type: Plain text
-#: cupsd.conf.5:882
+#: cupsd.conf.5:884
 #, no-wrap
 msgid ""
 "    AccessLogLevel all\n"
@@ -5483,12 +5495,12 @@ msgstr ""
 "    MaxLogSize 32m\n"
 
 #. type: Plain text
-#: cupsd.conf.5:885
+#: cupsd.conf.5:887
 msgid "Require authentication for accesses from outside the 10. network:"
 msgstr "Authentifizierung für Zugriffe außerhalb des 10er-Netzes verlangen:"
 
 #. type: Plain text
-#: cupsd.conf.5:894
+#: cupsd.conf.5:896
 #, no-wrap
 msgid ""
 "    E<lt>Location /E<gt>\n"
@@ -5508,7 +5520,7 @@ msgstr ""
 "    E<lt>/LocationE<gt>\n"
 
 #. type: Plain text
-#: cupsd.conf.5:904
+#: cupsd.conf.5:906
 msgid ""
 "B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<mime.convs>(5), "
 "B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), CUPS Online "
@@ -5518,6 +5530,13 @@ msgstr ""
 "B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), CUPS-Online-"
 "Hilfe (http://localhost:631/help)"
 
+#. type: Plain text
+#: cupsd.conf.5:908 cups-files.conf.5:298
+#, fuzzy
+#| msgid "Copyright \\[co] 2007-2019 by Apple Inc."
+msgid "Copyright \\[co] 2020 by Michael R Sweet"
+msgstr "Copyright \\[co] 2007-2019 by Apple Inc."
+
 #. type: TH
 #: cupsd-helper.8:10
 #, no-wrap
@@ -6923,8 +6942,8 @@ msgid ""
 "group is operating system specific but is usually \"lp\" or \"nobody\"."
 msgstr ""
 "Legt den Gruppenname oder deren ID, die für Protokolldateien verwandt wird, "
-"fest. Die Vorgabegruppe ist abhängig vom "
-"Betriebssystem; gewöhnlich ist sie »lp« oder »nobody«."
+"fest. Die Vorgabegruppe ist abhängig vom Betriebssystem; gewöhnlich ist sie "
+"»lp« oder »nobody«."
 
 #. type: TP
 #: cups-files.conf.5:142
@@ -7381,15 +7400,6 @@ msgstr ""
 "convs>(5), B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), "
 "CUPS-Online-Hilfe (http://localhost:631/help)"
 
-#. type: Plain text
-#: cups-files.conf.5:298 cups-lpd.8:118
-msgid ""
-"Copyright \\[co] 2020 by Michael R Sweet Copyright \\[co] 2007-2019 by Apple "
-"Inc."
-msgstr ""
-"Copyright \\[co] 2020 Michael R Sweet Copyright \\[co] 2007-2019 Apple "
-"Inc."
-
 #. type: TH
 #: cupsfilter.8:9
 #, no-wrap
@@ -7932,6 +7942,14 @@ msgstr ""
 "B<cups>(1), B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), CUPS-"
 "Online-Hilfe (http://localhost:631/help), RFC 2569"
 
+#. type: Plain text
+#: cups-lpd.8:118
+msgid ""
+"Copyright \\[co] 2020 by Michael R Sweet Copyright \\[co] 2007-2019 by Apple "
+"Inc."
+msgstr ""
+"Copyright \\[co] 2020 Michael R Sweet Copyright \\[co] 2007-2019 Apple Inc."
+
 #. type: TH
 #: cups-snmp.8:9
 #, no-wrap
@@ -17283,6 +17301,10 @@ msgstr ""
 "B<mime.convs>(5), B<mime.types>(5), B<printers.conf>(5), CUPS-Online-Hilfe "
 "(http://localhost:631/help)"
 
+#, no-wrap
+#~ msgid "16 July 2019"
+#~ msgstr "16. Juli 2019"
+
 #~ msgid ""
 #~ "Specifies that a failed print job should stop the printer unless "
 #~ "otherwise specified for the printer."
diff --git a/debian/manpage-po4a/po/fr.po b/debian/manpage-po4a/po/fr.po
index b4af6e5fa..21d705467 100644
--- a/debian/manpage-po4a/po/fr.po
+++ b/debian/manpage-po4a/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cups-2.0.3-6\n"
-"POT-Creation-Date: 2020-11-27 16:31+0100\n"
+"POT-Creation-Date: 2021-02-03 18:08+0100\n"
 "PO-Revision-Date: 2018-04-25 11:57+0200\n"
 "Last-Translator: Jean-Paul Guillonneau <guillonneau.jeanpaul@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -29,7 +29,7 @@ msgstr "backend"
 
 #. type: TH
 #: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
-#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:11
 #: cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:11
 #: cupsfilter.8:9 cups-lpd.8:11 cups-snmp.8:9 cups-snmp.conf.5:10
 #: cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ipptool.1:9
@@ -59,7 +59,7 @@ msgstr "26 avril 2019"
 # type: TH
 #. type: TH
 #: backend.7:10 cancel.1:10 classes.conf.5:10 client.conf.5:10 cups.1:10
-#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:10
+#: cupsaccept.8:10 cups-config.1:10 cupsctl.8:10 cupsd.8:10 cupsd.conf.5:11
 #: cupsd-helper.8:10 cupsd-logs.5:10 cupsenable.8:10 cups-files.conf.5:11
 #: cupsfilter.8:9 cups-lpd.8:11 cups-snmp.8:9 cups-snmp.conf.5:10
 #: cupstestppd.1:10 filter.7:10 ippevepcl.7:9 ippeveprinter.1:9 ippfind.1:9
@@ -75,7 +75,7 @@ msgstr "Apple Inc."
 # type: SH
 #. type: SH
 #: backend.7:11 cancel.1:11 classes.conf.5:11 client.conf.5:11 cups.1:11
-#: cupsaccept.8:11 cups-config.1:11 cupsctl.8:11 cupsd.8:11 cupsd.conf.5:11
+#: cupsaccept.8:11 cups-config.1:11 cupsctl.8:11 cupsd.8:11 cupsd.conf.5:12
 #: cupsd-helper.8:11 cupsd-logs.5:11 cupsenable.8:11 cups-files.conf.5:12
 #: cupsfilter.8:10 cups-lpd.8:12 cups-snmp.8:10 cups-snmp.conf.5:11
 #: cupstestppd.1:11 filter.7:11 ippevepcl.7:10 ippeveprinter.1:10 ippfind.1:10
@@ -189,7 +189,7 @@ msgstr ""
 # type: SH
 #. type: SH
 #: backend.7:49 cancel.1:37 classes.conf.5:13 client.conf.5:13 cups.1:13
-#: cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:13
+#: cupsaccept.8:40 cups-config.1:49 cupsctl.8:36 cupsd.8:32 cupsd.conf.5:14
 #: cupsd-helper.8:46 cupsd-logs.5:13 cupsenable.8:46 cups-files.conf.5:14
 #: cupsfilter.8:54 cups-lpd.8:24 cups-snmp.8:23 cups-snmp.conf.5:13
 #: cupstestppd.1:51 filter.7:51 ippevepcl.7:22 ippeveprinter.1:84 ippfind.1:32
@@ -701,7 +701,7 @@ msgstr "I</etc/cups/cups-files.conf>"
 # type: SH
 #. type: SH
 #: backend.7:184 backend.7:204 cancel.1:81 classes.conf.5:19 client.conf.5:126
-#: cups.1:122 cupsd.conf.5:858 cupsd-helper.8:77 cups-files.conf.5:279
+#: cups.1:122 cupsd.conf.5:860 cupsd-helper.8:77 cups-files.conf.5:279
 #: cupsfilter.8:117 cups-lpd.8:61 cups-snmp.8:44 cups-snmp.conf.5:58
 #: cupstestppd.1:138 filter.7:201 lpadmin.8:203 lpc.8:40 lpinfo.8:117 lpr.1:151
 #: mime.convs.5:50 ppdc.1:90 ppdcfile.5:149 ppdhtml.1:35 ppdi.1:42
@@ -765,7 +765,7 @@ msgstr ""
 # type: SH
 #. type: SH
 #: backend.7:208 cancel.1:84 classes.conf.5:21 client.conf.5:138 cups.1:126
-#: cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:895
+#: cupsaccept.8:77 cups-config.1:105 cupsctl.8:92 cupsd.8:109 cupsd.conf.5:897
 #: cupsd-helper.8:81 cupsd-logs.5:216 cupsenable.8:88 cups-files.conf.5:286
 #: cupsfilter.8:131 cups-lpd.8:108 cups-snmp.8:49 cups-snmp.conf.5:62
 #: cupstestppd.1:142 filter.7:212 ippevepcl.7:45 ippeveprinter.1:268
@@ -797,7 +797,7 @@ msgstr "Aide en ligne de CUPS : E<lt>URL:I<http://localhost:631/help>E<gt>"
 # type: SH
 #. type: SH
 #: backend.7:219 cancel.1:90 classes.conf.5:29 client.conf.5:142 cups.1:142
-#: cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:904
+#: cupsaccept.8:85 cups-config.1:108 cupsctl.8:97 cupsd.8:125 cupsd.conf.5:906
 #: cupsd-helper.8:89 cupsd-logs.5:221 cupsenable.8:96 cups-files.conf.5:296
 #: cupsfilter.8:138 cups-lpd.8:116 cups-snmp.8:55 cups-snmp.conf.5:65
 #: cupstestppd.1:146 filter.7:220 ippevepcl.7:47 ippeveprinter.1:272
@@ -813,14 +813,15 @@ msgstr "COPYRIGHT"
 # type: Plain text
 #. type: Plain text
 #: backend.7:220 cancel.1:91 classes.conf.5:30 client.conf.5:143 cups.1:143
-#: cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:905
-#: cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cupsfilter.8:139
-#: cups-snmp.8:56 cups-snmp.conf.5:66 cupstestppd.1:147 filter.7:221
-#: ippeveprinter.1:273 ipptool.1:252 ipptoolfile.5:655 lp.1:229 lpadmin.8:231
-#: lpc.8:58 lpinfo.8:125 lpmove.8:74 lpoptions.1:118 lpq.1:64 lpr.1:181
-#: lprm.1:82 lpstat.1:148 mailto.conf.5:44 mime.convs.5:62 mime.types.5:108
-#: notifier.7:36 ppdc.1:102 ppdcfile.5:161 ppdhtml.1:47 ppdi.1:54 ppdmerge.1:50
-#: ppdpo.1:54 printers.conf.5:28 subscriptions.conf.5:31
+#: cupsaccept.8:86 cups-config.1:109 cupsctl.8:98 cupsd.8:126 cupsd.conf.5:909
+#: cupsd-helper.8:90 cupsd-logs.5:222 cupsenable.8:97 cups-files.conf.5:299
+#: cupsfilter.8:139 cups-snmp.8:56 cups-snmp.conf.5:66 cupstestppd.1:147
+#: filter.7:221 ippeveprinter.1:273 ipptool.1:252 ipptoolfile.5:655 lp.1:229
+#: lpadmin.8:231 lpc.8:58 lpinfo.8:125 lpmove.8:74 lpoptions.1:118 lpq.1:64
+#: lpr.1:181 lprm.1:82 lpstat.1:148 mailto.conf.5:44 mime.convs.5:62
+#: mime.types.5:108 notifier.7:36 ppdc.1:102 ppdcfile.5:161 ppdhtml.1:47
+#: ppdi.1:54 ppdmerge.1:50 ppdpo.1:54 printers.conf.5:28
+#: subscriptions.conf.5:31
 msgid "Copyright \\[co] 2007-2019 by Apple Inc."
 msgstr "Copyright 2007-2019 par Apple Inc."
 
@@ -862,7 +863,7 @@ msgstr ""
 # type: SH
 #. type: SH
 #: cancel.1:40 cupsaccept.8:50 cups-config.1:52 cupsctl.8:40 cupsd.8:37
-#: cupsd.conf.5:485 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:33
+#: cupsd.conf.5:487 cupsenable.8:51 cupsfilter.8:59 cups-lpd.8:33
 #: cupstestppd.1:58 filter.7:60 ippeveprinter.1:87 ippfind.1:191 ipptool.1:88
 #: lp.1:94 lpadmin.8:73 lpinfo.8:63 lpmove.8:39 lpoptions.1:68 lpq.1:36
 #: lpr.1:64 lprm.1:36 lpstat.1:68 ppdc.1:48 ppdhtml.1:25 ppdi.1:30
@@ -960,7 +961,7 @@ msgid "Deletes job data files in addition to canceling."
 msgstr "Supprimer les fichiers de données des travaux en plus de l’annulation"
 
 #. type: SH
-#: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:873
+#: cancel.1:61 cups.1:119 cupsaccept.8:67 cupsd.8:81 cupsd.conf.5:875
 #: cupsenable.8:77 cups-lpd.8:47 cups-snmp.8:47 filter.7:199
 #: ippeveprinter.1:207 ipptool.1:229 lp.1:196 lpadmin.8:197 lpinfo.8:97
 #: lpoptions.1:108 lprm.1:52 lpstat.1:133
@@ -983,7 +984,7 @@ msgstr ""
 
 # type: SH
 #. type: SH
-#: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:875
+#: cancel.1:63 cups-config.1:87 cupsctl.8:66 cupsd.8:84 cupsd.conf.5:877
 #: cupstestppd.1:125 ippeveprinter.1:252 ippfind.1:242 ipptool.1:233 lp.1:201
 #: lpinfo.8:99 lpmove.8:50 lpr.1:153 lprm.1:56 mime.convs.5:43 mime.types.5:89
 #, no-wrap
@@ -1234,21 +1235,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: client.conf.5:45 cupsd.conf.5:732
+#: client.conf.5:45 cupsd.conf.5:734
 #, no-wrap
 msgid "B<Encryption IfRequested>"
 msgstr "B<Encryption> I<IfRequested>"
 
 # type: TP
 #. type: TP
-#: client.conf.5:47 cupsd.conf.5:734
+#: client.conf.5:47 cupsd.conf.5:736
 #, no-wrap
 msgid "B<Encryption Never>"
 msgstr "B<Encryption> I<Never>"
 
 # type: TP
 #. type: TP
-#: client.conf.5:49 cupsd.conf.5:736
+#: client.conf.5:49 cupsd.conf.5:738
 #, no-wrap
 msgid "B<Encryption Required>"
 msgstr "B<Encryption> I<Required>"
@@ -1261,7 +1262,7 @@ msgid "Specifies the level of encryption that should be used."
 msgstr "Définir si un chiffrement doit être utilisé."
 
 #. type: TP
-#: client.conf.5:53 cupsd.conf.5:165
+#: client.conf.5:53 cupsd.conf.5:166
 #, no-wrap
 msgid "B<GSSServiceName >I<name>"
 msgstr "B<GSSServiceName> I<nom>"
@@ -1323,20 +1324,20 @@ msgstr ""
 "serveur sous CUPS version 1.3.12 ou précédente."
 
 #. type: TP
-#: client.conf.5:68 cupsd.conf.5:437
+#: client.conf.5:68 cupsd.conf.5:439
 #, no-wrap
 msgid "B<SSLOptions >[I<AllowDH>] [I<AllowRC4>] [I<AllowSSL3>] [I<DenyCBC>] [I<DenyTLS1.0>] [I<MaxTLS1.0>] [I<MaxTLS1.1>] [I<MaxTLS1.2>] [I<MaxTLS1.3>] [I<MinTLS1.0>] [I<MinTLS1.1>] [I<MinTLS1.2>] [I<MinTLS1.3>]"
 msgstr ""
 
 #. type: TP
-#: client.conf.5:70 cupsd.conf.5:439
+#: client.conf.5:70 cupsd.conf.5:441
 #, no-wrap
 msgid "B<SSLOptions None>"
 msgstr "B<SSLOptions> I<None>"
 
 #. #SSLPort
 #. type: Plain text
-#: client.conf.5:85 cupsd.conf.5:454
+#: client.conf.5:85 cupsd.conf.5:456
 #, fuzzy
 msgid ""
 "Sets encryption options (only in /etc/cups/client.conf).  By default, CUPS "
@@ -2920,27 +2921,28 @@ msgstr ""
 
 # type: TH
 #. type: TH
-#: cupsd.conf.5:10
+#: cupsd.conf.5:11
 #, no-wrap
 msgid "cupsd.conf"
 msgstr "cupsd.conf"
 
 # type: TH
 #. type: TH
-#: cupsd.conf.5:10
-#, no-wrap
-msgid "16 July 2019"
-msgstr "16 juillet 2019"
+#: cupsd.conf.5:11
+#, fuzzy, no-wrap
+#| msgid "19 November 2009"
+msgid "28 November 2020"
+msgstr "19 novembre 2009"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:13
+#: cupsd.conf.5:14
 msgid "cupsd.conf - server configuration file for cups"
 msgstr "cupsd.conf - Fichier de configuration du serveur CUPS."
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:25
+#: cupsd.conf.5:26
 #, fuzzy
 msgid ""
 "The I<cupsd.conf> file configures the CUPS scheduler, B<cupsd>(8).  It is "
@@ -2959,7 +2961,7 @@ msgstr ""
 
 # type: SH
 #. type: SS
-#: cupsd.conf.5:25 ipptoolfile.5:83
+#: cupsd.conf.5:26 ipptoolfile.5:83
 #, no-wrap
 msgid "TOP-LEVEL DIRECTIVES"
 msgstr "DIRECTIVES PRINCIPALES"
@@ -2967,34 +2969,34 @@ msgstr "DIRECTIVES PRINCIPALES"
 # type: Plain text
 #. #AccessLogLevel
 #. type: Plain text
-#: cupsd.conf.5:29
+#: cupsd.conf.5:30
 msgid "The following top-level directives are understood by B<cupsd>(8):"
 msgstr "Les directives principales suivantes sont comprises par B<cupsd>(8) :"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:29
+#: cupsd.conf.5:30
 #, no-wrap
 msgid "B<AccessLogLevel config>"
 msgstr "B<AccessLogLevel> I<config>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:31
+#: cupsd.conf.5:32
 #, no-wrap
 msgid "B<AccessLogLevel actions>"
 msgstr "B<AccessLogLevel> I<actions>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:33
+#: cupsd.conf.5:34
 #, no-wrap
 msgid "B<AccessLogLevel all>"
 msgstr "B<AccessLogLevel> I<all>"
 
 #. #AutoPurgeJobs
 #. type: Plain text
-#: cupsd.conf.5:41
+#: cupsd.conf.5:42
 msgid ""
 "Specifies the logging level for the AccessLog file.  The \"config\" level "
 "logs when printers and classes are added, deleted, or modified and when "
@@ -3014,14 +3016,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:41
+#: cupsd.conf.5:42
 #, no-wrap
 msgid "B<AutoPurgeJobs Yes>"
 msgstr "B<AutoPurgeJobs> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:43
+#: cupsd.conf.5:44
 #, no-wrap
 msgid "B<AutoPurgeJobs No>"
 msgstr "B<AutoPurgeJobs> I<No>"
@@ -3029,7 +3031,7 @@ msgstr "B<AutoPurgeJobs> I<No>"
 # type: Plain text
 #. #BrowseDNSSDSubTypes
 #. type: Plain text
-#: cupsd.conf.5:49
+#: cupsd.conf.5:50
 msgid ""
 "Specifies whether to purge job history data automatically when it is no "
 "longer required for quotas.  The default is \"No\"."
@@ -3039,14 +3041,14 @@ msgstr ""
 "défaut, « No »"
 
 #. type: TP
-#: cupsd.conf.5:49
+#: cupsd.conf.5:50
 #, no-wrap
 msgid "B<BrowseDNSSDSubTypes>I<_subtype[,...]>"
 msgstr ""
 
 #. #BrowseLocalProtocols
 #. type: Plain text
-#: cupsd.conf.5:55
+#: cupsd.conf.5:56
 msgid ""
 "Specifies a list of Bonjour sub-types to advertise for each shared printer.  "
 "For example, \"BrowseDNSSDSubTypes _cups,_print\" will tell network clients "
@@ -3057,28 +3059,28 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:55
+#: cupsd.conf.5:56
 #, no-wrap
 msgid "B<BrowseLocalProtocols all>"
 msgstr "B<BrowseLocalProtocols> I<all>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:57
+#: cupsd.conf.5:58
 #, no-wrap
 msgid "B<BrowseLocalProtocols dnssd>"
 msgstr "B<BrowseLocalProtocols> I<dnssd>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:59
+#: cupsd.conf.5:60
 #, no-wrap
 msgid "B<BrowseLocalProtocols none>"
 msgstr "B<BrowseLocalProtocols> I<none>"
 
 #. #BrowseWebIF
 #. type: Plain text
-#: cupsd.conf.5:64
+#: cupsd.conf.5:65
 msgid ""
 "Specifies which protocols to use for local printer sharing.  The default is "
 "\"dnssd\" on systems that support Bonjour and \"none\" otherwise."
@@ -3089,14 +3091,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:64
+#: cupsd.conf.5:65
 #, no-wrap
 msgid "B<BrowseWebIF Yes>"
 msgstr "B<BrowseWebIF> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:66
+#: cupsd.conf.5:67
 #, no-wrap
 msgid "B<BrowseWebIF No>"
 msgstr "B<BrowseWebIF> I<No>"
@@ -3104,7 +3106,7 @@ msgstr "B<BrowseWebIF> I<No>"
 # type: Plain text
 #. #Browsing
 #. type: Plain text
-#: cupsd.conf.5:72
+#: cupsd.conf.5:73
 msgid ""
 "Specifies whether the CUPS web interface is advertised.  The default is \"No"
 "\"."
@@ -3112,14 +3114,14 @@ msgstr "Indiquer si l'interface web de CUPS est avertie. Par défaut « No ».
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:72
+#: cupsd.conf.5:73
 #, no-wrap
 msgid "B<Browsing Yes>"
 msgstr "B<Browsing> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:74
+#: cupsd.conf.5:75
 #, no-wrap
 msgid "B<Browsing No>"
 msgstr "B<Browsing> I<No>"
@@ -3127,21 +3129,21 @@ msgstr "B<Browsing> I<No>"
 # type: Plain text
 #. #DefaultAuthType
 #. type: Plain text
-#: cupsd.conf.5:80
+#: cupsd.conf.5:81
 msgid ""
 "Specifies whether shared printers are advertised.  The default is \"No\"."
 msgstr "Définir si les imprimantes partagées sont averties. Par défaut « No »."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:80
+#: cupsd.conf.5:81
 #, no-wrap
 msgid "B<DefaultAuthType Basic>"
 msgstr "B<DefaultAuthType> I<Basic>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:82
+#: cupsd.conf.5:83
 #, no-wrap
 msgid "B<DefaultAuthType Negotiate>"
 msgstr "B<DefaultAuthType> I<Negotiate>"
@@ -3149,7 +3151,7 @@ msgstr "B<DefaultAuthType> I<Negotiate>"
 # type: Plain text
 #. #DefaultEncryption
 #. type: Plain text
-#: cupsd.conf.5:88
+#: cupsd.conf.5:89
 msgid ""
 "Specifies the default type of authentication to use.  The default is \"Basic"
 "\"."
@@ -3158,21 +3160,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:88
+#: cupsd.conf.5:89
 #, no-wrap
 msgid "B<DefaultEncryption Never>"
 msgstr "B<DefaultEncryption> I<Never>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:90
+#: cupsd.conf.5:91
 #, no-wrap
 msgid "B<DefaultEncryption IfRequested>"
 msgstr "B<DefaultEncryption> I<IfRequested>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:92
+#: cupsd.conf.5:93
 #, no-wrap
 msgid "B<DefaultEncryption Required>"
 msgstr "B<DefaultEncryption> I<Required>"
@@ -3180,7 +3182,7 @@ msgstr "B<DefaultEncryption> I<Required>"
 # type: Plain text
 #. #DefaultLanguage
 #. type: Plain text
-#: cupsd.conf.5:97
+#: cupsd.conf.5:98
 msgid ""
 "Specifies whether encryption will be used for authenticated requests.  The "
 "default is \"Required\"."
@@ -3190,7 +3192,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:97
+#: cupsd.conf.5:98
 #, no-wrap
 msgid "B<DefaultLanguage >I<locale>"
 msgstr "B<DefaultLanguage> I<locale>"
@@ -3198,7 +3200,7 @@ msgstr "B<DefaultLanguage> I<locale>"
 # type: Plain text
 #. #DefaultPaperSize
 #. type: Plain text
-#: cupsd.conf.5:102
+#: cupsd.conf.5:103
 msgid ""
 "Specifies the default language to use for text and web content.  The default "
 "is \"en\"."
@@ -3208,28 +3210,28 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:102
+#: cupsd.conf.5:103
 #, no-wrap
 msgid "B<DefaultPaperSize Auto>"
 msgstr "B<DefaultPaperSize> I<Auto>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:104
+#: cupsd.conf.5:105
 #, no-wrap
 msgid "B<DefaultPaperSize None>"
 msgstr "B<DefaultPaperSize> I<None>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:106
+#: cupsd.conf.5:107
 #, no-wrap
 msgid "B<DefaultPaperSize >I<sizename>"
 msgstr "B<DefaultPaperSize> I<nom_format>"
 
 #. #DefaultPolicy
 #. type: Plain text
-#: cupsd.conf.5:112
+#: cupsd.conf.5:113
 msgid ""
 "Specifies the default paper size for new print queues. \"Auto\" uses a "
 "locale-specific default, while \"None\" specifies there is no default paper "
@@ -3244,7 +3246,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:112
+#: cupsd.conf.5:113
 #, no-wrap
 msgid "B<DefaultPolicy >I<policy-name>"
 msgstr "B<DefaultPolicy> I<nom_politique>"
@@ -3252,7 +3254,7 @@ msgstr "B<DefaultPolicy> I<nom_politique>"
 # type: Plain text
 #. #DefaultShared
 #. type: Plain text
-#: cupsd.conf.5:117
+#: cupsd.conf.5:118
 msgid ""
 "Specifies the default access policy to use.  The default access policy is "
 "\"default\"."
@@ -3260,14 +3262,14 @@ msgstr "Indiquer la politique d'accès par défaut. Par défaut, « default »
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:117
+#: cupsd.conf.5:118
 #, no-wrap
 msgid "B<DefaultShared Yes>"
 msgstr "B<DefaultShared> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:119
+#: cupsd.conf.5:120
 #, no-wrap
 msgid "B<DefaultShared No>"
 msgstr "B<DefaultShared> I<No>"
@@ -3275,7 +3277,7 @@ msgstr "B<DefaultShared> I<No>"
 # type: Plain text
 #. #DirtyCleanInterval
 #. type: Plain text
-#: cupsd.conf.5:124
+#: cupsd.conf.5:125
 msgid ""
 "Specifies whether local printers are shared by default.  The default is \"Yes"
 "\"."
@@ -3285,14 +3287,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:124
+#: cupsd.conf.5:125
 #, no-wrap
 msgid "B<DirtyCleanInterval >I<seconds>"
 msgstr "B<DirtyCleanInterval> I<secondes>"
 
 #. #DNSSDHostName
 #. type: Plain text
-#: cupsd.conf.5:130
+#: cupsd.conf.5:131
 msgid ""
 "Specifies the delay for updating of configuration and state files.  A value "
 "of 0 causes the update to happen as soon as possible, typically within a few "
@@ -3303,7 +3305,7 @@ msgstr ""
 "généralement en quelques millisecondes. Par défaut, B<30>."
 
 #. type: TP
-#: cupsd.conf.5:130
+#: cupsd.conf.5:131
 #, no-wrap
 msgid "B<DNSSDHostName>I<hostname.example.com>"
 msgstr ""
@@ -3311,7 +3313,7 @@ msgstr ""
 # type: Plain text
 #. #ErrorPolicy
 #. type: Plain text
-#: cupsd.conf.5:135
+#: cupsd.conf.5:136
 #, fuzzy
 msgid ""
 "Specifies the fully-qualified domain name for the server that is used for "
@@ -3322,14 +3324,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:135
+#: cupsd.conf.5:136
 #, no-wrap
 msgid "B<ErrorPolicy abort-job>"
 msgstr "B<ErrorPolicy> I<abort-job>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:138
+#: cupsd.conf.5:139
 msgid ""
 "Specifies that a failed print job should be aborted (discarded) unless "
 "otherwise specified for the printer."
@@ -3339,14 +3341,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:138
+#: cupsd.conf.5:139
 #, no-wrap
 msgid "B<ErrorPolicy retry-current-job>"
 msgstr "B<ErrorPolicy retry-current-job>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:141
+#: cupsd.conf.5:142
 msgid ""
 "Specifies that a failed print job should be retried immediately unless "
 "otherwise specified for the printer."
@@ -3356,14 +3358,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:141
+#: cupsd.conf.5:142
 #, no-wrap
 msgid "B<ErrorPolicy retry-job>"
 msgstr "B<ErrorPolicy> I<retry-job>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:144
+#: cupsd.conf.5:145
 msgid ""
 "Specifies that a failed print job should be retried at a later time unless "
 "otherwise specified for the printer."
@@ -3373,7 +3375,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:144
+#: cupsd.conf.5:145
 #, no-wrap
 msgid "B<ErrorPolicy stop-printer>"
 msgstr "B<ErrorPolicy> I<stop-printer>"
@@ -3381,7 +3383,7 @@ msgstr "B<ErrorPolicy> I<stop-printer>"
 # type: Plain text
 #. #FilterLimit
 #. type: Plain text
-#: cupsd.conf.5:148
+#: cupsd.conf.5:149
 #, fuzzy
 #| msgid ""
 #| "Specifies that a failed print job should be retried at a later time "
@@ -3397,14 +3399,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:148
+#: cupsd.conf.5:149
 #, no-wrap
 msgid "B<FilterLimit >I<limit>"
 msgstr "B<FilterLimit >I<limite>"
 
 #. #FilterNice
 #. type: Plain text
-#: cupsd.conf.5:157
+#: cupsd.conf.5:158
 msgid ""
 "Specifies the maximum cost of filters that are run concurrently, which can "
 "be used to minimize disk, memory, and CPU resource problems.  A limit of 0 "
@@ -3425,7 +3427,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:157
+#: cupsd.conf.5:158
 #, no-wrap
 msgid "B<FilterNice >I<nice-value>"
 msgstr "B<FilterNice> I<priorité>"
@@ -3433,7 +3435,7 @@ msgstr "B<FilterNice> I<priorité>"
 # type: Plain text
 #. #GSSServiceName
 #. type: Plain text
-#: cupsd.conf.5:165
+#: cupsd.conf.5:166
 msgid ""
 "Specifies the scheduling priority ( B<nice>(8)  value) of filters that are "
 "run to print a job.  The nice value ranges from 0, the highest priority, to "
@@ -3444,7 +3446,7 @@ msgstr ""
 "haute, à B<19>, la priorité la plus basse. Par défaut B<0>."
 
 #. type: Plain text
-#: cupsd.conf.5:169
+#: cupsd.conf.5:170
 msgid ""
 "Specifies the service name when using Kerberos authentication.  The default "
 "service name is \"http.\""
@@ -3455,28 +3457,28 @@ msgstr ""
 # type: TP
 #. #HostNameLookups
 #. type: TP
-#: cupsd.conf.5:169
+#: cupsd.conf.5:170
 #, no-wrap
 msgid "B<HostNameLookups On>"
 msgstr "B<HostNameLookups> I<On>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:172
+#: cupsd.conf.5:173
 #, no-wrap
 msgid "B<HostNameLookups Off>"
 msgstr "B<HostNameLookups> I<Off>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:174
+#: cupsd.conf.5:175
 #, no-wrap
 msgid "B<HostNameLookups Double>"
 msgstr "B<HostNameLookups> I<Double>"
 
 #. #IdleExitTimeout
 #. type: Plain text
-#: cupsd.conf.5:184
+#: cupsd.conf.5:185
 msgid ""
 "Specifies whether to do reverse lookups on connecting clients.  The \"Double"
 "\" setting causes B<cupsd>(8)  to verify that the hostname resolved from the "
@@ -3496,14 +3498,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:184
+#: cupsd.conf.5:185
 #, no-wrap
 msgid "B<IdleExitTimeout >I<seconds>"
 msgstr "B<IdleExitTimeout> I<secondes>"
 
 #. #JobKillDelay
 #. type: Plain text
-#: cupsd.conf.5:192
+#: cupsd.conf.5:193
 msgid ""
 "Specifies the length of time to wait before shutting down due to "
 "inactivity.  The default is \"60\" seconds.  Note: Only applicable when "
@@ -3514,14 +3516,14 @@ msgstr ""
 "B<cupsd>(8) est exécuté à la demande (par exemple, avec B<-l>)."
 
 #. type: TP
-#: cupsd.conf.5:192
+#: cupsd.conf.5:193
 #, no-wrap
 msgid "B<JobKillDelay >I<seconds>"
 msgstr "B<JobKillDelay> I<secondes>"
 
 #. #JobRetryInterval
 #. type: Plain text
-#: cupsd.conf.5:197
+#: cupsd.conf.5:198
 msgid ""
 "Specifies the number of seconds to wait before killing the filters and "
 "backend associated with a canceled or held job.  The default is \"30\"."
@@ -3532,14 +3534,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:197
+#: cupsd.conf.5:198
 #, no-wrap
 msgid "B<JobRetryInterval >I<seconds>"
 msgstr "B<JobRetryInterval> I<secondes>"
 
 #. #JobRetryLimit
 #. type: Plain text
-#: cupsd.conf.5:203
+#: cupsd.conf.5:204
 msgid ""
 "Specifies the interval between retries of jobs in seconds.  This is "
 "typically used for fax queues but can also be used with normal print queues "
@@ -3554,14 +3556,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:203
+#: cupsd.conf.5:204
 #, no-wrap
 msgid "B<JobRetryLimit >I<count>"
 msgstr "B<JobRetryLimit> I<nombre>"
 
 #. #KeepAlive
 #. type: Plain text
-#: cupsd.conf.5:209
+#: cupsd.conf.5:210
 msgid ""
 "Specifies the number of retries that are done for jobs.  This is typically "
 "used for fax queues but can also be used with normal print queues whose "
@@ -3575,14 +3577,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:209
+#: cupsd.conf.5:210
 #, no-wrap
 msgid "B<KeepAlive Yes>"
 msgstr "B<KeepAlive> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:211
+#: cupsd.conf.5:212
 #, no-wrap
 msgid "B<KeepAlive No>"
 msgstr "B<KeepAlive> I<No>"
@@ -3590,7 +3592,7 @@ msgstr "B<KeepAlive> I<No>"
 # type: Plain text
 #. #KeepAliveTimeout
 #. type: Plain text
-#: cupsd.conf.5:216
+#: cupsd.conf.5:217
 msgid ""
 "Specifies whether to support HTTP keep-alive connections.  The default is "
 "\"Yes\"."
@@ -3600,14 +3602,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:216
+#: cupsd.conf.5:217
 #, no-wrap
 msgid "B<KeepAliveTimeout >I<seconds>"
 msgstr "B<KeepAliveTimeout> I<secondes>"
 
 #. #LimitIPP
 #. type: Plain text
-#: cupsd.conf.5:221
+#: cupsd.conf.5:222
 msgid ""
 "Specifies how long an idle client connection remains open.  The default is "
 "\"30\"."
@@ -3617,7 +3619,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:221
+#: cupsd.conf.5:222
 #, no-wrap
 msgid "B<E<lt>Limit >I<operation >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 msgstr "B<E<lt>Limit >I<opération >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
@@ -3625,7 +3627,7 @@ msgstr "B<E<lt>Limit >I<opération >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 # type: Plain text
 #. #Limit
 #. type: Plain text
-#: cupsd.conf.5:225
+#: cupsd.conf.5:226
 msgid ""
 "Specifies the IPP operations that are being limited inside a Policy section. "
 "IPP operation names are listed below in the section \"IPP OPERATION NAMES\"."
@@ -3635,14 +3637,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:225
+#: cupsd.conf.5:226
 #, no-wrap
 msgid "B<E<lt>Limit >I<method >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 msgstr "B<E<lt>Limit >I<methodes >...B<E<gt> >... B<E<lt>/LimitE<gt>>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:228
+#: cupsd.conf.5:229
 #, no-wrap
 msgid "B<E<lt>LimitExcept >I<method >...B<E<gt> >... B<E<lt>/LimitExceptE<gt>>"
 msgstr "B<E<lt>LimitExcept >I<methodes >...B<E<gt> >... B<E<lt>/LimitExceptE<gt>>"
@@ -3650,7 +3652,7 @@ msgstr "B<E<lt>LimitExcept >I<methodes >...B<E<gt> >... B<E<lt>/LimitExceptE<gt>
 # type: Plain text
 #. #LimitRequestBody
 #. type: Plain text
-#: cupsd.conf.5:232
+#: cupsd.conf.5:233
 msgid ""
 "Specifies the HTTP methods that are being limited inside a Location section. "
 "HTTP method names are listed below in the section \"HTTP METHOD NAMES\"."
@@ -3660,14 +3662,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:232
+#: cupsd.conf.5:233
 #, no-wrap
 msgid "B<LimitRequestBody >I<size>"
 msgstr "B<LimitRequestBody >I<taille>"
 
 #. #Listen
 #. type: Plain text
-#: cupsd.conf.5:237
+#: cupsd.conf.5:238
 msgid ""
 "Specifies the maximum size of print files, IPP requests, and HTML form "
 "data.  The default is \"0\" which disables the limit check."
@@ -3678,40 +3680,50 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:237
+#: cupsd.conf.5:238
 #, no-wrap
 msgid "B<Listen >I<ipv4-address>B<:>I<port>"
 msgstr "B<Listen> I<adresse_ipv4>B<:>I<port>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:239
+#: cupsd.conf.5:240
 #, no-wrap
 msgid "B<Listen [>I<ipv6-address>B<]:>I<port>"
 msgstr "B<Listen> [I<adresse_ipv6>]B<:>I<port>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:241
+#: cupsd.conf.5:242
 #, no-wrap
 msgid "B<Listen *:>I<port>"
 msgstr "B<Listen *:>I<port>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:243
+#: cupsd.conf.5:244
 #, no-wrap
 msgid "B<Listen >I</path/to/domain/socket>"
 msgstr "B<Listen> I</chemin/vers/socket/domaine>"
 
 #. #ListenBackLog
 #. type: Plain text
-#: cupsd.conf.5:249
+#: cupsd.conf.5:251
+#, fuzzy
+#| msgid ""
+#| "Listens to the specified address and port or domain socket path for "
+#| "connections.  Multiple Listen directives can be provided to listen on "
+#| "multiple addresses.  The Listen directive is similar to the Port "
+#| "directive but allows you to restrict access to specific interfaces or "
+#| "networks."
 msgid ""
 "Listens to the specified address and port or domain socket path for "
 "connections.  Multiple Listen directives can be provided to listen on "
 "multiple addresses.  The Listen directive is similar to the Port directive "
-"but allows you to restrict access to specific interfaces or networks."
+"but allows you to restrict access to specific interfaces or networks.  Note: "
+"\"Listen *:I<port>\" and \"Port I<port>\" effectively listen on all IP "
+"addresses, so you cannot combine them with Listen directives for explicit "
+"IPv4 or IPv6 addresses on the same port."
 msgstr ""
 "Écouter les adresse et port indiqués, ou le chemin vers la socket de domaine "
 "pour des connexions. Plusieurs directives Listen peuvent être fournies pour "
@@ -3720,14 +3732,14 @@ msgstr ""
 "particuliers."
 
 #. type: TP
-#: cupsd.conf.5:249
+#: cupsd.conf.5:251
 #, no-wrap
 msgid "B<ListenBackLog >I<number>"
 msgstr "B<ListenBackLog >I<nombre>"
 
 #. #Location
 #. type: Plain text
-#: cupsd.conf.5:256
+#: cupsd.conf.5:258
 msgid ""
 "Specifies the number of pending connections that will be allowed.  This "
 "normally only affects very busy servers that have reached the MaxClients "
@@ -3748,7 +3760,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:256
+#: cupsd.conf.5:258
 #, no-wrap
 msgid "B<E<lt>Location >I</path>B<E<gt> >... B<E<lt>/LocationE<gt>>"
 msgstr "B<E<lt>Emplacement >I</chemin>B<E<gt> >... B<E<lt>/EmplacementE<gt>>"
@@ -3756,7 +3768,7 @@ msgstr "B<E<lt>Emplacement >I</chemin>B<E<gt> >... B<E<lt>/EmplacementE<gt>>"
 # type: Plain text
 #. #LogDebugHistory
 #. type: Plain text
-#: cupsd.conf.5:261
+#: cupsd.conf.5:263
 msgid ""
 "Specifies access control for the named location.  Paths are documented below "
 "in the section \"LOCATION PATHS\"."
@@ -3766,7 +3778,7 @@ msgstr ""
 
 # type: Plain text
 #. type: TP
-#: cupsd.conf.5:261
+#: cupsd.conf.5:263
 #, no-wrap
 msgid "B<LogDebugHistory >I<number>"
 msgstr "B<LogDebugHistory >I<nombre>"
@@ -3774,7 +3786,7 @@ msgstr "B<LogDebugHistory >I<nombre>"
 # type: Plain text
 #. #LogLevel
 #. type: Plain text
-#: cupsd.conf.5:265
+#: cupsd.conf.5:267
 msgid ""
 "Specifies the number of debugging messages that are retained for logging if "
 "an error occurs in a print job. Debug messages are logged regardless of the "
@@ -3786,77 +3798,77 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:265
+#: cupsd.conf.5:267
 #, no-wrap
 msgid "B<LogLevel >none"
 msgstr "B<LogLevel> I<none>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:267
+#: cupsd.conf.5:269
 #, no-wrap
 msgid "B<LogLevel >emerg"
 msgstr "B<LogLevel> I<emerg>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:269
+#: cupsd.conf.5:271
 #, no-wrap
 msgid "B<LogLevel >alert"
 msgstr "B<LogLevel> I<alert>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:271
+#: cupsd.conf.5:273
 #, no-wrap
 msgid "B<LogLevel >crit"
 msgstr "B<LogLevel> I<crit>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:273
+#: cupsd.conf.5:275
 #, no-wrap
 msgid "B<LogLevel >error"
 msgstr "B<LogLevel> I<error>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:275
+#: cupsd.conf.5:277
 #, no-wrap
 msgid "B<LogLevel >warn"
 msgstr "B<LogLevel> I<warn>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:277
+#: cupsd.conf.5:279
 #, no-wrap
 msgid "B<LogLevel >notice"
 msgstr "B<LogLevel> I<notice>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:279
+#: cupsd.conf.5:281
 #, no-wrap
 msgid "B<LogLevel >info"
 msgstr "B<LogLevel> I<info>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:281
+#: cupsd.conf.5:283
 #, no-wrap
 msgid "B<LogLevel >debug"
 msgstr "B<LogLevel> I<debug>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:283
+#: cupsd.conf.5:285
 #, no-wrap
 msgid "B<LogLevel >debug2"
 msgstr "B<LogLevel> I<debug2>"
 
 #. #LogTimeFormat
 #. type: Plain text
-#: cupsd.conf.5:289
+#: cupsd.conf.5:291
 msgid ""
 "Specifies the level of logging for the ErrorLog file.  The value \"none\" "
 "stops all logging while \"debug2\" logs everything.  The default is \"warn\"."
@@ -3866,21 +3878,21 @@ msgstr ""
 "Par défaut, « warn »."
 
 #. type: TP
-#: cupsd.conf.5:289
+#: cupsd.conf.5:291
 #, no-wrap
 msgid "B<LogTimeFormat >standard"
 msgstr "B<LogTimeFormat> I<standard>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:291
+#: cupsd.conf.5:293
 #, no-wrap
 msgid "B<LogTimeFormat >usecs"
 msgstr "B<LogTimeFormat> I<usecs>"
 
 #. #MaxClients
 #. type: Plain text
-#: cupsd.conf.5:296
+#: cupsd.conf.5:298
 msgid ""
 "Specifies the format of the date and time in the log files.  The value "
 "\"standard\" is the default and logs whole seconds while \"usecs\" logs "
@@ -3892,7 +3904,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:296
+#: cupsd.conf.5:298
 #, no-wrap
 msgid "B<MaxClients >I<number>"
 msgstr "B<MaxClients> I<nombre>"
@@ -3900,7 +3912,7 @@ msgstr "B<MaxClients> I<nombre>"
 # type: Plain text
 #. #MaxClientPerHost
 #. type: Plain text
-#: cupsd.conf.5:301
+#: cupsd.conf.5:303
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed by the "
 "scheduler.  The default is \"100\"."
@@ -3910,7 +3922,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:301
+#: cupsd.conf.5:303
 #, no-wrap
 msgid "B<MaxClientsPerHost >I<number>"
 msgstr "B<MaxClientsPerHost> I<nombre>"
@@ -3918,7 +3930,7 @@ msgstr "B<MaxClientsPerHost> I<nombre>"
 # type: Plain text
 #. #MaxCopies
 #. type: Plain text
-#: cupsd.conf.5:307
+#: cupsd.conf.5:309
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed from a "
 "single address.  The default is the MaxClients value."
@@ -3928,7 +3940,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:307
+#: cupsd.conf.5:309
 #, no-wrap
 msgid "B<MaxCopies >I<number>"
 msgstr "B<MaxCopies> I<nombre>"
@@ -3936,7 +3948,7 @@ msgstr "B<MaxCopies> I<nombre>"
 # type: Plain text
 #. #MaxHoldTime
 #. type: Plain text
-#: cupsd.conf.5:312
+#: cupsd.conf.5:314
 msgid ""
 "Specifies the maximum number of copies that a user can print of each job.  "
 "The default is \"9999\"."
@@ -3946,14 +3958,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:312
+#: cupsd.conf.5:314
 #, no-wrap
 msgid "B<MaxHoldTime >I<seconds>"
 msgstr "B<MaxHoldTime> I<secondes>"
 
 #. #MaxJobs
 #. type: Plain text
-#: cupsd.conf.5:317
+#: cupsd.conf.5:319
 msgid ""
 "Specifies the maximum time a job may remain in the \"indefinite\" hold state "
 "before it is canceled.  The default is \"0\" which disables cancellation of "
@@ -3965,14 +3977,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:317
+#: cupsd.conf.5:319
 #, no-wrap
 msgid "B<MaxJobs >I<number>"
 msgstr "B<MaxJobs> I<nombre>"
 
 #. #MaxJobsPerPrinter
 #. type: Plain text
-#: cupsd.conf.5:323
+#: cupsd.conf.5:325
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed.  Set to "
 "\"0\" to allow an unlimited number of jobs.  The default is \"500\"."
@@ -3982,7 +3994,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:323
+#: cupsd.conf.5:325
 #, no-wrap
 msgid "B<MaxJobsPerPrinter >I<number>"
 msgstr "B<MaxJobsPerPrinter> I<nombre>"
@@ -3990,7 +4002,7 @@ msgstr "B<MaxJobsPerPrinter> I<nombre>"
 # type: Plain text
 #. #MaxJobsPerUser
 #. type: Plain text
-#: cupsd.conf.5:328
+#: cupsd.conf.5:330
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "printer.  The default is \"0\" which allows up to MaxJobs jobs per printer."
@@ -4000,7 +4012,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:328
+#: cupsd.conf.5:330
 #, no-wrap
 msgid "B<MaxJobsPerUser >I<number>"
 msgstr "B<MaxJobsPerUser> I<nombre>"
@@ -4008,7 +4020,7 @@ msgstr "B<MaxJobsPerUser> I<nombre>"
 # type: Plain text
 #. #MaxJobTime
 #. type: Plain text
-#: cupsd.conf.5:333
+#: cupsd.conf.5:335
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "user.  The default is \"0\" which allows up to MaxJobs jobs per user."
@@ -4018,14 +4030,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:333
+#: cupsd.conf.5:335
 #, no-wrap
 msgid "B<MaxJobTime >I<seconds>"
 msgstr "B<MaxJobTime> I<secondes>"
 
 #. #MaxLogSize
 #. type: Plain text
-#: cupsd.conf.5:339
+#: cupsd.conf.5:341
 msgid ""
 "Specifies the maximum time a job may take to print before it is canceled.  "
 "Set to \"0\" to disable cancellation of \"stuck\" jobs.  The default is "
@@ -4036,7 +4048,7 @@ msgstr ""
 "bloquées. La valeur par défaut est de 10 800 secondes (3 heures). "
 
 #. type: TP
-#: cupsd.conf.5:339
+#: cupsd.conf.5:341
 #, no-wrap
 msgid "B<MaxLogSize >I<size>"
 msgstr "B<MaxLogSize >I<taille>"
@@ -4044,7 +4056,7 @@ msgstr "B<MaxLogSize >I<taille>"
 # type: Plain text
 #. #MultipleOperationTimeout
 #. type: Plain text
-#: cupsd.conf.5:345
+#: cupsd.conf.5:347
 msgid ""
 "Specifies the maximum size of the log files before they are rotated.  The "
 "value \"0\" disables log rotation.  The default is \"1048576\" (1MB)."
@@ -4054,7 +4066,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:345
+#: cupsd.conf.5:347
 #, no-wrap
 msgid "B<MultipleOperationTimeout >I<seconds>"
 msgstr "B<MultipleOperationTimeout> I<secondes>"
@@ -4062,7 +4074,7 @@ msgstr "B<MultipleOperationTimeout> I<secondes>"
 # type: Plain text
 #. #Policy
 #. type: Plain text
-#: cupsd.conf.5:350
+#: cupsd.conf.5:352
 #, fuzzy
 msgid ""
 "Specifies the maximum amount of time to allow between files in a multiple "
@@ -4073,7 +4085,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:350
+#: cupsd.conf.5:352
 #, no-wrap
 msgid "B<E<lt>Policy >I<name>B<E<gt> >... B<E<lt>/PolicyE<gt>>"
 msgstr "B<E<lt>Policy >I<nom>B<E<gt> >... B<E<lt>/PolicyE<gt>>"
@@ -4081,13 +4093,13 @@ msgstr "B<E<lt>Policy >I<nom>B<E<gt> >... B<E<lt>/PolicyE<gt>>"
 # type: Plain text
 #. #Port
 #. type: Plain text
-#: cupsd.conf.5:354
+#: cupsd.conf.5:356
 msgid "Specifies access control for the named policy."
 msgstr "Définir les contrôles d'accès pour la politique donnée."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:354
+#: cupsd.conf.5:356
 #, no-wrap
 msgid "B<Port >I<number>"
 msgstr "B<Port> I<nombre>"
@@ -4095,34 +4107,34 @@ msgstr "B<Port> I<nombre>"
 # type: Plain text
 #. #PreserveJobFiles
 #. type: Plain text
-#: cupsd.conf.5:358
+#: cupsd.conf.5:360
 msgid "Listens to the specified port number for connections."
 msgstr "Écouter sur le numéro de port indiqué pour des connexions."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:358
+#: cupsd.conf.5:360
 #, no-wrap
 msgid "B<PreserveJobFiles Yes>"
 msgstr "B<PreserveJobFiles> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:360
+#: cupsd.conf.5:362
 #, no-wrap
 msgid "B<PreserveJobFiles No>"
 msgstr "B<PreserveJobFiles> I<No>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:362
+#: cupsd.conf.5:364
 #, no-wrap
 msgid "B<PreserveJobFiles >I<seconds>"
 msgstr "B<PreserveJobFiles> I<secondes>"
 
 #. #PreserveJobHistory
 #. type: Plain text
-#: cupsd.conf.5:368
+#: cupsd.conf.5:370
 msgid ""
 "Specifies whether job files (documents) are preserved after a job is "
 "printed.  If a numeric value is specified, job files are preserved for the "
@@ -4136,28 +4148,28 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:368
+#: cupsd.conf.5:370
 #, no-wrap
 msgid "B<PreserveJobHistory Yes>"
 msgstr "B<PreserveJobHistory> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:370
+#: cupsd.conf.5:372
 #, no-wrap
 msgid "B<PreserveJobHistory No>"
 msgstr "B<PreserveJobHistory> I<No>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:372
+#: cupsd.conf.5:374
 #, no-wrap
 msgid "B<PreserveJobHistory >I<seconds>"
 msgstr "B<PreserveJobHistory> I<secondes>"
 
 #. #ReloadTimeout
 #. type: Plain text
-#: cupsd.conf.5:379
+#: cupsd.conf.5:381
 msgid ""
 "Specifies whether the job history is preserved after a job is printed.  If a "
 "numeric value is specified, the job history is preserved for the indicated "
@@ -4172,7 +4184,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:379
+#: cupsd.conf.5:381
 #, no-wrap
 msgid "B<ReloadTimeout >I<seconds>"
 msgstr "B<ReloadTimeout> I<secondes>"
@@ -4180,7 +4192,7 @@ msgstr "B<ReloadTimeout> I<secondes>"
 # type: Plain text
 #. #ServerAdmin
 #. type: Plain text
-#: cupsd.conf.5:384
+#: cupsd.conf.5:386
 msgid ""
 "Specifies the amount of time to wait for job completion before restarting "
 "the scheduler.  The default is \"30\"."
@@ -4189,7 +4201,7 @@ msgstr ""
 "redémarrer l'ordonnanceur. Par défaut, B<30>."
 
 #. type: TP
-#: cupsd.conf.5:384
+#: cupsd.conf.5:386
 #, no-wrap
 msgid "B<ServerAdmin >I<email-address>"
 msgstr "B<ServerAdmin >I<adresse_courriel>"
@@ -4197,7 +4209,7 @@ msgstr "B<ServerAdmin >I<adresse_courriel>"
 # type: Plain text
 #. #ServerAlias
 #. type: Plain text
-#: cupsd.conf.5:389
+#: cupsd.conf.5:391
 msgid ""
 "Specifies the email address of the server administrator.  The default value "
 "is \"root@ServerName\"."
@@ -4207,20 +4219,20 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:389
+#: cupsd.conf.5:391
 #, no-wrap
 msgid "B<ServerAlias >I<hostname >[ ... I<hostname >]"
 msgstr "B<ServerAlias> I<nom_hôte> [... I<nom_hôte>]"
 
 #. type: TP
-#: cupsd.conf.5:391
+#: cupsd.conf.5:393
 #, no-wrap
 msgid "B<ServerAlias *>"
 msgstr "B<ServerAlias *>"
 
 #. #ServerName
 #. type: Plain text
-#: cupsd.conf.5:397
+#: cupsd.conf.5:399
 msgid ""
 "The ServerAlias directive is used for HTTP Host header validation when "
 "clients connect to the scheduler from external interfaces.  Using the "
@@ -4239,7 +4251,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:397
+#: cupsd.conf.5:399
 #, no-wrap
 msgid "B<ServerName >I<hostname>"
 msgstr "B<ServerName> I<nom_hôte>"
@@ -4247,7 +4259,7 @@ msgstr "B<ServerName> I<nom_hôte>"
 # type: Plain text
 #. #ServerTokens
 #. type: Plain text
-#: cupsd.conf.5:404
+#: cupsd.conf.5:406
 msgid ""
 "Specifies the fully-qualified hostname of the server.  The default is the "
 "value reported by the B<hostname>(1)  command."
@@ -4257,56 +4269,56 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:404
+#: cupsd.conf.5:406
 #, no-wrap
 msgid "B<ServerTokens None>"
 msgstr "B<ServerTokens> I<None>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:406
+#: cupsd.conf.5:408
 #, no-wrap
 msgid "B<ServerTokens ProductOnly>"
 msgstr "B<ServerTokens> I<ProductOnly>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:408
+#: cupsd.conf.5:410
 #, no-wrap
 msgid "B<ServerTokens Major>"
 msgstr "B<ServerTokens> I<Major>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:410
+#: cupsd.conf.5:412
 #, no-wrap
 msgid "B<ServerTokens Minor>"
 msgstr "B<ServerTokens> I<Minor>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:412
+#: cupsd.conf.5:414
 #, no-wrap
 msgid "B<ServerTokens Minimal>"
 msgstr "B<ServerTokens> I<Minimal>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:414
+#: cupsd.conf.5:416
 #, no-wrap
 msgid "B<ServerTokens OS>"
 msgstr "B<ServerTokens> I<OS>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:416
+#: cupsd.conf.5:418
 #, no-wrap
 msgid "B<ServerTokens Full>"
 msgstr "B<ServerTokens> I<Full>"
 
 #. #SSLListen
 #. type: Plain text
-#: cupsd.conf.5:428
+#: cupsd.conf.5:430
 #, fuzzy
 msgid ""
 "Specifies what information is included in the Server header of HTTP "
@@ -4326,21 +4338,21 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:428
+#: cupsd.conf.5:430
 #, no-wrap
 msgid "B<SSLListen >I<ipv4-address>B<:>I<port>"
 msgstr "B<SSLListen> I<adresse_ipv4>B<:>I<port>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:430
+#: cupsd.conf.5:432
 #, no-wrap
 msgid "B<SSLListen [>I<ipv6-address>B<]:>I<port>"
 msgstr "B<SSListen> I<adresse_ipv6>B<:>I<port>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:432
+#: cupsd.conf.5:434
 #, no-wrap
 msgid "B<SSLListen *:>I<port>"
 msgstr "B<SSListen *:>I<port>"
@@ -4348,14 +4360,14 @@ msgstr "B<SSListen *:>I<port>"
 # type: Plain text
 #. #SSLOptions
 #. type: Plain text
-#: cupsd.conf.5:436
+#: cupsd.conf.5:438
 msgid "Listens on the specified address and port for encrypted connections."
 msgstr ""
 "Écouter à l'adresse et au port indiqués pour les connexions sécurisées."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:454
+#: cupsd.conf.5:456
 #, no-wrap
 msgid "B<SSLPort >I<port>"
 msgstr "B<SSLPort >I<port>"
@@ -4363,25 +4375,25 @@ msgstr "B<SSLPort >I<port>"
 # type: Plain text
 #. #StrictConformance
 #. type: Plain text
-#: cupsd.conf.5:458
+#: cupsd.conf.5:460
 msgid "Listens on the specified port for encrypted connections."
 msgstr "Écouter sur le port indiqué pour les connexions sécurisées."
 
 #. type: TP
-#: cupsd.conf.5:458
+#: cupsd.conf.5:460
 #, no-wrap
 msgid "B<StrictConformance Yes>"
 msgstr "B<StrictConformance> I<Yes>"
 
 #. type: TP
-#: cupsd.conf.5:460
+#: cupsd.conf.5:462
 #, no-wrap
 msgid "B<StrictConformance No>"
 msgstr "B<StrictConformance> I<No>"
 
 #. #Timeout
 #. type: Plain text
-#: cupsd.conf.5:465
+#: cupsd.conf.5:467
 msgid ""
 "Specifies whether the scheduler requires clients to strictly adhere to the "
 "IPP specifications.  The default is \"No\"."
@@ -4391,7 +4403,7 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:465
+#: cupsd.conf.5:467
 #, no-wrap
 msgid "B<Timeout >I<seconds>"
 msgstr "B<Timeout> I<secondes>"
@@ -4399,7 +4411,7 @@ msgstr "B<Timeout> I<secondes>"
 # type: Plain text
 #. #WebInterface
 #. type: Plain text
-#: cupsd.conf.5:470
+#: cupsd.conf.5:472
 #, fuzzy
 msgid ""
 "Specifies the HTTP request timeout.  The default is \"900\" (15 minutes)."
@@ -4407,43 +4419,43 @@ msgstr ""
 "Définir le délai d'attente des requêtes HTTP. Par défaut, B<300> (5 minutes)."
 
 #. type: TP
-#: cupsd.conf.5:470
+#: cupsd.conf.5:472
 #, no-wrap
 msgid "B<WebInterface yes>"
 msgstr "B<WebInterface> I<yes>"
 
 #. type: TP
-#: cupsd.conf.5:472
+#: cupsd.conf.5:474
 #, no-wrap
 msgid "B<WebInterface no>"
 msgstr "B<WebInterface> I<no>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:476
+#: cupsd.conf.5:478
 msgid "Specifies whether the web interface is enabled.  The default is \"No\"."
 msgstr "Indiquer si l'interface web est activée. Par défaut, « No »."
 
 #. type: SS
-#: cupsd.conf.5:476
+#: cupsd.conf.5:478
 #, no-wrap
 msgid "HTTP METHOD NAMES"
 msgstr "NOMS DES MÉTHODES HTTP"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:479
+#: cupsd.conf.5:481
 msgid "The following HTTP methods are supported by B<cupsd>(8):"
 msgstr "Les méthodes suivantes sont reconnues par B<cupsd>(8) :"
 
 #. type: TP
-#: cupsd.conf.5:479
+#: cupsd.conf.5:481
 #, no-wrap
 msgid "GET"
 msgstr "GET"
 
 #. type: Plain text
-#: cupsd.conf.5:482
+#: cupsd.conf.5:484
 msgid ""
 "Used by a client to download icons and other printer resources and to access "
 "the CUPS web interface."
@@ -4452,13 +4464,13 @@ msgstr ""
 "et accession à l’interface web de CUPS."
 
 #. type: TP
-#: cupsd.conf.5:482
+#: cupsd.conf.5:484
 #, no-wrap
 msgid "HEAD"
 msgstr "HEAD"
 
 #. type: Plain text
-#: cupsd.conf.5:485
+#: cupsd.conf.5:487
 msgid ""
 "Used by a client to get the type, size, and modification date of resources."
 msgstr ""
@@ -4466,18 +4478,18 @@ msgstr ""
 "ressources."
 
 #. type: Plain text
-#: cupsd.conf.5:488
+#: cupsd.conf.5:490
 msgid "Used by a client to establish a secure (SSL/TLS) connection."
 msgstr "Établissement par un client d’une connexion sécurisée (SSL ou TLS)."
 
 #. type: TP
-#: cupsd.conf.5:488
+#: cupsd.conf.5:490
 #, no-wrap
 msgid "POST"
 msgstr "POST"
 
 #. type: Plain text
-#: cupsd.conf.5:491
+#: cupsd.conf.5:493
 msgid ""
 "Used by a client to submit IPP requests and HTML forms from the CUPS web "
 "interface."
@@ -4486,426 +4498,426 @@ msgstr ""
 "de l’interface web de CUPS."
 
 #. type: TP
-#: cupsd.conf.5:491
+#: cupsd.conf.5:493
 #, no-wrap
 msgid "PUT"
 msgstr "PUT"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:494
+#: cupsd.conf.5:496
 msgid "Used by a client to upload configuration files."
 msgstr "Téléversement par un client de fichiers de configuration."
 
 # type: SH
 #. type: SS
-#: cupsd.conf.5:494
+#: cupsd.conf.5:496
 #, no-wrap
 msgid "IPP OPERATION NAMES"
 msgstr "NOMS D’OPÉRATIONS IPP"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:497
+#: cupsd.conf.5:499
 msgid "The following IPP operations are supported by B<cupsd>(8):"
 msgstr "Les opérations IPP suivantes sont reconnues par B<cupsd>(8) :"
 
 #. type: TP
-#: cupsd.conf.5:497
+#: cupsd.conf.5:499
 #, no-wrap
 msgid "CUPS-Accept-Jobs"
 msgstr "CUPS-Accept-Jobs"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:500
+#: cupsd.conf.5:502
 msgid "Allows a printer to accept new jobs."
 msgstr "Permettre à l'imprimante d’accepter de nouveaux travaux d'impression."
 
 #. type: TP
-#: cupsd.conf.5:500
+#: cupsd.conf.5:502
 #, no-wrap
 msgid "CUPS-Add-Modify-Class"
 msgstr "CUPS-Add-Modify-Class"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:503
+#: cupsd.conf.5:505
 msgid "Adds or modifies a printer class."
 msgstr "Ajouter ou modifier une classe d'imprimantes."
 
 #. type: TP
-#: cupsd.conf.5:503
+#: cupsd.conf.5:505
 #, no-wrap
 msgid "CUPS-Add-Modify-Printer"
 msgstr "CUPS-Add-Modify-Printer"
 
 #. type: Plain text
-#: cupsd.conf.5:506
+#: cupsd.conf.5:508
 msgid "Adds or modifies a printer."
 msgstr "Ajouter ou modifier une imprimante."
 
 #. type: TP
-#: cupsd.conf.5:506
+#: cupsd.conf.5:508
 #, no-wrap
 msgid "CUPS-Authenticate-Job"
 msgstr "CUPS-Authenticate-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:509
+#: cupsd.conf.5:511
 msgid "Releases a job that is held for authentication."
 msgstr "Valider un travail mis en attente pour authentification."
 
 #. type: TP
-#: cupsd.conf.5:509
+#: cupsd.conf.5:511
 #, no-wrap
 msgid "CUPS-Delete-Class"
 msgstr "CUPS-Delete-Class"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:512
+#: cupsd.conf.5:514
 msgid "Deletes a printer class."
 msgstr "Supprimer une classe d'imprimantes."
 
 #. type: TP
-#: cupsd.conf.5:512
+#: cupsd.conf.5:514
 #, no-wrap
 msgid "CUPS-Delete-Printer"
 msgstr "CUPS-Delete-Printer"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:515
+#: cupsd.conf.5:517
 msgid "Deletes a printer."
 msgstr "Supprimer une imprimante."
 
 #. type: TP
-#: cupsd.conf.5:515
+#: cupsd.conf.5:517
 #, no-wrap
 msgid "CUPS-Get-Classes"
 msgstr "CUPS-Get-Classes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:518
+#: cupsd.conf.5:520
 msgid "Gets a list of printer classes."
 msgstr "Obtenir une liste de classes d'imprimantes."
 
 #. type: TP
-#: cupsd.conf.5:518
+#: cupsd.conf.5:520
 #, no-wrap
 msgid "CUPS-Get-Default"
 msgstr "CUPS-Get-Default"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:521
+#: cupsd.conf.5:523
 msgid "Gets the server default printer or printer class."
 msgstr "Obtenir l’imprimante ou la classe d’imprimantes par défaut du serveur."
 
 #. type: TP
-#: cupsd.conf.5:521
+#: cupsd.conf.5:523
 #, no-wrap
 msgid "CUPS-Get-Devices"
 msgstr "CUPS-Get-Devices"
 
 #. type: Plain text
-#: cupsd.conf.5:524
+#: cupsd.conf.5:526
 msgid "Gets a list of devices that are currently available."
 msgstr "Obtenir la liste des périphériques disponibles à ce moment."
 
 #. type: TP
-#: cupsd.conf.5:524
+#: cupsd.conf.5:526
 #, no-wrap
 msgid "CUPS-Get-Document"
 msgstr "CUPS-Get-Document"
 
 #. type: Plain text
-#: cupsd.conf.5:527
+#: cupsd.conf.5:529
 msgid "Gets a document file for a job."
 msgstr "Obtenir un fichier de document à imprimer."
 
 #. type: TP
-#: cupsd.conf.5:527
+#: cupsd.conf.5:529
 #, no-wrap
 msgid "CUPS-Get-PPD"
 msgstr "CUPS-Get-PPD"
 
 #. type: Plain text
-#: cupsd.conf.5:530
+#: cupsd.conf.5:532
 msgid "Gets a PPD file."
 msgstr "Obtenir un fichier PPD."
 
 #. type: TP
-#: cupsd.conf.5:530
+#: cupsd.conf.5:532
 #, no-wrap
 msgid "CUPS-Get-PPDs"
 msgstr "CUPS-Get-PPDs"
 
 #. type: Plain text
-#: cupsd.conf.5:533
+#: cupsd.conf.5:535
 msgid "Gets a list of installed PPD files."
 msgstr "Obtenir la liste des fichiers installés."
 
 #. type: TP
-#: cupsd.conf.5:533
+#: cupsd.conf.5:535
 #, no-wrap
 msgid "CUPS-Get-Printers"
 msgstr "CUPS-Get-Printers"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:536
+#: cupsd.conf.5:538
 msgid "Gets a list of printers."
 msgstr "Obtenir la liste des imprimantes."
 
 #. type: TP
-#: cupsd.conf.5:536
+#: cupsd.conf.5:538
 #, no-wrap
 msgid "CUPS-Move-Job"
 msgstr "CUPS-Move-Job"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:539
+#: cupsd.conf.5:541
 msgid "Moves a job."
 msgstr "Déplacer un travail."
 
 #. type: TP
-#: cupsd.conf.5:539
+#: cupsd.conf.5:541
 #, no-wrap
 msgid "CUPS-Reject-Jobs"
 msgstr "CUPS-Reject-Jobs"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:542
+#: cupsd.conf.5:544
 msgid "Prevents a printer from accepting new jobs."
 msgstr "Empêcher une imprimante d’accepter de nouveaux travaux."
 
 #. type: TP
-#: cupsd.conf.5:542
+#: cupsd.conf.5:544
 #, no-wrap
 msgid "CUPS-Set-Default"
 msgstr "CUPS-Set-Default"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:545
+#: cupsd.conf.5:547
 msgid "Sets the server default printer or printer class."
 msgstr "Définir l’imprimante ou la classe d’imprimantes par défaut du serveur."
 
 # type: TH
 #. type: TP
-#: cupsd.conf.5:545
+#: cupsd.conf.5:547
 #, no-wrap
 msgid "Cancel-Job"
 msgstr "Cancel-Job"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:548
+#: cupsd.conf.5:550
 msgid "Cancels a job."
 msgstr "Annuler un travail."
 
 #. type: TP
-#: cupsd.conf.5:548
+#: cupsd.conf.5:550
 #, no-wrap
 msgid "Cancel-Jobs"
 msgstr "Cancel-Jobs"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:551
+#: cupsd.conf.5:553
 msgid "Cancels one or more jobs."
 msgstr "Annuler un ou plusieurs travaux."
 
 #. type: TP
-#: cupsd.conf.5:551
+#: cupsd.conf.5:553
 #, no-wrap
 msgid "Cancel-My-Jobs"
 msgstr "Cancel-My-Jobs"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:554
+#: cupsd.conf.5:556
 msgid "Cancels one or more jobs creates by a user."
 msgstr "Annuler un ou plusieurs travaux d’un utilisateur."
 
 #. type: TP
-#: cupsd.conf.5:554
+#: cupsd.conf.5:556
 #, no-wrap
 msgid "Cancel-Subscription"
 msgstr "Cancel-Subscription"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:557
+#: cupsd.conf.5:559
 msgid "Cancels a subscription."
 msgstr "Annuler un abonnement."
 
 #. type: TP
-#: cupsd.conf.5:557
+#: cupsd.conf.5:559
 #, no-wrap
 msgid "Close-Job"
 msgstr "Close-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:560
+#: cupsd.conf.5:562
 msgid "Closes a job that is waiting for more documents."
 msgstr "Arrêter un travail attendant plus de documents."
 
 #. type: TP
-#: cupsd.conf.5:560
+#: cupsd.conf.5:562
 #, no-wrap
 msgid "Create-Job"
 msgstr "Create-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:563
+#: cupsd.conf.5:565
 msgid "Creates a new job with no documents."
 msgstr "Créer un nouveau travail sans document."
 
 #. type: TP
-#: cupsd.conf.5:563
+#: cupsd.conf.5:565
 #, no-wrap
 msgid "Create-Job-Subscriptions"
 msgstr "Create-Job-Subscriptions"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:566
+#: cupsd.conf.5:568
 msgid "Creates a subscription for job events."
 msgstr "Créer un abonnement pour les évènements concernant les travaux."
 
 #. type: TP
-#: cupsd.conf.5:566
+#: cupsd.conf.5:568
 #, no-wrap
 msgid "Create-Printer-Subscriptions"
 msgstr "Create-Printer-Subscriptions"
 
 #. type: Plain text
-#: cupsd.conf.5:569
+#: cupsd.conf.5:571
 msgid "Creates a subscription for printer events."
 msgstr "Créer un abonnement pour les évènements concernant les imprimantes."
 
 #. type: TP
-#: cupsd.conf.5:569
+#: cupsd.conf.5:571
 #, no-wrap
 msgid "Get-Job-Attributes"
 msgstr "Get-Job-Attributes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:572
+#: cupsd.conf.5:574
 msgid "Gets information about a job."
 msgstr "Obtenir des informations concernant un travail."
 
 #. type: TP
-#: cupsd.conf.5:572
+#: cupsd.conf.5:574
 #, no-wrap
 msgid "Get-Jobs"
 msgstr "Get-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:575
+#: cupsd.conf.5:577
 msgid "Gets a list of jobs."
 msgstr "Obtenir la liste des travaux."
 
 #. type: TP
-#: cupsd.conf.5:575
+#: cupsd.conf.5:577
 #, no-wrap
 msgid "Get-Notifications"
 msgstr "Get-Notifications"
 
 #. type: Plain text
-#: cupsd.conf.5:578
+#: cupsd.conf.5:580
 msgid "Gets a list of event notifications for a subscription."
 msgstr "Obtenir la liste des notifications d’évènement pour un abonnement."
 
 #. type: TP
-#: cupsd.conf.5:578
+#: cupsd.conf.5:580
 #, no-wrap
 msgid "Get-Printer-Attributes"
 msgstr "Get-Printer-Attributes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:581
+#: cupsd.conf.5:583
 msgid "Gets information about a printer or printer class."
 msgstr "Obtenir des informations sur une imprimante ou une classe."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:581
+#: cupsd.conf.5:583
 #, no-wrap
 msgid "Get-Subscription-Attributes"
 msgstr "Get-Subscription-Attributes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:584
+#: cupsd.conf.5:586
 msgid "Gets information about a subscription."
 msgstr "Obtenir des informations à propos d’un abonnement."
 
 # type: TH
 #. type: TP
-#: cupsd.conf.5:584
+#: cupsd.conf.5:586
 #, no-wrap
 msgid "Get-Subscriptions"
 msgstr "Get-Subscriptions"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:587
+#: cupsd.conf.5:589
 msgid "Gets a list of subscriptions."
 msgstr "Obtenir une liste d’abonnements."
 
 #. type: TP
-#: cupsd.conf.5:587
+#: cupsd.conf.5:589
 #, no-wrap
 msgid "Hold-Job"
 msgstr "Hold-Job"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:590
+#: cupsd.conf.5:592
 msgid "Holds a job from printing."
 msgstr "Suspendre l'impression d'un travail."
 
 #. type: TP
-#: cupsd.conf.5:590
+#: cupsd.conf.5:592
 #, no-wrap
 msgid "Hold-New-Jobs"
 msgstr "Hold-New-Jobs"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:593
+#: cupsd.conf.5:595
 msgid "Holds all new jobs from printing."
 msgstr "Suspendre l'impression de tous les nouveaux travaux."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:593
+#: cupsd.conf.5:595
 #, no-wrap
 msgid "Pause-Printer"
 msgstr "Pause-Printer"
 
 #. type: Plain text
-#: cupsd.conf.5:596
+#: cupsd.conf.5:598
 msgid "Stops processing of jobs by a printer or printer class."
 msgstr "Arrêter le déroulement des travaux pour une imprimante ou une classe."
 
 #. type: TP
-#: cupsd.conf.5:596
+#: cupsd.conf.5:598
 #, no-wrap
 msgid "Pause-Printer-After-Current-Job"
 msgstr "Pause-Printer-After-Current-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:599
+#: cupsd.conf.5:601
 msgid ""
 "Stops processing of jobs by a printer or printer class after the current job "
 "is finished."
@@ -4915,156 +4927,156 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:599
+#: cupsd.conf.5:601
 #, no-wrap
 msgid "Print-Job"
 msgstr "Print-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:602
+#: cupsd.conf.5:604
 msgid "Creates a new job with a single document."
 msgstr "Créer un nouveau travail avec un document unique."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:602
+#: cupsd.conf.5:604
 #, no-wrap
 msgid "Purge-Jobs"
 msgstr "Purge-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:605
+#: cupsd.conf.5:607
 msgid "Cancels one or more jobs and deletes the job history."
 msgstr "Annuler un ou plusieurs travaux et supprimer l’historique des travaux."
 
 #. type: TP
-#: cupsd.conf.5:605
+#: cupsd.conf.5:607
 #, no-wrap
 msgid "Release-Held-New-Jobs"
 msgstr "Release-Held-New-Jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:608
+#: cupsd.conf.5:610
 msgid "Allows previously held jobs to print."
 msgstr "Autoriser des travaux précédemment suspendus."
 
 #. type: TP
-#: cupsd.conf.5:608
+#: cupsd.conf.5:610
 #, no-wrap
 msgid "Release-Job"
 msgstr "Release-Job"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:611
+#: cupsd.conf.5:613
 msgid "Allows a job to print."
 msgstr "Autoriser l’impression d’un travail."
 
 # type: Plain text
 #. type: TP
-#: cupsd.conf.5:611
+#: cupsd.conf.5:613
 #, no-wrap
 msgid "Renew-Subscription"
 msgstr "Renew-Subscription"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:614
+#: cupsd.conf.5:616
 msgid "Renews a subscription."
 msgstr "Renouveler un abonnement."
 
 #. type: TP
-#: cupsd.conf.5:614
+#: cupsd.conf.5:616
 #, no-wrap
 msgid "Restart-Job"
 msgstr "Restart-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:617
+#: cupsd.conf.5:619
 msgid "Reprints a job, if possible."
 msgstr "Réimprimer un travail si possible."
 
 #. type: TP
-#: cupsd.conf.5:617
+#: cupsd.conf.5:619
 #, no-wrap
 msgid "Send-Document"
 msgstr "Send-Document"
 
 #. type: Plain text
-#: cupsd.conf.5:620
+#: cupsd.conf.5:622
 msgid "Adds a document to a job."
 msgstr "Ajouter un document au travail."
 
 #. type: TP
-#: cupsd.conf.5:620
+#: cupsd.conf.5:622
 #, no-wrap
 msgid "Set-Job-Attributes"
 msgstr "Set-Job-Attributes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:623
+#: cupsd.conf.5:625
 msgid "Changes job information."
 msgstr "Modifier l’information sur le travail."
 
 #. type: TP
-#: cupsd.conf.5:623
+#: cupsd.conf.5:625
 #, no-wrap
 msgid "Set-Printer-Attributes"
 msgstr "Set-Printer-Attributes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:626
+#: cupsd.conf.5:628
 msgid "Changes printer or printer class information."
 msgstr "Modifier l’information sur une imprimante ou une classe d’imprimantes."
 
 #. type: TP
-#: cupsd.conf.5:626
+#: cupsd.conf.5:628
 #, no-wrap
 msgid "Validate-Job"
 msgstr "Validate-Job"
 
 #. type: Plain text
-#: cupsd.conf.5:629
+#: cupsd.conf.5:631
 msgid "Validates options for a new job."
 msgstr "Valider les options pour un nouveau travail."
 
 #. type: SS
-#: cupsd.conf.5:629
+#: cupsd.conf.5:631
 #, no-wrap
 msgid "LOCATION PATHS"
 msgstr "CHEMINS D’ACCÈS"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:632
+#: cupsd.conf.5:634
 msgid "The following paths are commonly used when configuring B<cupsd>(8):"
 msgstr ""
 "Les chemins suivants sont couramment utilisés lors de la configuration de "
 "B<cupsd>(8) :"
 
 #. type: TP
-#: cupsd.conf.5:632
+#: cupsd.conf.5:634
 #, no-wrap
 msgid "/"
 msgstr "/"
 
 #. type: Plain text
-#: cupsd.conf.5:635
+#: cupsd.conf.5:637
 msgid "The path for all get operations (get-printers, get-jobs, etc.)"
 msgstr ""
 "Chemin pour toutes les opérations « get » (get-printers, get-jobs, etc.)"
 
 # type: TH
 #. type: TP
-#: cupsd.conf.5:635
+#: cupsd.conf.5:637
 #, no-wrap
 msgid "/admin"
 msgstr "/admin"
 
 #. type: Plain text
-#: cupsd.conf.5:638
+#: cupsd.conf.5:640
 msgid ""
 "The path for all administration operations (add-printer, delete-printer, "
 "start-printer, etc.)"
@@ -5073,13 +5085,13 @@ msgstr ""
 "printer, start-printer, etc.)"
 
 #. type: TP
-#: cupsd.conf.5:638
+#: cupsd.conf.5:640
 #, no-wrap
 msgid "/admin/conf"
 msgstr "/admin/conf"
 
 #. type: Plain text
-#: cupsd.conf.5:641
+#: cupsd.conf.5:643
 msgid ""
 "The path for access to the CUPS configuration files (cupsd.conf, client."
 "conf, etc.)"
@@ -5088,13 +5100,13 @@ msgstr ""
 "client.conf, etc.)"
 
 #. type: TP
-#: cupsd.conf.5:641
+#: cupsd.conf.5:643
 #, no-wrap
 msgid "/admin/log"
 msgstr "/admin/log"
 
 #. type: Plain text
-#: cupsd.conf.5:644
+#: cupsd.conf.5:646
 msgid ""
 "The path for access to the CUPS log files (access_log, error_log, page_log)"
 msgstr ""
@@ -5103,112 +5115,112 @@ msgstr ""
 
 # type: TH
 #. type: TP
-#: cupsd.conf.5:644
+#: cupsd.conf.5:646
 #, no-wrap
 msgid "/classes"
 msgstr "/classes"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:647
+#: cupsd.conf.5:649
 msgid "The path for all printer classes"
 msgstr "Chemin pour toutes les classes d’imprimantes."
 
 # type: TH
 #. type: TP
-#: cupsd.conf.5:647
+#: cupsd.conf.5:649
 #, no-wrap
 msgid "/classes/name"
 msgstr "/classes/nom"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:650
+#: cupsd.conf.5:652
 msgid "The resource for the named printer class"
 msgstr "Ressource pour la classe d’imprimantes nommée."
 
 #. type: TP
-#: cupsd.conf.5:650
+#: cupsd.conf.5:652
 #, no-wrap
 msgid "/jobs"
 msgstr "/jobs"
 
 #. type: Plain text
-#: cupsd.conf.5:653
+#: cupsd.conf.5:655
 msgid "The path for all jobs (hold-job, release-job, etc.)"
 msgstr "Chemin pour tous les travaux (hold-job, release-job, etc.)"
 
 #. type: TP
-#: cupsd.conf.5:653
+#: cupsd.conf.5:655
 #, no-wrap
 msgid "/jobs/id"
 msgstr "/jobs/id"
 
 #. type: Plain text
-#: cupsd.conf.5:656
+#: cupsd.conf.5:658
 msgid "The path for the specified job"
 msgstr "Chemin pour le travail indiqué"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:656
+#: cupsd.conf.5:658
 #, no-wrap
 msgid "/printers"
 msgstr "/printers"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:659
+#: cupsd.conf.5:661
 msgid "The path for all printers"
 msgstr "Chemin pour toutes les imprimantes."
 
 # type: TH
 #. type: TP
-#: cupsd.conf.5:659
+#: cupsd.conf.5:661
 #, no-wrap
 msgid "/printers/name"
 msgstr "/printers/nom"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:662
+#: cupsd.conf.5:664
 msgid "The path for the named printer"
 msgstr "Chemin pour l'imprimante nommée."
 
 # type: TH
 #. type: TP
-#: cupsd.conf.5:662
+#: cupsd.conf.5:664
 #, no-wrap
 msgid "/printers/name.png"
 msgstr "/printers/nom.png"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:665
+#: cupsd.conf.5:667
 msgid "The icon file path for the named printer"
 msgstr "Chemin du fichier de l’icône pour l'imprimante donnée."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:665
+#: cupsd.conf.5:667
 #, no-wrap
 msgid "/printers/name.ppd"
 msgstr "/printers/nom.ppd"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:668
+#: cupsd.conf.5:670
 msgid "The PPD file path for the named printer"
 msgstr "Chemin du fichier PPD pour l'imprimante donnée."
 
 #. type: SS
-#: cupsd.conf.5:668
+#: cupsd.conf.5:670
 #, no-wrap
 msgid "DIRECTIVES VALID WITHIN LOCATION AND LIMIT SECTIONS"
 msgstr "DIRECTIVES VALABLES DANS LES SECTIONS CHEMINS ET LIMITES "
 
 #. type: Plain text
-#: cupsd.conf.5:670
+#: cupsd.conf.5:672
 msgid ""
 "The following directives may be placed inside Location and Limit sections in "
 "the B<cupsd.conf> file:"
@@ -5218,83 +5230,83 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:670
+#: cupsd.conf.5:672
 #, no-wrap
 msgid "B<Allow all>"
 msgstr "B<Allow> I<all>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:672
+#: cupsd.conf.5:674
 #, no-wrap
 msgid "B<Allow none>"
 msgstr "B<Allow> I<none>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:674
+#: cupsd.conf.5:676
 #, no-wrap
 msgid "B<Allow >I<host.domain.com>"
 msgstr "B<Allow> I<hôte.domaine.com>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:676
+#: cupsd.conf.5:678
 #, no-wrap
 msgid "B<Allow *.>I<domain.com>"
 msgstr "B<Allow *.>I<domaine.com>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:678
+#: cupsd.conf.5:680
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>"
 msgstr "B<Allow> I<adresse_ipv4>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:680
+#: cupsd.conf.5:682
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>B</>I<netmask>"
 msgstr "B<Allow> I<adresse_ipv4>B</>I<masque_sous_réseau>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:682
+#: cupsd.conf.5:684
 #, no-wrap
 msgid "B<Allow >I<ipv4-address>B</>I<mm>"
 msgstr "B<Allow> I<adresse_ipv4>B</>I<mm>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:684
+#: cupsd.conf.5:686
 #, no-wrap
 msgid "B<Allow [>I<ipv6-address>B<]>"
 msgstr "B<Allow [>I<adresse_ipv6>B<]>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:686
+#: cupsd.conf.5:688
 #, no-wrap
 msgid "B<Allow [>I<ipv6-address>B<]/>I<mm>"
 msgstr "B<Allow [>I<address_ipv6>B<]/>I<mm>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:688
+#: cupsd.conf.5:690
 #, no-wrap
 msgid "B<Allow @IF(>I<name>B<)>"
 msgstr "B<Allow @IF(>I<nom>B<)>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:690
+#: cupsd.conf.5:692
 #, no-wrap
 msgid "B<Allow @LOCAL>"
 msgstr "B<Allow @LOCAL>"
 
 #. type: Plain text
-#: cupsd.conf.5:696
+#: cupsd.conf.5:698
 msgid ""
 "Allows access from the named hosts, domains, addresses, or interfaces.  The "
 "@IF(name) form uses the current subnets configured for the named interface.  "
@@ -5306,34 +5318,34 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:696
+#: cupsd.conf.5:698
 #, no-wrap
 msgid "B<AuthType None>"
 msgstr "B<AuthType> I<None>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:698
+#: cupsd.conf.5:700
 #, no-wrap
 msgid "B<AuthType Basic>"
 msgstr "B<AuthType> I<Basic>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:700
+#: cupsd.conf.5:702
 #, no-wrap
 msgid "B<AuthType Default>"
 msgstr "B<AuthType> I<Digest>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:702
+#: cupsd.conf.5:704
 #, no-wrap
 msgid "B<AuthType Negotiate>"
 msgstr "B<AuthType> I<Negotiate>"
 
 #. type: Plain text
-#: cupsd.conf.5:706
+#: cupsd.conf.5:708
 msgid ""
 "Specifies the type of authentication required.  The value \"Default\" "
 "corresponds to the DefaultAuthType value."
@@ -5343,83 +5355,83 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:706
+#: cupsd.conf.5:708
 #, no-wrap
 msgid "B<Deny all>"
 msgstr "B<Deny> I<all>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:708
+#: cupsd.conf.5:710
 #, no-wrap
 msgid "B<Deny none>"
 msgstr "B<Deny> I<none>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:710
+#: cupsd.conf.5:712
 #, no-wrap
 msgid "B<Deny >I<host.domain.com>"
 msgstr "B<Deny> I<hôte.domaine.com>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:712
+#: cupsd.conf.5:714
 #, no-wrap
 msgid "B<Deny *.>I<domain.com>"
 msgstr "B<Deny *.>I<domaine.com>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:714
+#: cupsd.conf.5:716
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>"
 msgstr "B<Deny> I<adresse_ipv4>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:716
+#: cupsd.conf.5:718
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>B</>I<netmask>"
 msgstr "B<Deny> I<adresse_ipv4>B</>I<masque_réseau>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:718
+#: cupsd.conf.5:720
 #, no-wrap
 msgid "B<Deny >I<ipv4-address>B</>I<mm>"
 msgstr "B<Deny> I<adresse_ipv4>B</>I<mm>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:720
+#: cupsd.conf.5:722
 #, no-wrap
 msgid "B<Deny [>I<ipv6-address>B<]>"
 msgstr "B<Deny [>I<adresse_ipv6>B<]>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:722
+#: cupsd.conf.5:724
 #, no-wrap
 msgid "B<Deny [>I<ipv6-address>B<]/>I<mm>"
 msgstr "B<Deny> [I<adresse_ipv6>]B</>I<mm>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:724
+#: cupsd.conf.5:726
 #, no-wrap
 msgid "B<Deny @IF(>I<name>B<)>"
 msgstr "B<Deny @IF(>I<nom>B<)>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:726
+#: cupsd.conf.5:728
 #, no-wrap
 msgid "B<Deny @LOCAL>"
 msgstr "B<Deny @LOCAL>"
 
 #. type: Plain text
-#: cupsd.conf.5:732
+#: cupsd.conf.5:734
 msgid ""
 "Denies access from the named hosts, domains, addresses, or interfaces.  The "
 "@IF(name) form uses the current subnets configured for the named interface.  "
@@ -5431,7 +5443,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:740
+#: cupsd.conf.5:742
 msgid ""
 "Specifies the level of encryption that is required for a particular "
 "location.  The default value is \"IfRequested\"."
@@ -5441,13 +5453,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:740
+#: cupsd.conf.5:742
 #, no-wrap
 msgid "B<Order allow,deny>"
 msgstr "B<Order> I<allow,deny>"
 
 #. type: Plain text
-#: cupsd.conf.5:743
+#: cupsd.conf.5:745
 msgid ""
 "Specifies that access is denied by default. Allow lines are then processed "
 "followed by Deny lines to determine whether a client may access a particular "
@@ -5459,13 +5471,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:743
+#: cupsd.conf.5:745
 #, no-wrap
 msgid "B<Order deny,allow>"
 msgstr "B<Order> I<deny,allow>"
 
 #. type: Plain text
-#: cupsd.conf.5:746
+#: cupsd.conf.5:748
 msgid ""
 "Specifies that access is allowed by default. Deny lines are then processed "
 "followed by Allow lines to determine whether a client may access a "
@@ -5477,14 +5489,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:746
+#: cupsd.conf.5:748
 #, no-wrap
 msgid "B<Require group >I<group-name >[ I<group-name >... ]"
 msgstr "B<Require group> I<groupe> [I<groupe> ...]"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:749
+#: cupsd.conf.5:751
 msgid ""
 "Specifies that an authenticated user must be a member of one of the named "
 "groups."
@@ -5493,13 +5505,13 @@ msgstr ""
 "indiqués."
 
 #. type: TP
-#: cupsd.conf.5:749
+#: cupsd.conf.5:751
 #, no-wrap
 msgid "B<Require user {>I<user-name>|B<@>I<group-name>} ..."
 msgstr "B<Require user {>I<identifiant>|B<@>I<groupe>} ..."
 
 #. type: Plain text
-#: cupsd.conf.5:757
+#: cupsd.conf.5:759
 msgid ""
 "Specifies that an authenticated user must match one of the named users or be "
 "a member of one of the named groups.  The group name \"@SYSTEM\" corresponds "
@@ -5520,27 +5532,27 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:757
+#: cupsd.conf.5:759
 #, no-wrap
 msgid "B<Require valid-user>"
 msgstr "B<Require valid-user>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:760
+#: cupsd.conf.5:762
 msgid "Specifies that any authenticated user is acceptable."
 msgstr "Indiquer que tout utilisateur authentifié est autorisé."
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:760
+#: cupsd.conf.5:762
 #, no-wrap
 msgid "B<Satisfy all>"
 msgstr "B<Satisfy> I<all>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:763
+#: cupsd.conf.5:765
 msgid ""
 "Specifies that all Allow, AuthType, Deny, Order, and Require conditions must "
 "be satisfied to allow access."
@@ -5550,13 +5562,13 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:763
+#: cupsd.conf.5:765
 #, no-wrap
 msgid "B<Satisfy any>"
 msgstr "B<Satisfy> I<any>"
 
 #. type: Plain text
-#: cupsd.conf.5:767
+#: cupsd.conf.5:769
 msgid ""
 "Specifies that any a client may access a resource if either the "
 "authentication (AuthType/Require) or address (Allow/Deny/Order) conditions "
@@ -5569,13 +5581,13 @@ msgstr ""
 "l’authentification seulement pour les accès distants."
 
 #. type: SS
-#: cupsd.conf.5:767
+#: cupsd.conf.5:769
 #, no-wrap
 msgid "DIRECTIVES VALID WITHIN POLICY SECTIONS"
 msgstr "DIRECTIVES VALABLES À L’INTÉRIEUR DES SECTIONS DE POLITIQUE"
 
 #. type: Plain text
-#: cupsd.conf.5:769
+#: cupsd.conf.5:771
 msgid ""
 "The following directives may be placed inside Policy sections in the B<cupsd."
 "conf> file:"
@@ -5584,25 +5596,25 @@ msgstr ""
 "dans le fichier I<cupsd.conf> :"
 
 #. type: TP
-#: cupsd.conf.5:769
+#: cupsd.conf.5:771
 #, no-wrap
 msgid "B<JobPrivateAccess all>"
 msgstr "B<JobPrivateAccess> I<all>"
 
 #. type: TP
-#: cupsd.conf.5:771
+#: cupsd.conf.5:773
 #, no-wrap
 msgid "B<JobPrivateAccess default>"
 msgstr "B<JobPrivateAccess> I<défault>"
 
 #. type: TP
-#: cupsd.conf.5:773
+#: cupsd.conf.5:775
 #, no-wrap
 msgid "B<JobPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 msgstr "B<JobPrivateAccess >{I<identifiant>|B<@>I<groupe>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 
 #. type: Plain text
-#: cupsd.conf.5:782
+#: cupsd.conf.5:784
 msgid ""
 "Specifies an access list for a job's private values.  The \"default\" access "
 "list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's requesting-user-"
@@ -5618,31 +5630,31 @@ msgstr ""
 "I<cups-files.conf>."
 
 #. type: TP
-#: cupsd.conf.5:782
+#: cupsd.conf.5:784
 #, no-wrap
 msgid "B<JobPrivateValues all>"
 msgstr "B<JobPrivateValues> I<all>"
 
 #. type: TP
-#: cupsd.conf.5:784
+#: cupsd.conf.5:786
 #, no-wrap
 msgid "B<JobPrivateValues default>"
 msgstr "B<JobPrivateValues> I<défault>"
 
 #. type: TP
-#: cupsd.conf.5:786
+#: cupsd.conf.5:788
 #, no-wrap
 msgid "B<JobPrivateValues none>"
 msgstr "B<JobPrivateValues> I<none>"
 
 #. type: TP
-#: cupsd.conf.5:788
+#: cupsd.conf.5:790
 #, no-wrap
 msgid "B<JobPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
 msgstr "B<JobPrivateValues> I<nom_attribut> [ ... I<nom_attribut> ]"
 
 #. type: Plain text
-#: cupsd.conf.5:792
+#: cupsd.conf.5:794
 msgid ""
 "Specifies the list of job values to make private.  The \"default\" values "
 "are \"job-name\", \"job-originating-host-name\", \"job-originating-user-name"
@@ -5653,25 +5665,25 @@ msgstr ""
 "tâche », et « nom d'utilisateur ayant créé la tâche » et « téléphone »."
 
 #. type: TP
-#: cupsd.conf.5:792
+#: cupsd.conf.5:794
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess all>"
 msgstr "B<SubscriptionPrivateAccess> I<all>"
 
 #. type: TP
-#: cupsd.conf.5:794
+#: cupsd.conf.5:796
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess default>"
 msgstr "B<SubscriptionPrivateAccess> I<default>"
 
 #. type: TP
-#: cupsd.conf.5:796
+#: cupsd.conf.5:798
 #, no-wrap
 msgid "B<SubscriptionPrivateAccess >{I<user>|B<@>I<group>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 msgstr "B<SubscriptionPrivateAccess >{I<identifiant>|B<@>I<groupe>|B<@ACL>|B<@OWNER>|B<@SYSTEM>} ..."
 
 #. type: Plain text
-#: cupsd.conf.5:805
+#: cupsd.conf.5:807
 msgid ""
 "Specifies an access list for a subscription's private values.  The \"default"
 "\" access list is \"@OWNER @SYSTEM\".  \"@ACL\" maps to the printer's "
@@ -5687,31 +5699,31 @@ msgstr ""
 "I<cups-files.conf>."
 
 #. type: TP
-#: cupsd.conf.5:805
+#: cupsd.conf.5:807
 #, no-wrap
 msgid "B<SubscriptionPrivateValues all>"
 msgstr "B<SubscriptionPrivateValues> I<all>"
 
 #. type: TP
-#: cupsd.conf.5:807
+#: cupsd.conf.5:809
 #, no-wrap
 msgid "B<SubscriptionPrivateValues default>"
 msgstr "B<SubscriptionPrivateValues> I<default>"
 
 #. type: TP
-#: cupsd.conf.5:809
+#: cupsd.conf.5:811
 #, no-wrap
 msgid "B<SubscriptionPrivateValues none>"
 msgstr "B<SubscriptionPrivateValues> I<none>"
 
 #. type: TP
-#: cupsd.conf.5:811
+#: cupsd.conf.5:813
 #, no-wrap
 msgid "B<SubscriptionPrivateValues >I<attribute-name >[ ... I<attribute-name >]"
 msgstr "B<SubscriptionPrivateValues> I<nom_attribut> [ ... I<nom_attribut> ]"
 
 #. type: Plain text
-#: cupsd.conf.5:815
+#: cupsd.conf.5:817
 msgid ""
 "Specifies the list of subscription values to make private.  The \"default\" "
 "values are \"notify-events\", \"notify-pull-method\", \"notify-recipient-uri"
@@ -5723,14 +5735,14 @@ msgstr ""
 
 # type: SH
 #. type: SS
-#: cupsd.conf.5:815 cups-files.conf.5:236
+#: cupsd.conf.5:817 cups-files.conf.5:236
 #, no-wrap
 msgid "DEPRECATED DIRECTIVES"
 msgstr "DIRECTIVES OBSOLÈTES"
 
 #. #Classification
 #. type: Plain text
-#: cupsd.conf.5:818
+#: cupsd.conf.5:820
 msgid ""
 "The following directives are deprecated and will be removed in a future "
 "release of CUPS:"
@@ -5741,14 +5753,14 @@ msgstr ""
 # NOTE: bannière à traduire ?
 # type: TP
 #. type: TP
-#: cupsd.conf.5:818
+#: cupsd.conf.5:820
 #, no-wrap
 msgid "B<Classification >I<banner>"
 msgstr "B<Classification> I<bannière>"
 
 #. #ClassifyOverride
 #. type: Plain text
-#: cupsd.conf.5:825
+#: cupsd.conf.5:827
 msgid ""
 "Specifies the security classification of the server.  Any valid banner name "
 "can be used, including \"classified\", \"confidential\", \"secret\", "
@@ -5763,14 +5775,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:825
+#: cupsd.conf.5:827
 #, no-wrap
 msgid "B<ClassifyOverride Yes>"
 msgstr "B<ClassifyOverride> I<Yes>"
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:827
+#: cupsd.conf.5:829
 #, no-wrap
 msgid "B<ClassifyOverride No>"
 msgstr "B<ClassifyOverride> I<No>"
@@ -5778,7 +5790,7 @@ msgstr "B<ClassifyOverride> I<No>"
 # type: Plain text
 #. #PageLogFormat
 #. type: Plain text
-#: cupsd.conf.5:833
+#: cupsd.conf.5:835
 msgid ""
 "Specifies whether users may override the classification (cover page) of "
 "individual print jobs using the \"job-sheets\" option.  The default is \"No"
@@ -5789,13 +5801,13 @@ msgstr ""
 "l’option « job-sheets ». Par défaut « No »."
 
 #. type: TP
-#: cupsd.conf.5:833
+#: cupsd.conf.5:835
 #, no-wrap
 msgid "B<PageLogFormat >I<format-string>"
 msgstr "B<PageLogFormat> I<format_chaîne>"
 
 #. type: Plain text
-#: cupsd.conf.5:838
+#: cupsd.conf.5:840
 msgid ""
 "Specifies the format of PageLog lines.  Sequences beginning with percent (%) "
 "characters are replaced with the corresponding information, while all other "
@@ -5808,7 +5820,7 @@ msgstr ""
 "avec pour cent suivantes sont reconnues :"
 
 #. type: Plain text
-#: cupsd.conf.5:848
+#: cupsd.conf.5:850
 #, no-wrap
 msgid ""
 "    \"%%\" inserts a single percent character.\n"
@@ -5831,7 +5843,7 @@ msgstr ""
 
 #. #RIPCache
 #. type: Plain text
-#: cupsd.conf.5:854
+#: cupsd.conf.5:856
 #, fuzzy
 msgid ""
 "The default is the empty string, which disables page logging.  The string "
@@ -5848,14 +5860,14 @@ msgstr ""
 
 # type: TP
 #. type: TP
-#: cupsd.conf.5:854
+#: cupsd.conf.5:856
 #, no-wrap
 msgid "B<RIPCache >I<size>"
 msgstr "B<RIPCache> I<taille>"
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:858
+#: cupsd.conf.5:860
 msgid ""
 "Specifies the maximum amount of memory to use when converting documents into "
 "bitmaps for a printer.  The default is \"128m\"."
@@ -5864,7 +5876,7 @@ msgstr ""
 "documents en fichiers bitmap pour une imprimante. Par défaut, B<30>."
 
 #. type: Plain text
-#: cupsd.conf.5:862
+#: cupsd.conf.5:864
 #, fuzzy
 msgid ""
 "File, directory, and user configuration directives that used to be allowed "
@@ -5879,7 +5891,7 @@ msgstr ""
 "prévenir certains types d'attaque visant une augmentation de privilèges."
 
 #. type: Plain text
-#: cupsd.conf.5:869
+#: cupsd.conf.5:871
 msgid ""
 "The scheduler MUST be restarted manually after making changes to the B<cupsd."
 "conf> file.  On Linux this is typically done using the B<systemctl>(8)  "
@@ -5887,14 +5899,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:873
+#: cupsd.conf.5:875
 msgid ""
 "The @LOCAL macro name can be confusing since the system running B<cupsd> "
 "often belongs to a different set of subnets from its clients."
 msgstr ""
 
 #. type: Plain text
-#: cupsd.conf.5:875
+#: cupsd.conf.5:877
 msgid ""
 "The B<cupsd.conf> file format is based on the Apache HTTP Server "
 "configuration file format."
@@ -5903,12 +5915,12 @@ msgstr ""
 "configuration du serveur HTTP Apache."
 
 #. type: Plain text
-#: cupsd.conf.5:877
+#: cupsd.conf.5:879
 msgid "Log everything with a maximum log file size of 32 megabytes:"
 msgstr "Tout journaliser dans un fichier de taille maximale de 32 Mo :"
 
 #. type: Plain text
-#: cupsd.conf.5:882
+#: cupsd.conf.5:884
 #, no-wrap
 msgid ""
 "    AccessLogLevel all\n"
@@ -5920,13 +5932,13 @@ msgstr ""
 "    MaxLogSize 32m\n"
 
 #. type: Plain text
-#: cupsd.conf.5:885
+#: cupsd.conf.5:887
 msgid "Require authentication for accesses from outside the 10. network:"
 msgstr ""
 "Demander l’authentification pour accéder au réseau 10… depuis l'extérieur :"
 
 #. type: Plain text
-#: cupsd.conf.5:894
+#: cupsd.conf.5:896
 #, no-wrap
 msgid ""
 "    E<lt>Location /E<gt>\n"
@@ -5947,7 +5959,7 @@ msgstr ""
 
 # type: Plain text
 #. type: Plain text
-#: cupsd.conf.5:904
+#: cupsd.conf.5:906
 msgid ""
 "B<classes.conf>(5), B<cups-files.conf>(5), B<cupsd>(8), B<mime.convs>(5), "
 "B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), CUPS Online "
@@ -5957,6 +5969,14 @@ msgstr ""
 "B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), aide en "
 "ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
 
+# type: Plain text
+#. type: Plain text
+#: cupsd.conf.5:908 cups-files.conf.5:298
+#, fuzzy
+#| msgid "Copyright \\[co] 2007-2019 by Apple Inc."
+msgid "Copyright \\[co] 2020 by Michael R Sweet"
+msgstr "Copyright 2007-2019 par Apple Inc."
+
 # type: TH
 #. type: TH
 #: cupsd-helper.8:10
@@ -7922,16 +7942,6 @@ msgstr ""
 "convs>(5), B<mime.types>(5), B<printers.conf>(5), B<subscriptions.conf>(5), "
 "aide en ligne de CUPS E<lt>URL:I<http://localhost:631/help>E<gt>"
 
-# type: Plain text
-#. type: Plain text
-#: cups-files.conf.5:298 cups-lpd.8:118
-#, fuzzy
-#| msgid "Copyright \\[co] 2007-2019 by Apple Inc."
-msgid ""
-"Copyright \\[co] 2020 by Michael R Sweet Copyright \\[co] 2007-2019 by Apple "
-"Inc."
-msgstr "Copyright 2007-2019 par Apple Inc."
-
 # type: TP
 #. type: TH
 #: cupsfilter.8:9
@@ -8517,6 +8527,16 @@ msgstr ""
 "B<cupsd>(8), B<inetd>(8), B<launchd>(8), B<xinetd>(8), aide en ligne de CUPS "
 "E<lt>URL:I<http://localhost:631/help>E<gt>, RFC 2569"
 
+# type: Plain text
+#. type: Plain text
+#: cups-lpd.8:118
+#, fuzzy
+#| msgid "Copyright \\[co] 2007-2019 by Apple Inc."
+msgid ""
+"Copyright \\[co] 2020 by Michael R Sweet Copyright \\[co] 2007-2019 by Apple "
+"Inc."
+msgstr "Copyright 2007-2019 par Apple Inc."
+
 #. type: TH
 #: cups-snmp.8:9
 #, no-wrap
@@ -18550,6 +18570,11 @@ msgstr ""
 "types>(5), B<printers.conf>(5), aide en ligne de CUPS E<lt>URL:I<http://"
 "localhost:631/help>E<gt>."
 
+# type: TH
+#, no-wrap
+#~ msgid "16 July 2019"
+#~ msgstr "16 juillet 2019"
+
 # type: Plain text
 #~ msgid ""
 #~ "Specifies that a failed print job should stop the printer unless "
-- 
cgit v1.2.3


From 654ecbe9f7f329e1fac0c46b0090adb49b0c987c Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Wed, 3 Feb 2021 18:18:36 +0100
Subject: Update German man page (2212t)

---
 debian/changelog             |  7 ++++
 debian/manpage-po4a/po/de.po | 97 ++++++++++----------------------------------
 2 files changed, 29 insertions(+), 75 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 271667e5c..daa60cc0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cups (2.3.3op2-3) UNRELEASED; urgency=medium
+
+  [ Helge Kreutzmann ]
+  * Update German man page (2212t)
+
+ -- Helge Kreutzmann <debian@helgefjell.de>  Wed, 03 Feb 2021 18:16:27 +0100
+
 cups (2.3.3op2-2) unstable; urgency=medium
 
   * Bump debhelper compat to 13, document not-installed files
diff --git a/debian/manpage-po4a/po/de.po b/debian/manpage-po4a/po/de.po
index b02e703a9..b0a3de074 100644
--- a/debian/manpage-po4a/po/de.po
+++ b/debian/manpage-po4a/po/de.po
@@ -1,5 +1,5 @@
 # Translation of cups man pages to German
-# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2008-2020
+# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2008-2021
 # Chris Leick <c.leick@vollbio.de>, 2009.
 # This file is distributed under the same license as the cups package.
 #
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cups man pages 2.3.3op1-2\n"
 "POT-Creation-Date: 2021-02-03 18:08+0100\n"
-"PO-Revision-Date: 2020-12-02 19:50+0100\n"
+"PO-Revision-Date: 2021-02-03 18:15+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -2670,10 +2670,9 @@ msgstr "cupsd.conf"
 
 #. type: TH
 #: cupsd.conf.5:11
-#, fuzzy, no-wrap
-#| msgid "14 November 2020"
+#, no-wrap
 msgid "28 November 2020"
-msgstr "14. November 2020"
+msgstr "28. November 2020"
 
 #. type: Plain text
 #: cupsd.conf.5:14
@@ -3396,13 +3395,6 @@ msgstr "B<Listen >I</Pfad/zu/Domain/Socket>"
 #. #ListenBackLog
 #. type: Plain text
 #: cupsd.conf.5:251
-#, fuzzy
-#| msgid ""
-#| "Listens to the specified address and port or domain socket path for "
-#| "connections.  Multiple Listen directives can be provided to listen on "
-#| "multiple addresses.  The Listen directive is similar to the Port "
-#| "directive but allows you to restrict access to specific interfaces or "
-#| "networks."
 msgid ""
 "Listens to the specified address and port or domain socket path for "
 "connections.  Multiple Listen directives can be provided to listen on "
@@ -3416,7 +3408,10 @@ msgstr ""
 "Anfragen. Mehrere »Listen«-Direktiven können angegeben werden, um auf "
 "mehreren Adressen auf Anfragen zu warten. Die Direktive »Listen« ist ähnlich "
 "zu der Direktive »Port«, erlaubt es Ihnen aber, den Zugriff auf bestimmte "
-"Schnittstellen oder Netze zu beschränken."
+"Schnittstellen oder Netze zu beschränken. Hinweis: Mit »I<Port>« und »Port "
+"I<Port>« wird effektiv an allen IP-Adressen auf Anfragen gewartet, daher "
+"können Sie dies nicht mit »Listen«-Direktiven für explizite IPv4- oder IPv6-"
+"Adressen auf dem gleichen Port kombinieren."
 
 #. type: TP
 #: cupsd.conf.5:251
@@ -5532,10 +5527,8 @@ msgstr ""
 
 #. type: Plain text
 #: cupsd.conf.5:908 cups-files.conf.5:298
-#, fuzzy
-#| msgid "Copyright \\[co] 2007-2019 by Apple Inc."
 msgid "Copyright \\[co] 2020 by Michael R Sweet"
-msgstr "Copyright \\[co] 2007-2019 by Apple Inc."
+msgstr "Copyright \\[co] 2020 Michael R Sweet"
 
 #. type: TH
 #: cupsd-helper.8:10
@@ -9443,7 +9436,7 @@ msgstr "B<ippeveprinter>(8)"
 #. type: Plain text
 #: ippevepcl.7:48
 msgid "Copyright \\[co] 2019 by Apple Inc."
-msgstr "Copyright \\[co] 2019 by Apple Inc."
+msgstr "Copyright \\[co] 2019 Apple Inc."
 
 #. type: TH
 #: ippeveprinter.1:9
@@ -10885,7 +10878,7 @@ msgstr "B<ipptool>(1)"
 #. type: Plain text
 #: ippfind.1:258
 msgid "Copyright \\[co] 2013-2019 by Apple Inc."
-msgstr "Copyright \\[co] 2013-2019 by Apple Inc."
+msgstr "Copyright \\[co] 2013-2019 Apple Inc."
 
 #. type: TH
 #: ipptool.1:9
@@ -17569,22 +17562,6 @@ msgstr ""
 #~ msgid "2 May 2019"
 #~ msgstr "2. Mai 2019"
 
-#, fuzzy
-#~ msgid ""
-#~ "Specifies what information is included in the Server header of HTTP "
-#~ "responses.  \"None\" disables the Server header.  \"ProductOnly\" reports "
-#~ "\"CUPS\".  \"Major\" reports \"CUPS 2\".  \"Minor\" reports \"CUPS "
-#~ "2.0\".  \"Minimal\" reports \"CUPS 2.0.0\".  \"OS\" reports \"CUPS 2.0.0 "
-#~ "(UNAME)\" where UNAME is the output of the B<uname>(1)  command.  \"Full"
-#~ "\" reports \"CUPS 2.0.0 (UNAME) IPP/2.0\".  The default is \"Minimal\"."
-#~ msgstr ""
-#~ "Legt fest, welche Informationen in die Server-Kopfzeilen von HTTP-"
-#~ "Antworten aufgenommen werden. »None« deaktiviert die Server-Kopfzeilen. "
-#~ "»ProductOnly« meldet »CUPS«. »Major« berichtet »CUPS 2.0«. »Minimal« "
-#~ "berichtet »CUPS 2.0.0«. »OS« berichtet »CUPS 2.0.0 (UNAME)«, wobei UNAME "
-#~ "die Ausgabe des Befehls B<uname>(1) ist. »Full« berichtet »CUPS 2.0.0 "
-#~ "(UNAME) IPP/2.0«. Die Vorgabe ist »Minimal«."
-
 #~ msgid ""
 #~ "Sets encryption options.  By default, CUPS only supports encryption using "
 #~ "TLS v1.0 or higher using known secure cipher suites.  Security is reduced "
@@ -17635,7 +17612,7 @@ msgstr ""
 #~ msgstr "8. November 2017"
 
 #~ msgid "Copyright \\[co] 2007-2018 by Apple Inc."
-#~ msgstr "Copyright \\[co] 2007-2018 by Apple Inc."
+#~ msgstr "Copyright \\[co] 2007-2018 Apple Inc."
 
 #~ msgid "12 February 2016"
 #~ msgstr "12. Februar 2016"
@@ -17646,10 +17623,8 @@ msgstr ""
 #~ msgid "3 June 2014"
 #~ msgstr "3. Juni 2014"
 
-#, fuzzy
-#~| msgid "15 April 2014"
 #~ msgid "16 April 2014"
-#~ msgstr "15. April 2014"
+#~ msgstr "16. April 2014"
 
 #~ msgid "cupstestdsc"
 #~ msgstr "cupstestdsc"
@@ -17723,20 +17698,8 @@ msgstr ""
 #~ msgid "Run the specified command for each document that is printed."
 #~ msgstr "Führt den angegebenen Befehl für jedes zu druckende Dokument aus."
 
-#, fuzzy
-#~| msgid ""
-#~| "Specifies the model name of the printer.  The default is \"Printer\"."
-#~ msgid ""
-#~ "Specifies the printer icon file for the server.  The default is \"printer."
-#~ "png\"."
-#~ msgstr "Legt den Modellnamen des Druckers fest. Die Vorgabe ist »Printer«."
-
-#, fuzzy
-#~ msgid "    ippserver -c file \"My Cool Printer\"\n"
-#~ msgstr "    ippserver \"Mein Toller Drucker\"\n"
-
 #~ msgid "Copyright \\[co] 2007-2014 by Apple Inc."
-#~ msgstr "Copyright \\[co] 2007-2014 by Apple Inc."
+#~ msgstr "Copyright \\[co] 2007-2014 Apple Inc."
 
 #~ msgid "4 August 2017"
 #~ msgstr "4. August 2017"
@@ -17896,9 +17859,8 @@ msgstr ""
 #~ msgid "5 March 2016"
 #~ msgstr "5. März 2016"
 
-#, fuzzy
 #~ msgid "13 May 2019"
-#~ msgstr "13. Mai 2013"
+#~ msgstr "13. Mai 2019"
 
 #~ msgid "15 June 2017"
 #~ msgstr "15. Juni 2017"
@@ -17994,22 +17956,11 @@ msgstr ""
 #~ "v3.0, die für einige ältere Clients benötigt wird, die TLS v1.0 nicht "
 #~ "unterstützen."
 
-# FIXME: String broken??
-#, fuzzy
-#~ msgid ""
-#~ "Adds an attribute to the test request. Values are separated by the comma "
-#~ "(\",\") character - escape commas using the \""
-#~ msgstr ""
-#~ "Fügt der Testanfrage ein Attribut hinzu. Werte werden durch Kommata (»,«) "
-#~ "getrennt, maskieren Sie Kommata mit dem Zeichen \"\\e\". Gebräuchliche "
-#~ "Attribute und Werte werden in der IANA-IPP-Registratur aufgeführt -- "
-#~ "lesen Sie die Referenzen unten."
-
 #~ msgid "Specifies a delay before this test will be run."
 #~ msgstr "Legt eine Verzögerung, bevor der Test ausgeführt wird, fest."
 
 #~ msgid "Copyright \\[co] 2007-2015 by Apple Inc."
-#~ msgstr "Copyright \\[co] 2007-2015 by Apple Inc."
+#~ msgstr "Copyright \\[co] 2007-2015 Apple Inc."
 
 #~ msgid "19 May 2015"
 #~ msgstr "19. Mai 2015"
@@ -19912,7 +19863,7 @@ msgstr ""
 
 # type: Plain text
 #~ msgid "Copyright 2007-2009 by Apple Inc."
-#~ msgstr "Copyright 2007-2009 by Apple Inc."
+#~ msgstr "Copyright 2007-2009 Apple Inc."
 
 # type: TH
 #~ msgid "25 February 2006"
@@ -19967,20 +19918,16 @@ msgstr ""
 
 # type: Plain text
 #~ msgid "Copyright 2007-2011 by Apple Inc."
-#~ msgstr "Copyright 2007-2011 by Apple Inc."
+#~ msgstr "Copyright 2007-2011 Apple Inc."
 
-#, fuzzy
 #~ msgid "3 November 2017"
-#~ msgstr "8. November 2017"
+#~ msgstr "3. November 2017"
 
-#, fuzzy
 #~ msgid "8 November 2018"
-#~ msgstr "8. November 2017"
+#~ msgstr "8. November 2018"
 
-#, fuzzy
 #~ msgid "1 November 2017"
-#~ msgstr "8. November 2017"
+#~ msgstr "1. November 2017"
 
-#, fuzzy
 #~ msgid "9 November 2010"
-#~ msgstr "19. November 2012"
+#~ msgstr "9. November 2010"
-- 
cgit v1.2.3


From c55954bf797258f6504c4e3ace95052357482666 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 12 Feb 2021 12:47:22 +0100
Subject: Wrap-and-sort -baskt

---
 debian/control                   | 446 +++++++++++++++++++++------------------
 debian/cups-bsd.install          |   2 +-
 debian/cups-bsd.manpages         |   2 +-
 debian/cups-client.install       |  12 +-
 debian/cups-client.manpages      |  11 +-
 debian/cups-common.install       |   2 +-
 debian/cups-core-drivers.dirs    |   2 +-
 debian/cups-core-drivers.install |   4 +-
 debian/cups-daemon.install       |  18 +-
 debian/cups-daemon.maintscript   |   2 +-
 debian/cups-daemon.manpages      |   5 +-
 debian/cups-ipp-utils.install    |   2 +-
 debian/cups-ppdc.install         |   2 +-
 debian/cups.dirs                 |   3 +-
 debian/cups.install              |  10 +-
 debian/cups.maintscript          |  14 +-
 debian/cups.manpages             |   9 +-
 debian/libcups2-dev.install      |   7 +-
 debian/libcupsimage2-dev.install |   4 +-
 debian/tests/control             |  13 +-
 20 files changed, 307 insertions(+), 263 deletions(-)

diff --git a/debian/control b/debian/control
index 1afcfefee..2cab9f28f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,31 +1,35 @@
 Source: cups
 Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
-Uploaders: Didier Raboud <odyx@debian.org>,
-           Till Kamppeter <till.kamppeter@gmail.com>
+Uploaders:
+ Didier Raboud <odyx@debian.org>,
+ Till Kamppeter <till.kamppeter@gmail.com>,
 Section: net
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
-               dh-strip-nondeterminism,
-               patch,
-               autoconf,
-               automake,
-               libtool,
-               pkg-config,
-               libavahi-client-dev,
-               libavahi-common-dev,
-               libdbus-1-dev,
-               libgnutls28-dev,
-               libkrb5-dev,
-               libpam0g-dev,
-               libpaper-dev,
-               libsystemd-dev [linux-any],
-               libusb-1.0-0-dev [!hurd-any],
-               po4a,
-               po-debconf,
-               zlib1g-dev
-Build-Depends-Arch: dh-apparmor,
+Build-Depends:
+ autoconf,
+ automake,
+ debhelper-compat (= 13),
+ dh-strip-nondeterminism,
+ libavahi-client-dev,
+ libavahi-common-dev,
+ libdbus-1-dev,
+ libgnutls28-dev,
+ libkrb5-dev,
+ libpam0g-dev,
+ libpaper-dev,
+ libsystemd-dev [linux-any],
+ libtool,
+ libusb-1.0-0-dev [!hurd-any],
+ patch,
+ pkg-config,
+ po-debconf,
+ po4a,
+ zlib1g-dev,
+Build-Depends-Arch:
+ dh-apparmor,
 # libgmp-dev is not GPL-2 compatible before it's 6 release, which makes it also GPL-2+
-Build-Conflicts: libgmp-dev (<< 2:6)
+Build-Conflicts:
+ libgmp-dev (<< 2:6),
 Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/printing-team/cups
 Vcs-Git: https://salsa.debian.org/printing-team/cups.git
@@ -36,10 +40,13 @@ Package: libcups2
 Architecture: any
 Multi-Arch: same
 Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Suggests: cups-common
-Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ cups-common,
+Pre-Depends:
+ ${misc:Pre-Depends},
 Description: Common UNIX Printing System(tm) - Core library
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -48,72 +55,130 @@ Description: Common UNIX Printing System(tm) - Core library
  .
  This package provides the base shared libraries for CUPS.
 
-Package: libcupsimage2
+Package: cups
 Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libcups2 (= ${binary:Version})
-Recommends: libcupsfilters1
-Pre-Depends: ${misc:Pre-Depends}
-Description: Common UNIX Printing System(tm) - Raster image library
+Multi-Arch: foreign
+Depends:
+ cups-client (>= ${binary:Version}),
+ cups-common (>= ${source:Version}),
+ cups-core-drivers (>= ${binary:Version}),
+ cups-daemon (>= ${binary:Version}),
+ cups-filters,
+ cups-ppdc,
+ cups-server-common (>= ${source:Version}),
+ debconf | debconf-2.0,
+ ghostscript,
+ libcups2 (= ${binary:Version}),
+ poppler-utils,
+ procps,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ avahi-daemon,
+ colord,
+ cups-filters | foomatic-filters,
+ cups-filters | ghostscript-cups,
+Suggests:
+ cups-bsd,
+ cups-pdf,
+ foomatic-db-compressed-ppds | foomatic-db,
+ smbclient,
+ udev,
+Pre-Depends:
+ ${misc:Pre-Depends},
+Description: Common UNIX Printing System(tm) - PPD/driver support, web interface
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
  Printing Protocol (IPP), and has its own filtering driver model for
  handling various document types.
  .
- This package provides the image libraries for handling the CUPS
- raster format.
+ This package provides the parts of CUPS which are needed for using printer
+ drivers.
 
-Package: cups
+Package: cups-bsd
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         cups-core-drivers (>= ${binary:Version}),
-         cups-daemon (>= ${binary:Version}),
-         debconf | debconf-2.0,
-         poppler-utils,
-         procps,
-         ghostscript,
-         cups-common (>= ${source:Version}),
-         cups-server-common (>= ${source:Version}),
-         cups-client (>= ${binary:Version}),
-         libcups2 (= ${binary:Version}),
-         cups-ppdc,
-         cups-filters
-Recommends: avahi-daemon,
-            colord,
-            cups-filters | foomatic-filters,
-            cups-filters | ghostscript-cups
-Suggests: cups-bsd,
-          foomatic-db-compressed-ppds | foomatic-db,
-          cups-pdf,
-          udev,
-          smbclient
-Pre-Depends: ${misc:Pre-Depends}
-Description: Common UNIX Printing System(tm) - PPD/driver support, web interface
+Depends:
+ cups-client (= ${binary:Version}),
+ cups-common (>= ${source:Version}),
+ debconf | debconf-2.0,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ cups,
+ inetutils-inetd | inet-superserver,
+ update-inetd,
+Conflicts:
+ lpr,
+ lprng,
+Provides:
+ lpr,
+Replaces:
+ lpr,
+Description: Common UNIX Printing System(tm) - BSD commands
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and
+ general replacement for lpr, lpd and the like.  It supports the
+ Internet Printing Protocol (IPP), and has its own filtering driver
+ model for handling various document types.
+ .
+ This package provides the BSD commands for interacting with CUPS.  It
+ is provided separately to allow CUPS to coexist with other printing
+ systems (to a small degree).
+
+Package: cups-client
+Architecture: any
+Multi-Arch: foreign
+Depends:
+ adduser,
+ cups-common (>= ${source:Version}),
+ libcups2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ cups,
+ cups-bsd,
+ smbclient,
+Conflicts:
+ lprng,
+Description: Common UNIX Printing System(tm) - client programs (SysV)
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
  Printing Protocol (IPP), and has its own filtering driver model for
  handling various document types.
  .
- This package provides the parts of CUPS which are needed for using printer
- drivers.
+ This package provides the System V style print client programs.
+
+Package: cups-common
+Architecture: all
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: Common UNIX Printing System(tm) - common files
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and
+ general replacement for lpd and the like.  It supports the Internet
+ Printing Protocol (IPP), and has its own filtering driver model for
+ handling various document types.
+ .
+ This package provides common files for CUPS server and client packages.
 
 Package: cups-core-drivers
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         cups-daemon (>= ${binary:Version}),
-         libcups2 (= ${binary:Version}),
-         cups-filters-core-drivers
-Recommends: avahi-daemon
-Pre-Depends: ${misc:Pre-Depends}
-Breaks: cups-server-common (<< 2.1.0-7~)
-Replaces: cups-server-common (<< 2.1.0-7~)
+Depends:
+ cups-daemon (>= ${binary:Version}),
+ cups-filters-core-drivers,
+ libcups2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ avahi-daemon,
+Pre-Depends:
+ ${misc:Pre-Depends},
+Breaks:
+ cups-server-common (<< 2.1.0-7~),
+Replaces:
+ cups-server-common (<< 2.1.0-7~),
 Description: Common UNIX Printing System(tm) - driverless printing
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -126,35 +191,41 @@ Description: Common UNIX Printing System(tm) - driverless printing
 Package: cups-daemon
 Architecture: any
 Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         procps,
-         lsb-base,
-         libcups2 (= ${binary:Version}),
-         ssl-cert,
-         adduser,
-         bc
-Recommends: colord,
-            cups-browsed,
-            avahi-daemon,
-            ipp-usb,
-Suggests: cups,
-          cups-bsd,
-          cups-common (>= ${source:Version}),
-          cups-server-common (>= ${source:Version}),
-          cups-client (>= ${binary:Version}),
-          cups-ppdc,
-          cups-filters,
-          poppler-utils,
-          ghostscript,
-          cups-filters | foomatic-filters,
-          foomatic-db-compressed-ppds | foomatic-db,
-          cups-pdf,
-          udev,
-          smbclient
-Breaks: cups (<< 2.1.0-6~)
-Replaces: cups (<< 2.1.0-6~)
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ adduser,
+ bc,
+ libcups2 (= ${binary:Version}),
+ lsb-base,
+ procps,
+ ssl-cert,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ avahi-daemon,
+ colord,
+ cups-browsed,
+ ipp-usb,
+Suggests:
+ cups,
+ cups-bsd,
+ cups-client (>= ${binary:Version}),
+ cups-common (>= ${source:Version}),
+ cups-filters,
+ cups-filters | foomatic-filters,
+ cups-pdf,
+ cups-ppdc,
+ cups-server-common (>= ${source:Version}),
+ foomatic-db-compressed-ppds | foomatic-db,
+ ghostscript,
+ poppler-utils,
+ smbclient,
+ udev,
+Breaks:
+ cups (<< 2.1.0-6~),
+Replaces:
+ cups (<< 2.1.0-6~),
 Description: Common UNIX Printing System(tm) - daemon
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -163,51 +234,65 @@ Description: Common UNIX Printing System(tm) - daemon
  .
  This package provides the CUPS scheduler/daemon.
 
-Package: cups-client
+Package: cups-ipp-utils
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         cups-common (>= ${source:Version}),
-         libcups2 (= ${binary:Version}),
-         adduser
-Suggests: cups,
-          cups-bsd,
-          smbclient
-Conflicts: lprng
-Description: Common UNIX Printing System(tm) - client programs (SysV)
+Depends:
+ libcups2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Breaks:
+ cups-client (<< 2.0.3-2~),
+Replaces:
+ cups-client (<< 2.0.3-2~),
+Description: Common UNIX Printing System(tm) - IPP developer/admin utilities
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
  Printing Protocol (IPP), and has its own filtering driver model for
  handling various document types.
  .
- This package provides the System V style print client programs.
+ This package provides IPP utilities for developers and system administrators
 
-Package: cups-ipp-utils
+Package: cups-ppdc
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libcups2 (= ${binary:Version})
-Breaks: cups-client (<< 2.0.3-2~)
-Replaces: cups-client (<< 2.0.3-2~)
-Description: Common UNIX Printing System(tm) - IPP developer/admin utilities
+Section: utils
+Depends:
+ cups-common (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: Common UNIX Printing System(tm) - PPD manipulation utilities
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
  Printing Protocol (IPP), and has its own filtering driver model for
  handling various document types.
  .
- This package provides IPP utilities for developers and system administrators
+ This package provides utilities to generate and manipulate PPD files.
+
+Package: cups-server-common
+Architecture: all
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: Common UNIX Printing System(tm) - server common files
+ The Common UNIX Printing System (or CUPS(tm)) is a printing system and
+ general replacement for lpd and the like.  It supports the Internet
+ Printing Protocol (IPP), and has its own filtering driver model for
+ handling various document types.
+ .
+ This package provides common files for CUPS server.
 
 Package: libcups2-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libcupsimage2-dev (= ${binary:Version}),
-         libcups2 (= ${binary:Version}),
-         dpkg-dev
+Depends:
+ dpkg-dev,
+ libcups2 (= ${binary:Version}),
+ libcupsimage2-dev (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Common UNIX Printing System(tm) - Development files CUPS library
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
@@ -219,90 +304,47 @@ Description: Common UNIX Printing System(tm) - Development files CUPS library
  with cups from different programming languages (Perl, Java, and
  PHP).
 
-Package: libcupsimage2-dev
+Package: libcupsimage2
 Architecture: any
 Multi-Arch: same
-Section: libdevel
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libcupsimage2 (= ${binary:Version}),
-         libcups2-dev (= ${binary:Version}),
-         libpng-dev,
-         libtiff-dev,
-         libjpeg-dev,
-         zlib1g-dev
-Recommends: libcupsfilters-dev
-Description: Common UNIX Printing System(tm) - Development files CUPS image library
- The Common UNIX Printing System (or CUPS(tm)) is a printing system and
- general replacement for lpd and the like.  It supports the Internet
- Printing Protocol (IPP), and has its own filtering driver model for
- handling various document types.
- .
- This package provides the files necessary for developing applications
- that use the CUPS raster image format.
-
-Package: cups-bsd
-Architecture: any
-Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         cups-client (= ${binary:Version}),
-         debconf | debconf-2.0,
-         cups-common (>= ${source:Version})
-Suggests: cups,
-          inetutils-inetd | inet-superserver,
-          update-inetd
-Conflicts: lpr,
-           lprng
-Provides: lpr
-Replaces: lpr
-Description: Common UNIX Printing System(tm) - BSD commands
- The Common UNIX Printing System (or CUPS(tm)) is a printing system and
- general replacement for lpr, lpd and the like.  It supports the
- Internet Printing Protocol (IPP), and has its own filtering driver
- model for handling various document types.
- .
- This package provides the BSD commands for interacting with CUPS.  It
- is provided separately to allow CUPS to coexist with other printing
- systems (to a small degree).
-
-Package: cups-common
-Architecture: all
-Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Common UNIX Printing System(tm) - common files
- The Common UNIX Printing System (or CUPS(tm)) is a printing system and
- general replacement for lpd and the like.  It supports the Internet
- Printing Protocol (IPP), and has its own filtering driver model for
- handling various document types.
- .
- This package provides common files for CUPS server and client packages.
-
-Package: cups-server-common
-Architecture: all
-Multi-Arch: foreign
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Common UNIX Printing System(tm) - server common files
+Section: libs
+Depends:
+ libcups2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ libcupsfilters1,
+Pre-Depends:
+ ${misc:Pre-Depends},
+Description: Common UNIX Printing System(tm) - Raster image library
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
  Printing Protocol (IPP), and has its own filtering driver model for
  handling various document types.
  .
- This package provides common files for CUPS server.
+ This package provides the image libraries for handling the CUPS
+ raster format.
 
-Package: cups-ppdc
+Package: libcupsimage2-dev
 Architecture: any
-Multi-Arch: foreign
-Section: utils
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         cups-common (>= ${source:Version})
-Description: Common UNIX Printing System(tm) - PPD manipulation utilities
+Multi-Arch: same
+Section: libdevel
+Depends:
+ libcups2-dev (= ${binary:Version}),
+ libcupsimage2 (= ${binary:Version}),
+ libjpeg-dev,
+ libpng-dev,
+ libtiff-dev,
+ zlib1g-dev,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ libcupsfilters-dev,
+Description: Common UNIX Printing System(tm) - Development files CUPS image library
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and
  general replacement for lpd and the like.  It supports the Internet
  Printing Protocol (IPP), and has its own filtering driver model for
  handling various document types.
  .
- This package provides utilities to generate and manipulate PPD files.
+ This package provides the files necessary for developing applications
+ that use the CUPS raster image format.
diff --git a/debian/cups-bsd.install b/debian/cups-bsd.install
index 2781e369c..76279c8be 100644
--- a/debian/cups-bsd.install
+++ b/debian/cups-bsd.install
@@ -1,4 +1,4 @@
-usr/sbin/lpc
 usr/bin/lpq
 usr/bin/lpr
 usr/bin/lprm
+usr/sbin/lpc
diff --git a/debian/cups-bsd.manpages b/debian/cups-bsd.manpages
index cb48f49cf..0f400f6f9 100644
--- a/debian/cups-bsd.manpages
+++ b/debian/cups-bsd.manpages
@@ -1,4 +1,4 @@
+usr/share/man/man1/lpq.1
 usr/share/man/man1/lpr.1
 usr/share/man/man1/lprm.1
-usr/share/man/man1/lpq.1
 usr/share/man/man8/lpc.8
diff --git a/debian/cups-client.install b/debian/cups-client.install
index 933921639..37bca5537 100644
--- a/debian/cups-client.install
+++ b/debian/cups-client.install
@@ -1,14 +1,14 @@
+debian/tests/utils/test-drivers usr/share/cups/
 usr/bin/cancel
 usr/bin/cupstestppd
 usr/bin/lp
 usr/bin/lpoptions
 usr/bin/lpstat
-usr/sbin/lpadmin
-usr/sbin/lpinfo
-usr/sbin/lpmove
 usr/sbin/cupsaccept
-usr/sbin/cupsreject
+usr/sbin/cupsctl
 usr/sbin/cupsdisable
 usr/sbin/cupsenable
-usr/sbin/cupsctl
-debian/tests/utils/test-drivers usr/share/cups/
+usr/sbin/cupsreject
+usr/sbin/lpadmin
+usr/sbin/lpinfo
+usr/sbin/lpmove
diff --git a/debian/cups-client.manpages b/debian/cups-client.manpages
index dd7c5e41f..3dc2e5740 100644
--- a/debian/cups-client.manpages
+++ b/debian/cups-client.manpages
@@ -1,15 +1,14 @@
+usr/share/man/man1/cancel.1
 usr/share/man/man1/cupstestppd.1
 usr/share/man/man1/lp.1
 usr/share/man/man1/lpoptions.1
 usr/share/man/man1/lpstat.1
-usr/share/man/man1/cancel.1
 usr/share/man/man5/client.conf.5
+usr/share/man/man8/cupsaccept.8
+usr/share/man/man8/cupsctl.8
+usr/share/man/man8/cupsdisable.8
 usr/share/man/man8/cupsenable.8
+usr/share/man/man8/cupsreject.8
 usr/share/man/man8/lpadmin.8
 usr/share/man/man8/lpinfo.8
 usr/share/man/man8/lpmove.8
-usr/share/man/man8/cupsreject.8
-usr/share/man/man8/cupsdisable.8
-usr/share/man/man8/cupsaccept.8
-usr/share/man/man8/cupsctl.8
-
diff --git a/debian/cups-common.install b/debian/cups-common.install
index b5c24ca09..a2ee36af8 100644
--- a/debian/cups-common.install
+++ b/debian/cups-common.install
@@ -1,4 +1,4 @@
 usr/share/cups/drv
 usr/share/cups/locale
-usr/share/cups/profiles
 usr/share/cups/ppdc/*.defs
+usr/share/cups/profiles
diff --git a/debian/cups-core-drivers.dirs b/debian/cups-core-drivers.dirs
index b1b323467..813d44237 100644
--- a/debian/cups-core-drivers.dirs
+++ b/debian/cups-core-drivers.dirs
@@ -1,2 +1,2 @@
-etc/cups/ppd
 etc/cups/interfaces
+etc/cups/ppd
diff --git a/debian/cups-core-drivers.install b/debian/cups-core-drivers.install
index 74715df41..0153dd4da 100644
--- a/debian/cups-core-drivers.install
+++ b/debian/cups-core-drivers.install
@@ -1,4 +1,4 @@
-usr/lib/cups/filter/pstops
-usr/lib/cups/filter/gziptoany
 usr/lib/cups/filter/commandtops
+usr/lib/cups/filter/gziptoany
+usr/lib/cups/filter/pstops
 usr/share/cups/mime/mime.convs
diff --git a/debian/cups-daemon.install b/debian/cups-daemon.install
index 5405a21b4..8c77fd28e 100644
--- a/debian/cups-daemon.install
+++ b/debian/cups-daemon.install
@@ -1,16 +1,16 @@
-var/
 etc/cups/cups-files.conf
-usr/lib/cups/backend/ipp
-usr/lib/cups/backend/ipps
+lib/systemd/system/cups.path
+lib/systemd/system/cups.service
+lib/systemd/system/cups.socket
 usr/lib/cups/backend/http
 usr/lib/cups/backend/https
+usr/lib/cups/backend/ipp
+usr/lib/cups/backend/ipps
 usr/lib/cups/daemon/cups-exec
 usr/lib/cups/notifier
-usr/share/cups/mime/mime.types
-usr/share/cups/cupsd.conf.default
+usr/sbin/cupsd
 usr/share/cups/cups-files.conf.default
+usr/share/cups/cupsd.conf.default
+usr/share/cups/mime/mime.types
 usr/share/cups/snmp.conf.default
-usr/sbin/cupsd
-lib/systemd/system/cups.socket
-lib/systemd/system/cups.path
-lib/systemd/system/cups.service
+var/
diff --git a/debian/cups-daemon.maintscript b/debian/cups-daemon.maintscript
index be125ec8f..d1712fc89 100644
--- a/debian/cups-daemon.maintscript
+++ b/debian/cups-daemon.maintscript
@@ -1,3 +1,3 @@
+mv_conffile /etc/pam.d/cups-daemon /etc/pam.d/cups 1.7.3-2~
 rm_conffile /etc/cups/cupsd.conf.default 1.7.1-3~
 rm_conffile /etc/default/cups 1.7.1-6~
-mv_conffile /etc/pam.d/cups-daemon /etc/pam.d/cups 1.7.3-2~
diff --git a/debian/cups-daemon.manpages b/debian/cups-daemon.manpages
index a8e29bd9a..f10329f4f 100644
--- a/debian/cups-daemon.manpages
+++ b/debian/cups-daemon.manpages
@@ -1,12 +1,11 @@
 usr/share/man/man5/classes.conf.5
-usr/share/man/man5/cupsd.conf.5
 usr/share/man/man5/cups-files.conf.5
 usr/share/man/man5/cups-snmp.conf.5
+usr/share/man/man5/cupsd.conf.5
 usr/share/man/man5/mailto.conf.5
 usr/share/man/man5/mime.types.5
 usr/share/man/man5/printers.conf.5
 usr/share/man/man7/backend.7
 usr/share/man/man7/notifier.7
-usr/share/man/man8/cupsd.8
 usr/share/man/man8/cups-snmp.8
-
+usr/share/man/man8/cupsd.8
diff --git a/debian/cups-ipp-utils.install b/debian/cups-ipp-utils.install
index dea6a2579..b6ef37cfb 100644
--- a/debian/cups-ipp-utils.install
+++ b/debian/cups-ipp-utils.install
@@ -1,4 +1,4 @@
+tools/ippeveprinter usr/sbin
 usr/bin/ippfind
 usr/bin/ipptool
-tools/ippeveprinter usr/sbin
 usr/share/cups/ipptool/*.test
diff --git a/debian/cups-ppdc.install b/debian/cups-ppdc.install
index 01679cae9..f4a08c459 100644
--- a/debian/cups-ppdc.install
+++ b/debian/cups-ppdc.install
@@ -1,4 +1,4 @@
 usr/bin/ppd*
-usr/share/cups/ppdc/*.h
 usr/share/cups/examples/
+usr/share/cups/ppdc/*.h
 usr/share/man/man?/ppd*.?
diff --git a/debian/cups.dirs b/debian/cups.dirs
index ddb3e8735..ad4860c67 100644
--- a/debian/cups.dirs
+++ b/debian/cups.dirs
@@ -1,4 +1,3 @@
-#usr/local/share/ppd
-usr/share/ppd/custom
 # PPD-updating triggers directory
 usr/share/cups/ppd-updaters
+usr/share/ppd/custom
diff --git a/debian/cups.install b/debian/cups.install
index 30a56a936..983ebec8c 100644
--- a/debian/cups.install
+++ b/debian/cups.install
@@ -1,15 +1,15 @@
+../presubj usr/share/bug/cups/
 etc/cups/snmp.conf
+usr/lib/cups/backend/dnssd usr/lib/cups/backend-available
 usr/lib/cups/backend/lpd usr/lib/cups/backend-available
+usr/lib/cups/backend/snmp usr/lib/cups/backend-available
 usr/lib/cups/backend/socket usr/lib/cups/backend-available
 usr/lib/cups/backend/usb usr/lib/cups/backend-available
-usr/lib/cups/backend/dnssd usr/lib/cups/backend-available
-usr/lib/cups/backend/snmp usr/lib/cups/backend-available
 usr/lib/cups/cgi-bin
-usr/lib/cups/monitor
 usr/lib/cups/daemon/cups-deviced
 usr/lib/cups/daemon/cups-driverd
 usr/lib/cups/daemon/cups-lpd
-usr/lib/cups/filter/rasterto*
 usr/lib/cups/driver/
+usr/lib/cups/filter/rasterto*
+usr/lib/cups/monitor
 usr/sbin/cupsfilter
-../presubj usr/share/bug/cups/
diff --git a/debian/cups.maintscript b/debian/cups.maintscript
index 697e736df..324c9cf03 100644
--- a/debian/cups.maintscript
+++ b/debian/cups.maintscript
@@ -1,14 +1,12 @@
 # These three were removed in 1.3.10-3, but we're only finally doing this in 2.1.0-4~
-rm_conffile /etc/cups/pstopdf.convs 2.1.0-4~
-rm_conffile /etc/cups/oopstops.convs 2.1.0-4~
-rm_conffile /etc/cups/oopstops.types 2.1.0-4~
-
 # These two were removed in 1.4.0~svn8773-1~, but we're only finally doing this in 2.0.3-9~
+mv_conffile /etc/logrotate.d/cups /etc/logrotate.d/cups-daemon 1.6.1~
+rm_conffile /etc/cups/acroread.conf 1.6.2-9~
 rm_conffile /etc/cups/mime.convs 2.0.3-9~
 rm_conffile /etc/cups/mime.types 2.0.3-9~
-
-rm_conffile /etc/cups/acroread.conf 1.6.2-9~
+rm_conffile /etc/cups/oopstops.convs 2.1.0-4~
+rm_conffile /etc/cups/oopstops.types 2.1.0-4~
 rm_conffile /etc/cups/pdftops.conf  1.6.2-9~
-rm_conffile /etc/modprobe.d/blacklist-cups-usblp.conf 1.5.3-2.1~
-mv_conffile /etc/logrotate.d/cups /etc/logrotate.d/cups-daemon 1.6.1~
+rm_conffile /etc/cups/pstopdf.convs 2.1.0-4~
 rm_conffile /etc/logrotate.d/cups 1.6.2-3~
+rm_conffile /etc/modprobe.d/blacklist-cups-usblp.conf 1.5.3-2.1~
diff --git a/debian/cups.manpages b/debian/cups.manpages
index b92311108..68bd192e2 100644
--- a/debian/cups.manpages
+++ b/debian/cups.manpages
@@ -1,11 +1,10 @@
 usr/share/man/man1/cups.1
-usr/share/man/man7/filter.7
-usr/share/man/man5/subscriptions.conf.5
 usr/share/man/man5/mime.convs.5
-usr/share/man/man8/cupsd-helper.8
+usr/share/man/man5/subscriptions.conf.5
+usr/share/man/man7/filter.7
 usr/share/man/man8/cups-deviced.8
 usr/share/man/man8/cups-driverd.8
 usr/share/man/man8/cups-exec.8
-usr/share/man/man8/cupsfilter.8
 usr/share/man/man8/cups-lpd.8
-
+usr/share/man/man8/cupsd-helper.8
+usr/share/man/man8/cupsfilter.8
diff --git a/debian/libcups2-dev.install b/debian/libcups2-dev.install
index 19adf744a..4499457f2 100644
--- a/debian/libcups2-dev.install
+++ b/debian/libcups2-dev.install
@@ -1,6 +1,6 @@
+#../../cups/language-private.h
+#usr/include/cups/i18n.h
 usr/bin/cups-config
-usr/lib/*/libcups.so
-usr/lib/*/libcups.a
 usr/include/cups/adminutil.h
 usr/include/cups/array.h
 usr/include/cups/backend.h
@@ -15,4 +15,5 @@ usr/include/cups/pwg.h
 usr/include/cups/sidechannel.h
 usr/include/cups/transcode.h
 usr/include/cups/versioning.h
-#../../cups/language-private.h usr/include/cups/i18n.h
+usr/lib/*/libcups.a
+usr/lib/*/libcups.so
diff --git a/debian/libcupsimage2-dev.install b/debian/libcupsimage2-dev.install
index 765bae427..fa0f36a23 100644
--- a/debian/libcupsimage2-dev.install
+++ b/debian/libcupsimage2-dev.install
@@ -1,3 +1,3 @@
-usr/lib/*/libcupsimage.so
-usr/lib/*/libcupsimage.a
 usr/include/cups/raster.h
+usr/lib/*/libcupsimage.a
+usr/lib/*/libcupsimage.so
diff --git a/debian/tests/control b/debian/tests/control
index b6ddf35bc..08449d77a 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,11 +1,18 @@
 Tests: cups-core-drivers
 Restrictions: needs-root
-Depends: cups-core-drivers, cups-client
+Depends:
+ cups-client,
+ cups-core-drivers,
 
 Tests: cups
 Restrictions: needs-root
-Depends: cups, cups-client
+Depends:
+ cups,
+ cups-client,
 
 Tests: cups-basiccommands
 Restrictions: needs-root
-Depends: cups, cups-client, cups-bsd
+Depends:
+ cups,
+ cups-bsd,
+ cups-client,
-- 
cgit v1.2.3


From 1c44289749105516d66236ecedf5755200e6c1c7 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 12 Feb 2021 12:47:59 +0100
Subject: Drop cups.maintscript as all stanzas are for pre-stable releases

---
 debian/cups.maintscript | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 debian/cups.maintscript

diff --git a/debian/cups.maintscript b/debian/cups.maintscript
deleted file mode 100644
index 324c9cf03..000000000
--- a/debian/cups.maintscript
+++ /dev/null
@@ -1,12 +0,0 @@
-# These three were removed in 1.3.10-3, but we're only finally doing this in 2.1.0-4~
-# These two were removed in 1.4.0~svn8773-1~, but we're only finally doing this in 2.0.3-9~
-mv_conffile /etc/logrotate.d/cups /etc/logrotate.d/cups-daemon 1.6.1~
-rm_conffile /etc/cups/acroread.conf 1.6.2-9~
-rm_conffile /etc/cups/mime.convs 2.0.3-9~
-rm_conffile /etc/cups/mime.types 2.0.3-9~
-rm_conffile /etc/cups/oopstops.convs 2.1.0-4~
-rm_conffile /etc/cups/oopstops.types 2.1.0-4~
-rm_conffile /etc/cups/pdftops.conf  1.6.2-9~
-rm_conffile /etc/cups/pstopdf.convs 2.1.0-4~
-rm_conffile /etc/logrotate.d/cups 1.6.2-3~
-rm_conffile /etc/modprobe.d/blacklist-cups-usblp.conf 1.5.3-2.1~
-- 
cgit v1.2.3


From 6a566d867dc240f361b7859ba3c5444942172585 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 12 Feb 2021 13:06:06 +0100
Subject: Salsa; do not accept reprotest failure anymore

---
 debian/gitlab-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
index 0e9d6d9c6..0c22dc437 100644
--- a/debian/gitlab-ci.yml
+++ b/debian/gitlab-ci.yml
@@ -1,6 +1,3 @@
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-
-reprotest:
-  allow_failure: true
-- 
cgit v1.2.3


From c73daa1bc64438ec1e11e13ad62e49cf66386e44 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 12 Feb 2021 13:47:22 +0100
Subject: Let cups.1 point to client.conf.5, not client.conf.7

Bug: https://github.com/OpenPrinting/cups/pull/92
Closes: #982303
---
 man/cups.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/cups.1 b/man/cups.1
index 706620d7c..751ad9a44 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -125,7 +125,7 @@ Printers that do not support IPP can be supported using applications such as
 .BR ippeveprinter (1).
 .SH SEE ALSO
 .BR cancel (1),
-.BR client.conf (7),
+.BR client.conf (5),
 .BR cupsctl (8),
 .BR cupsd (8),
 .BR lp (1),
-- 
cgit v1.2.3


From f64119b101aa56ebc81f4188e1526b3d986d1785 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:29 +0200
Subject: Apple AirPrint support

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Bug: https://github.com/OpenPrinting/cups/pull/27
---
 conf/mime.convs.in   | 3 +++
 conf/mime.types      | 3 +++
 scheduler/conf.c     | 2 +-
 scheduler/dirsvc.c   | 6 ++++++
 scheduler/printers.c | 4 +++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 57b459d73..e042e0129 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 application/vnd.cups-raster	image/urf			100	rastertopwg
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf    	      	       application/pdf			100	-
+
 ########################################################################
 #
 # Raw filter...
diff --git a/conf/mime.types b/conf/mime.types
index fcd6b6eff..ebb05257e 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
 image/x-bitmap			bmp string(0,BM) + !printable(2,14)
 image/x-icon			ico
 
+# Needed for printing from iOS (AirPrint) clients
+image/urf			urf string(0,UNIRAST<00>)
+
 ########################################################################
 #
 # Text files...
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 74531a8c7..bfd1b0b75 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
   cupsdClearString(&DNSSDHostName);
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index ddd3701e0..fb2a30526 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
     keyvalue[count  ][0] = "pdl";
     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
 
+    /* iOS 6 does not accept this printer as AirPrint printer if there is
+       no URF txt record or "URF=none", "DM3" is the minimum needed found
+       by try and error */
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "DM3";
+
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
       keyvalue[count  ][0] = "air";
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 7e9a9f265..3e0087496 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
       }
       else if (!_cups_strcasecmp(type->super, "image"))
       {
-        if (!_cups_strcasecmp(type->type, "jpeg"))
+        if (!_cups_strcasecmp(type->type, "urf"))
+	  strlcat(pdl, "image/urf,", sizeof(pdl));
+	else if (!_cups_strcasecmp(type->type, "jpeg"))
 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
 	else if (!_cups_strcasecmp(type->type, "png"))
 	  strlcat(pdl, "image/png,", sizeof(pdl));
-- 
cgit v1.2.3


From 52513baec06fbc8cb0a487fb1fca3863acfce11d Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:36 +0200
Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames

Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
---
 scheduler/cups-driverd.cxx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 85516eb8c..874eb3c07 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
 	const char *scheme)		/* I - PPD scheme */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
 
- /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
  /*
   * Add the PPD to the PPD arrays...
   */
-- 
cgit v1.2.3


From e1c35258dfd27a1c40948ceeed600108c50dbdc8 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Debian: Set LogFileGroup to adm

---
 conf/cups-files.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index af11fcce6..80ca35145 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
 #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
 #LogFilePerm 0@CUPS_LOG_FILE_PERM@
 
+# Specifies the group name or ID that will be used for log files.
+# The default group in Debian is "adm".
+LogFileGroup adm
+
 # Location of the file logging all access to the scheduler; may be the name
 # "syslog". If not an absolute path, the value of ServerRoot is used as the
 # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
-- 
cgit v1.2.3


From 14eba98368f3201eafd217bb3563ba41a8d597a5 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:24 +0200
Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR

Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug: https://github.com/OpenPrinting/cups/pull/26
Bug-Debian: https://bugs.debian.org/640124
---
 cgi-bin/admin.c | 6 +++++-
 conf/Makefile   | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index c6489389f..5ff750190 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     int		ch;			/* Character from file */
     char	filename[1024];		/* Filename */
     const char	*server_root;		/* Location of config files */
+    const char	*data_dir;		/* Location of data files */
 
 
    /*
@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     * well...
     */
 
-    strlcat(filename, ".default", sizeof(filename));
+    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
+      data_dir = CUPS_DATADIR;
+
+    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
 
     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
         (cupsd = cupsFileOpen(filename, "r")) != NULL)
diff --git a/conf/Makefile b/conf/Makefile
index e249e6069..42a123f75 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -70,7 +70,7 @@ install-data:
 		else \
 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
+		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
 	done
 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
@@ -118,9 +118,10 @@ install-libs:
 #
 
 uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+	for file in $(KEEP) $(REPLACE); do \
 		$(RM) $(SERVERROOT)/$$file; \
 	done
+	$(RM) $(DATADIR)/cupsd.conf.default
 	-$(RMDIR) $(SERVERROOT)
 	for file in $(REPLACE); do \
 		$(RM) $(DATADIR)/mime/$$file; \
-- 
cgit v1.2.3


From 090b8da39e20432bbe1e897c2861d1bfb5cd6a25 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Debian: Do not alter the permissions of cupsd.conf, ever

Origin: vendor
Bug: https://github.com/OpenPrinting/cups/pull/36
---
 scheduler/conf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scheduler/conf.c b/scheduler/conf.c
index bfd1b0b75..c8cd5ea49 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
 			     Group, 1, 1) < 0 ||
        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
 			     Group, 1, 0) < 0 ||
+       /* Never alter permissions of central conffile
        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
 			     Group, 0, 0) < 0 ||
+       */
        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
 			     Group, 0, 0) < 0 ||
        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
-- 
cgit v1.2.3


From ab129723c702c47bdaceccbaeeb047d7a6bf2fe4 Mon Sep 17 00:00:00 2001
From: Till Kampetter <till.kampetter@gmail.com>
Date: Tue, 9 Aug 2016 18:11:43 +0200
Subject: Debian: Show compile command lines

---
 Makedefs.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makedefs.in b/Makedefs.in
index 9ee75856d..038bb9451 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
 # Rules...
 #
 
-.SILENT:
 .SUFFIXES:	.a .c .cxx .h .o
 
 .c.o:
-- 
cgit v1.2.3


From ba98b4226b78cd65ac5d0606d16cfc3e4e950556 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Use dpkg-architecture in cups-config to make it
 architecture-independant

 Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config

Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
---
 cups-config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cups-config.in b/cups-config.in
index 9dd094d16..b073a074a 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -17,7 +17,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 includedir=@includedir@
-libdir=@libdir@
+libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 datarootdir=@datadir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
+LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -43,7 +44,7 @@ else
 	CFLAGS="$CFLAGS -I$includedir"
     fi
 
-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
+    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
 	LDFLAGS="$LDFLAGS -L$libdir"
     fi
 fi
-- 
cgit v1.2.3


From 92c6adf66499e252d8fa4b2b0702acc370d5a740 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Aug 2016 18:11:49 +0200
Subject: Debian: Build mantohtml with the build architecture compiler

mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936
---
 Makedefs.in     |  1 +
 configure.ac    |  9 +++++++++
 man/Makefile    |  5 ++---
 man/mantohtml.c | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 038bb9451..291099cf2 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL_CC@ @CC@
+CC_FOR_BUILD	=	@CC_FOR_BUILD@
 CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL_CXX@ @CXX@
 DSO		=	@DSO@
diff --git a/configure.ac b/configure.ac
index 93a4b9739..b60b832c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+AC_MSG_CHECKING([for build system compiler])
+if test "$cross_compiling" = yes; then
+	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
+else
+	CC_FOR_BUILD=${CC}
+fi
+AC_MSG_RESULT(${CC_FOR_BUILD})
+AC_SUBST(CC_FOR_BUILD)
+
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
diff --git a/man/Makefile b/man/Makefile
index 621fe60c1..e01591a93 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
 	done
 
-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 2a9353a9f..6223f17d2 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -11,8 +11,10 @@
  * Include necessary headers.
  */
 
-#include <cups/string-private.h>
-#include <cups/array-private.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
         * Anchor for HTML output...
         */
 
-        strlcpy(anchor, line + 4, sizeof(anchor));
+        strncpy(anchor, line + 4, sizeof(anchor) - 1);
+        anchor[sizeof(anchor) - 1] = '\0';
       }
       else if (strncmp(line, ".\\\"", 3))
       {
@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
 		manfile[1024],		/* Man page filename */
 		manurl[1024];		/* Man page URL */
 
-        strlcpy(name, s, sizeof(name));
+        strncpy(name, s, sizeof(name) - 1);
+        name[sizeof(name) - 1] = '\0';
         if ((size_t)(end - s) < sizeof(name))
           name[end - s] = '\0';
 
@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
         end --;
 
-      strlcpy(temp, s, sizeof(temp));
+      strncpy(temp, s, sizeof(temp) - 1);
+      temp[sizeof(temp) - 1] = '\0';
       if ((size_t)(end -s) < sizeof(temp))
         temp[end - s] = '\0';
 
-- 
cgit v1.2.3


From 697065c444602c691dd364a315680a12f17cc59c Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 3 Feb 2021 14:27:34 +0100
Subject: Debian: Reproducibility: httpAddrGetHostname() test fails under
 reprotest; skip it

---
 cups/testhttp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cups/testhttp.c b/cups/testhttp.c
index dfb767c89..8cb87d6fe 100644
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -416,8 +416,7 @@ main(int  argc,				/* I - Number of command-line arguments */
     }
     else
     {
-      failures ++;
-      puts("FAIL");
+      puts("FAIL (Debian Reproducibility; failure allowed, as this is known to fail under reprotest");
     }
 
    /*
-- 
cgit v1.2.3


From 70966a573839b0e5c3574d51ce7ef1a358fcb285 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 3 Feb 2021 16:30:08 +0100
Subject: Debian: Reproducibility: Do not run stp tests as root

Reprotest insist in running these tests as root; skip them there.
---
 test/run-stp-tests.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 4498a8c10..ce868ea43 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -19,7 +19,8 @@ argcount=$#
 
 if test "x`id -u`" = x0; then
 	echo Please run this as a normal user. Not supported when run as root.
-	exit 1
+	echo "Debian Reproducibility: Skipping allowed, as this is known to break under reprotest. This message MUST NOT be visible in normal Debian buildd logs."
+	exit 0
 fi
 
 #
-- 
cgit v1.2.3


From f92992e02e7cfb62679ca70c0741da0adecf32b3 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Wed, 3 Feb 2021 16:20:20 +0100
Subject: Debian: Reproducibility: Run testlang for each provided CUPS locale
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… and only for these.

Of the build environment forces LC_ALL to a non-provided locale, the build will fail.
---
 cups/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cups/Makefile b/cups/Makefile
index 4e2aa6d37..20683499b 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -639,9 +639,9 @@ testlang:	testlang.o $(LIBCUPSSTATIC)
 		lang=`basename $$po .po | sed -e '1,$$s/^cups_//'`; \
 		$(MKDIR) locale/$$lang; \
 		$(LN) ../../$$po locale/$$lang; \
+		echo Running language API tests for $$lang...; \
+		LOCALEDIR=locale ./testlang -l $$lang; \
 	done
-	echo Running language API tests...
-	LOCALEDIR=locale ./testlang
 
 
 #
-- 
cgit v1.2.3


From 65a7ba6d5e6e9acbc887b827f5c3dba098cfda71 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: Debian: po4a infrastructure and translations for manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
---
 man/Makefile      |  17 +++-
 man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/de/Makefile   |   7 ++
 man/fr/Makefile   |   7 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 man/Makefile.l10n
 create mode 100644 man/de/Makefile
 create mode 100644 man/fr/Makefile

diff --git a/man/Makefile b/man/Makefile
index e01591a93..48f06c48a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
 		lpmove.8 \
 		lpc.8
 
+LANGUAGES=de fr
 
 #
 # Make everything...
 #
 
-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
+
+translations:
+	# Update the translations and build the translated material
+	po4a --previous ../debian/manpage-po4a/cups.cfg
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
 
 
 #
@@ -91,6 +97,12 @@ unittests:
 
 clean:
 	$(RM) mantohtml mantohtml.o
+	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
+	# Make sure the PO files are updated and remove generated
+	# translations.
+	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
+	$(RM) ../debian/manpage-po4a/po/cups.pot
 
 
 #
@@ -142,6 +154,7 @@ install-data: all
 		$(RM) $(MANDIR)/man8/$$file; \
 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
 	done
+	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
 
 
 #
@@ -189,7 +202,7 @@ uninstall:
 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
 		$(RM) $(MANDIR)/man8/$$file; \
 	done
-	-$(RMDIR) $(MANDIR)/man8
+	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
 
 
 #
diff --git a/man/Makefile.l10n b/man/Makefile.l10n
new file mode 100644
index 000000000..08390f5dc
--- /dev/null
+++ b/man/Makefile.l10n
@@ -0,0 +1,235 @@
+#
+# Man page makefile for CUPS.
+#
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1993-2006 by Easy Software Products.
+#
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
+#
+
+include ../../Makedefs
+
+
+#
+# Man pages...
+#
+
+MAN1	=	cancel.1 \
+		cups.1 \
+		cups-config.1 \
+		cupstestppd.1 \
+		ippeveprinter.1 \
+		$(IPPFIND_MAN) \
+		ipptool.1 \
+		lp.1 \
+		lpoptions.1 \
+		lpq.1 \
+		lprm.1 \
+		lpr.1 \
+		lpstat.1 \
+		ppdc.1 \
+		ppdhtml.1 \
+		ppdi.1 \
+		ppdmerge.1 \
+		ppdpo.1
+MAN5	=	classes.conf.5 \
+		client.conf.5 \
+		cups-files.conf.5 \
+		cups-snmp.conf.5 \
+		cupsd.conf.5 \
+		cupsd-logs.5 \
+		ipptoolfile.5 \
+		mailto.conf.5 \
+		mime.convs.5 \
+		mime.types.5 \
+		ppdcfile.5 \
+		printers.conf.5 \
+		subscriptions.conf.5
+MAN7	=	backend.7 \
+		filter.7 \
+		ippevepcl.7 \
+		notifier.7
+MAN8	=	cupsaccept.8 \
+		cupsctl.8 \
+		cupsfilter.8 \
+		cups-lpd.8 \
+		cups-snmp.8 \
+		cupsd.8 \
+		cupsd-helper.8 \
+		cupsenable.8 \
+		lpadmin.8 \
+		lpinfo.8 \
+		lpmove.8 \
+		lpc.8
+
+
+#
+# Make everything...
+#
+
+# Debian-specific patch: Just assume all files are here.
+all:
+
+
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
+#
+# Clean all config and object files...
+#
+
+clean:
+	$(RM) mantohtml mantohtml.o
+
+
+#
+# Dummy depend target...
+#
+
+depend:
+
+
+#
+# Install all targets...
+#
+
+# Debian-specific patch: directory-based language namespace
+MANDIR := $(MANDIR)/$(LANGUAGE)
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+# Debian-specific patch: skip if doesn't exist
+install-data: all
+	echo Installing man pages in $(MANDIR)/man1...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
+	for file in $(MAN1); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
+	done
+	echo Installing man pages in $(MANDIR)/man5...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
+	for file in $(MAN5); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
+	done
+	echo Installing man pages in $(MANDIR)/man7...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
+	for file in $(MAN7); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
+	done
+	$(RM) $(MANDIR)/man7/ippeveps.7
+	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
+	echo Installing man pages in $(MANDIR)/man8...
+	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
+	for file in $(MAN8); do \
+		[ ! -r $$file ] || \
+		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
+	done
+	$(RM) $(MANDIR)/man8/cupsdisable.8
+	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
+	$(RM) $(MANDIR)/man8/cupsreject.8
+	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
+	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+	done
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	echo Uninstalling man pages from $(MANDIR)/man1...
+	for file in $(MAN1); do \
+		$(RM) $(MANDIR)/man1/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man1
+	echo Uninstalling man pages from $(MANDIR)/man5...
+	for file in $(MAN5); do \
+		$(RM) $(MANDIR)/man5/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man5
+	echo Uninstalling man pages from $(MANDIR)/man7...
+	for file in $(MAN7) ippeveps.7; do \
+		$(RM) $(MANDIR)/man7/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man7
+	echo Uninstalling man pages from $(MANDIR)/man8...
+	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+		$(RM) $(MANDIR)/man8/$$file; \
+	done
+	-$(RMDIR) $(MANDIR)/man8
+
+
+#
+# Local programs (not built when cross-compiling...)
+#
+
+local:	html
+
+
+#
+# Make html versions of man pages...
+#
+
+html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+	echo Converting man pages to HTML...
+	for file in $(MAN1); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
+	done
+	for file in $(MAN5); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
+	done
+	for file in $(MAN7); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
+	done
+	for file in $(MAN8); do \
+		echo "    $$file..."; \
+		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+	done
+
+mantohtml:	mantohtml.c
+	$(CC_FOR_BUILD) -o $@ $<
diff --git a/man/de/Makefile b/man/de/Makefile
new file mode 100644
index 000000000..7c237840e
--- /dev/null
+++ b/man/de/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=de
+
+include ../Makefile.l10n
diff --git a/man/fr/Makefile b/man/fr/Makefile
new file mode 100644
index 000000000..6a50e9348
--- /dev/null
+++ b/man/fr/Makefile
@@ -0,0 +1,7 @@
+#
+#   Man page makefile for the Common UNIX Printing System (CUPS).
+#
+
+LANGUAGE=fr
+
+include ../Makefile.l10n
-- 
cgit v1.2.3


From f73c4567702c753af87d11dfcfc40430e806a828 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 12 Feb 2021 14:09:07 +0100
Subject: Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...-point-to-client.conf.5-not-client.conf.7.patch |  23 ++
 debian/patches/0002-Apple-AirPrint-support.patch   |  90 ++++++
 ...tic-PPDs-recommended-stanzas-in-NickNames.patch |  37 +++
 .../0004-Debian-Set-LogFileGroup-to-adm.patch      |  23 ++
 ...-cupsd.conf.default-from-SERVERROOT-to-DA.patch |  62 ++++
 ...ot-alter-the-permissions-of-cupsd.conf-ev.patch |  27 ++
 .../0007-Debian-Show-compile-command-lines.patch   |  20 ++
 ...dpkg-architecture-in-cups-config-to-make-.patch |  49 +++
 ...d-mantohtml-with-the-build-architecture-c.patch | 110 +++++++
 ...oducibility-httpAddrGetHostname-test-fail.patch |  23 ++
 ...roducibility-Do-not-run-stp-tests-as-root.patch |  23 ++
 ...oducibility-Run-testlang-for-each-provide.patch |  30 ++
 ...-infrastructure-and-translations-for-manp.patch | 341 +++++++++++++++++++++
 debian/patches/series                              |  13 +
 14 files changed, 871 insertions(+)
 create mode 100644 debian/patches/0001-Let-cups.1-point-to-client.conf.5-not-client.conf.7.patch
 create mode 100644 debian/patches/0002-Apple-AirPrint-support.patch
 create mode 100644 debian/patches/0003-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
 create mode 100644 debian/patches/0004-Debian-Set-LogFileGroup-to-adm.patch
 create mode 100644 debian/patches/0005-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
 create mode 100644 debian/patches/0006-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
 create mode 100644 debian/patches/0007-Debian-Show-compile-command-lines.patch
 create mode 100644 debian/patches/0008-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
 create mode 100644 debian/patches/0009-Debian-Build-mantohtml-with-the-build-architecture-c.patch
 create mode 100644 debian/patches/0010-Debian-Reproducibility-httpAddrGetHostname-test-fail.patch
 create mode 100644 debian/patches/0011-Debian-Reproducibility-Do-not-run-stp-tests-as-root.patch
 create mode 100644 debian/patches/0012-Debian-Reproducibility-Run-testlang-for-each-provide.patch
 create mode 100644 debian/patches/0013-Debian-po4a-infrastructure-and-translations-for-manp.patch
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0001-Let-cups.1-point-to-client.conf.5-not-client.conf.7.patch b/debian/patches/0001-Let-cups.1-point-to-client.conf.5-not-client.conf.7.patch
new file mode 100644
index 000000000..db22adeee
--- /dev/null
+++ b/debian/patches/0001-Let-cups.1-point-to-client.conf.5-not-client.conf.7.patch
@@ -0,0 +1,23 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Fri, 12 Feb 2021 13:47:22 +0100
+Subject: Let cups.1 point to client.conf.5, not client.conf.7
+
+Bug: https://github.com/OpenPrinting/cups/pull/92
+Closes: #982303
+---
+ man/cups.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/cups.1 b/man/cups.1
+index 706620d..751ad9a 100644
+--- a/man/cups.1
++++ b/man/cups.1
+@@ -125,7 +125,7 @@ Printers that do not support IPP can be supported using applications such as
+ .BR ippeveprinter (1).
+ .SH SEE ALSO
+ .BR cancel (1),
+-.BR client.conf (7),
++.BR client.conf (5),
+ .BR cupsctl (8),
+ .BR cupsd (8),
+ .BR lp (1),
diff --git a/debian/patches/0002-Apple-AirPrint-support.patch b/debian/patches/0002-Apple-AirPrint-support.patch
new file mode 100644
index 000000000..5fc39dfe8
--- /dev/null
+++ b/debian/patches/0002-Apple-AirPrint-support.patch
@@ -0,0 +1,90 @@
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:29 +0200
+Subject: Apple AirPrint support
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
+Bug-Debian: https://bugs.debian.org/700961
+Bug: https://github.com/apple/cups/issues/4341
+Bug: https://github.com/OpenPrinting/cups/pull/27
+---
+ conf/mime.convs.in   | 3 +++
+ conf/mime.types      | 3 +++
+ scheduler/conf.c     | 2 +-
+ scheduler/dirsvc.c   | 6 ++++++
+ scheduler/printers.c | 4 +++-
+ 5 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/conf/mime.convs.in b/conf/mime.convs.in
+index 57b459d..e042e01 100644
+--- a/conf/mime.convs.in
++++ b/conf/mime.convs.in
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
+ application/vnd.cups-raster	image/urf			100	rastertopwg
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf    	      	       application/pdf			100	-
++
+ ########################################################################
+ #
+ # Raw filter...
+diff --git a/conf/mime.types b/conf/mime.types
+index fcd6b6e..ebb0525 100644
+--- a/conf/mime.types
++++ b/conf/mime.types
+@@ -108,6 +108,9 @@ image/x-alias			pix short(8,8) short(8,24)
+ image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+ image/x-icon			ico
+ 
++# Needed for printing from iOS (AirPrint) clients
++image/urf			urf string(0,UNIRAST<00>)
++
+ ########################################################################
+ #
+ # Text files...
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index 74531a8..bfd1b0b 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -750,7 +750,7 @@ cupsdReadConfiguration(void)
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+ #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
++  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
+   cupsdClearString(&DNSSDHostName);
+ #endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
+index ddd3701..fb2a305 100644
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
+     keyvalue[count  ][0] = "pdl";
+     keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+ 
++    /* iOS 6 does not accept this printer as AirPrint printer if there is
++       no URF txt record or "URF=none", "DM3" is the minimum needed found
++       by try and error */
++    keyvalue[count  ][0] = "URF";
++    keyvalue[count++][1] = "DM3";
++
+     if (get_auth_info_required(p, air_str, sizeof(air_str)))
+     {
+       keyvalue[count  ][0] = "air";
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 7e9a9f2..3e00874 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -3733,7 +3733,9 @@ add_printer_formats(cupsd_printer_t *p)	/* I - Printer */
+       }
+       else if (!_cups_strcasecmp(type->super, "image"))
+       {
+-        if (!_cups_strcasecmp(type->type, "jpeg"))
++        if (!_cups_strcasecmp(type->type, "urf"))
++	  strlcat(pdl, "image/urf,", sizeof(pdl));
++	else if (!_cups_strcasecmp(type->type, "jpeg"))
+ 	  strlcat(pdl, "image/jpeg,", sizeof(pdl));
+ 	else if (!_cups_strcasecmp(type->type, "png"))
+ 	  strlcat(pdl, "image/png,", sizeof(pdl));
diff --git a/debian/patches/0003-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch b/debian/patches/0003-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
new file mode 100644
index 000000000..0da73cea6
--- /dev/null
+++ b/debian/patches/0003-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
@@ -0,0 +1,37 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:36 +0200
+Subject: Keep foomatic PPDs "(recommended)" stanzas in NickNames
+
+Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
+---
+ scheduler/cups-driverd.cxx | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
+index 85516eb..874eb3c 100644
+--- a/scheduler/cups-driverd.cxx
++++ b/scheduler/cups-driverd.cxx
+@@ -240,7 +240,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+ 	const char *scheme)		/* I - PPD scheme */
+ {
+   ppd_info_t	*ppd;			/* PPD */
+-  char		*recommended;		/* Foomatic driver string */
+ 
+ 
+  /*
+@@ -278,15 +277,6 @@ add_ppd(const char *filename,		/* I - PPD filename */
+   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
+   strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
+ 
+- /*
+-  * Strip confusing (and often wrong) "recommended" suffix added by
+-  * Foomatic drivers...
+-  */
+-
+-  if ((recommended = strstr(ppd->record.make_and_model,
+-                            " (recommended)")) != NULL)
+-    *recommended = '\0';
+-
+  /*
+   * Add the PPD to the PPD arrays...
+   */
diff --git a/debian/patches/0004-Debian-Set-LogFileGroup-to-adm.patch b/debian/patches/0004-Debian-Set-LogFileGroup-to-adm.patch
new file mode 100644
index 000000000..597d9bfad
--- /dev/null
+++ b/debian/patches/0004-Debian-Set-LogFileGroup-to-adm.patch
@@ -0,0 +1,23 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Debian: Set LogFileGroup to adm
+
+---
+ conf/cups-files.conf.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
+index af11fcc..80ca351 100644
+--- a/conf/cups-files.conf.in
++++ b/conf/cups-files.conf.in
+@@ -29,6 +29,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@
+ #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@
+ #LogFilePerm 0@CUPS_LOG_FILE_PERM@
+ 
++# Specifies the group name or ID that will be used for log files.
++# The default group in Debian is "adm".
++LogFileGroup adm
++
+ # Location of the file logging all access to the scheduler; may be the name
+ # "syslog". If not an absolute path, the value of ServerRoot is used as the
+ # root directory.  Also see the "AccessLogLevel" directive in cupsd.conf.
diff --git a/debian/patches/0005-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch b/debian/patches/0005-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
new file mode 100644
index 000000000..c4efe6cad
--- /dev/null
+++ b/debian/patches/0005-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
@@ -0,0 +1,62 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:24 +0200
+Subject: Debian: Move cupsd.conf.default from SERVERROOT to DATADIR
+
+Origin: vendor
+Bug: https://github.com/apple/cups/issues/4342
+Bug: https://github.com/OpenPrinting/cups/pull/26
+Bug-Debian: https://bugs.debian.org/640124
+---
+ cgi-bin/admin.c | 6 +++++-
+ conf/Makefile   | 5 +++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
+index c648938..5ff7501 100644
+--- a/cgi-bin/admin.c
++++ b/cgi-bin/admin.c
+@@ -1636,6 +1636,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     int		ch;			/* Character from file */
+     char	filename[1024];		/* Filename */
+     const char	*server_root;		/* Location of config files */
++    const char	*data_dir;		/* Location of data files */
+ 
+ 
+    /*
+@@ -1719,7 +1720,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
+     * well...
+     */
+ 
+-    strlcat(filename, ".default", sizeof(filename));
++    if ((data_dir = getenv("CUPS_DATADIR")) == NULL)
++      data_dir = CUPS_DATADIR;
++
++    snprintf(filename, sizeof(filename), "%s/cupsd.conf.default",data_dir);
+ 
+     if (!stat(filename, &info) && info.st_size < (1024 * 1024) &&
+         (cupsd = cupsFileOpen(filename, "r")) != NULL)
+diff --git a/conf/Makefile b/conf/Makefile
+index e249e60..42a123f 100644
+--- a/conf/Makefile
++++ b/conf/Makefile
+@@ -70,7 +70,7 @@ install-data:
+ 		else \
+ 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
+ 		fi ; \
+-		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \
++		$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+@@ -118,9 +118,10 @@ install-libs:
+ #
+ 
+ uninstall:
+-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
++	for file in $(KEEP) $(REPLACE); do \
+ 		$(RM) $(SERVERROOT)/$$file; \
+ 	done
++	$(RM) $(DATADIR)/cupsd.conf.default
+ 	-$(RMDIR) $(SERVERROOT)
+ 	for file in $(REPLACE); do \
+ 		$(RM) $(DATADIR)/mime/$$file; \
diff --git a/debian/patches/0006-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch b/debian/patches/0006-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
new file mode 100644
index 000000000..bcbc93a03
--- /dev/null
+++ b/debian/patches/0006-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
@@ -0,0 +1,27 @@
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:41 +0200
+Subject: Debian: Do not alter the permissions of cupsd.conf, ever
+
+Origin: vendor
+Bug: https://github.com/OpenPrinting/cups/pull/36
+---
+ scheduler/conf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scheduler/conf.c b/scheduler/conf.c
+index bfd1b0b..c8cd5ea 100644
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -1140,10 +1140,12 @@ cupsdReadConfiguration(void)
+ 			     Group, 1, 1) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ 			     Group, 1, 0) < 0 ||
++       /* Never alter permissions of central conffile
+        cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ 			     Group, 0, 0) < 0 ||
++       */
+        cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ 			     Group, 0, 0) < 0 ||
+        cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
diff --git a/debian/patches/0007-Debian-Show-compile-command-lines.patch b/debian/patches/0007-Debian-Show-compile-command-lines.patch
new file mode 100644
index 000000000..a3c709609
--- /dev/null
+++ b/debian/patches/0007-Debian-Show-compile-command-lines.patch
@@ -0,0 +1,20 @@
+From: Till Kampetter <till.kampetter@gmail.com>
+Date: Tue, 9 Aug 2016 18:11:43 +0200
+Subject: Debian: Show compile command lines
+
+---
+ Makedefs.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 9ee7585..038bb94 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -263,7 +263,6 @@ USBQUIRKS	=	@USBQUIRKS@
+ # Rules...
+ #
+ 
+-.SILENT:
+ .SUFFIXES:	.a .c .cxx .h .o
+ 
+ .c.o:
diff --git a/debian/patches/0008-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch b/debian/patches/0008-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
new file mode 100644
index 000000000..7f508d999
--- /dev/null
+++ b/debian/patches/0008-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
@@ -0,0 +1,49 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Use dpkg-architecture in cups-config to make it
+ architecture-independant
+
+ Also filter -L/usr/lib/(triplet) out of LDFLAGS.
+ Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
+
+Bug-Debian: https://bugs.debian.org/741519
+Bug-Debian: https://bugs.debian.org/727058
+Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751157
+---
+ cups-config.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/cups-config.in b/cups-config.in
+index 9dd094d..b073a07 100755
+--- a/cups-config.in
++++ b/cups-config.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ includedir=@includedir@
+-libdir=@libdir@
++libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+ datarootdir=@datadir@
+ datadir=@datadir@
+ sysconfdir=@sysconfdir@
+@@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
+ # flags for compiler and linker...
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+ 
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -43,7 +44,7 @@ else
+ 	CFLAGS="$CFLAGS -I$includedir"
+     fi
+ 
+-    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
++    if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then
+ 	LDFLAGS="$LDFLAGS -L$libdir"
+     fi
+ fi
diff --git a/debian/patches/0009-Debian-Build-mantohtml-with-the-build-architecture-c.patch b/debian/patches/0009-Debian-Build-mantohtml-with-the-build-architecture-c.patch
new file mode 100644
index 000000000..44c038d74
--- /dev/null
+++ b/debian/patches/0009-Debian-Build-mantohtml-with-the-build-architecture-c.patch
@@ -0,0 +1,110 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 9 Aug 2016 18:11:49 +0200
+Subject: Debian: Build mantohtml with the build architecture compiler
+
+mantohtml is run during build. Thus it needs to be built with the build
+architecture compiler (or execution fails). The obvious part is switching to
+CC_FOR_BUILD. That also depends on it not requiring any other cups components.
+In particular, removing uses of strlcpy and replacing host architecture-
+specific includes is thus needed.
+
+Bug-Debian: https://bugs.debian.org/837936
+---
+ Makedefs.in     |  1 +
+ configure.ac    |  9 +++++++++
+ man/Makefile    |  5 ++---
+ man/mantohtml.c | 15 ++++++++++-----
+ 4 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/Makedefs.in b/Makedefs.in
+index 038bb94..291099c 100644
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -22,6 +22,7 @@ CUPS_VERSION    =       @CUPS_VERSION@
+ AR		=	@AR@
+ AWK		=	@AWK@
+ CC		=	@LIBTOOL_CC@ @CC@
++CC_FOR_BUILD	=	@CC_FOR_BUILD@
+ CHMOD		=	@CHMOD@
+ CXX		=	@LIBTOOL_CXX@ @CXX@
+ DSO		=	@DSO@
+diff --git a/configure.ac b/configure.ac
+index 93a4b97..b60b832 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,6 +20,15 @@ sinclude(config-scripts/cups-common.m4)
+ sinclude(config-scripts/cups-directories.m4)
+ sinclude(config-scripts/cups-manpages.m4)
+ 
++AC_MSG_CHECKING([for build system compiler])
++if test "$cross_compiling" = yes; then
++	CC_FOR_BUILD=${CC_FOR_BUILD-cc}
++else
++	CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT(${CC_FOR_BUILD})
++AC_SUBST(CC_FOR_BUILD)
++
+ sinclude(config-scripts/cups-sharedlibs.m4)
+ sinclude(config-scripts/cups-libtool.m4)
+ sinclude(config-scripts/cups-compiler.m4)
+diff --git a/man/Makefile b/man/Makefile
+index 621fe60..e01591a 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -222,6 +222,5 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
+ 		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
+ 	done
+ 
+-mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
+-	$(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
+-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/mantohtml.c b/man/mantohtml.c
+index 2a9353a..6223f17 100644
+--- a/man/mantohtml.c
++++ b/man/mantohtml.c
+@@ -11,8 +11,10 @@
+  * Include necessary headers.
+  */
+ 
+-#include <cups/string-private.h>
+-#include <cups/array-private.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ 
+@@ -811,7 +813,8 @@ main(int  argc,				/* I - Number of command-line args */
+         * Anchor for HTML output...
+         */
+ 
+-        strlcpy(anchor, line + 4, sizeof(anchor));
++        strncpy(anchor, line + 4, sizeof(anchor) - 1);
++        anchor[sizeof(anchor) - 1] = '\0';
+       }
+       else if (strncmp(line, ".\\\"", 3))
+       {
+@@ -940,7 +943,8 @@ html_alternate(const char *s,		/* I - String */
+ 		manfile[1024],		/* Man page filename */
+ 		manurl[1024];		/* Man page URL */
+ 
+-        strlcpy(name, s, sizeof(name));
++        strncpy(name, s, sizeof(name) - 1);
++        name[sizeof(name) - 1] = '\0';
+         if ((size_t)(end - s) < sizeof(name))
+           name[end - s] = '\0';
+ 
+@@ -1173,7 +1177,8 @@ html_fputs(const char *s,		/* I  - String */
+       if (end[-1] == ',' || end[-1] == '.' || end[-1] == ')')
+         end --;
+ 
+-      strlcpy(temp, s, sizeof(temp));
++      strncpy(temp, s, sizeof(temp) - 1);
++      temp[sizeof(temp) - 1] = '\0';
+       if ((size_t)(end -s) < sizeof(temp))
+         temp[end - s] = '\0';
+ 
diff --git a/debian/patches/0010-Debian-Reproducibility-httpAddrGetHostname-test-fail.patch b/debian/patches/0010-Debian-Reproducibility-httpAddrGetHostname-test-fail.patch
new file mode 100644
index 000000000..8db9ff408
--- /dev/null
+++ b/debian/patches/0010-Debian-Reproducibility-httpAddrGetHostname-test-fail.patch
@@ -0,0 +1,23 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Wed, 3 Feb 2021 14:27:34 +0100
+Subject: Debian: Reproducibility: httpAddrGetHostname() test fails under
+ reprotest; skip it
+
+---
+ cups/testhttp.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/cups/testhttp.c b/cups/testhttp.c
+index dfb767c..8cb87d6 100644
+--- a/cups/testhttp.c
++++ b/cups/testhttp.c
+@@ -416,8 +416,7 @@ main(int  argc,				/* I - Number of command-line arguments */
+     }
+     else
+     {
+-      failures ++;
+-      puts("FAIL");
++      puts("FAIL (Debian Reproducibility; failure allowed, as this is known to fail under reprotest");
+     }
+ 
+    /*
diff --git a/debian/patches/0011-Debian-Reproducibility-Do-not-run-stp-tests-as-root.patch b/debian/patches/0011-Debian-Reproducibility-Do-not-run-stp-tests-as-root.patch
new file mode 100644
index 000000000..545310493
--- /dev/null
+++ b/debian/patches/0011-Debian-Reproducibility-Do-not-run-stp-tests-as-root.patch
@@ -0,0 +1,23 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Wed, 3 Feb 2021 16:30:08 +0100
+Subject: Debian: Reproducibility: Do not run stp tests as root
+
+Reprotest insist in running these tests as root; skip them there.
+---
+ test/run-stp-tests.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
+index 4498a8c..ce868ea 100755
+--- a/test/run-stp-tests.sh
++++ b/test/run-stp-tests.sh
+@@ -19,7 +19,8 @@ argcount=$#
+ 
+ if test "x`id -u`" = x0; then
+ 	echo Please run this as a normal user. Not supported when run as root.
+-	exit 1
++	echo "Debian Reproducibility: Skipping allowed, as this is known to break under reprotest. This message MUST NOT be visible in normal Debian buildd logs."
++	exit 0
+ fi
+ 
+ #
diff --git a/debian/patches/0012-Debian-Reproducibility-Run-testlang-for-each-provide.patch b/debian/patches/0012-Debian-Reproducibility-Run-testlang-for-each-provide.patch
new file mode 100644
index 000000000..952576dbf
--- /dev/null
+++ b/debian/patches/0012-Debian-Reproducibility-Run-testlang-for-each-provide.patch
@@ -0,0 +1,30 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Wed, 3 Feb 2021 16:20:20 +0100
+Subject: Debian: Reproducibility: Run testlang for each provided CUPS locale
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+… and only for these.
+
+Of the build environment forces LC_ALL to a non-provided locale, the build will fail.
+---
+ cups/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cups/Makefile b/cups/Makefile
+index 4e2aa6d..2068349 100644
+--- a/cups/Makefile
++++ b/cups/Makefile
+@@ -639,9 +639,9 @@ testlang:	testlang.o $(LIBCUPSSTATIC)
+ 		lang=`basename $$po .po | sed -e '1,$$s/^cups_//'`; \
+ 		$(MKDIR) locale/$$lang; \
+ 		$(LN) ../../$$po locale/$$lang; \
++		echo Running language API tests for $$lang...; \
++		LOCALEDIR=locale ./testlang -l $$lang; \
+ 	done
+-	echo Running language API tests...
+-	LOCALEDIR=locale ./testlang
+ 
+ 
+ #
diff --git a/debian/patches/0013-Debian-po4a-infrastructure-and-translations-for-manp.patch b/debian/patches/0013-Debian-po4a-infrastructure-and-translations-for-manp.patch
new file mode 100644
index 000000000..ef9aa4262
--- /dev/null
+++ b/debian/patches/0013-Debian-po4a-infrastructure-and-translations-for-manp.patch
@@ -0,0 +1,341 @@
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 9 Aug 2016 18:11:50 +0200
+Subject: Debian: po4a infrastructure and translations for manpages
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/478597
+---
+ man/Makefile      |  17 +++-
+ man/Makefile.l10n | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/de/Makefile   |   7 ++
+ man/fr/Makefile   |   7 ++
+ 4 files changed, 264 insertions(+), 2 deletions(-)
+ create mode 100644 man/Makefile.l10n
+ create mode 100644 man/de/Makefile
+ create mode 100644 man/fr/Makefile
+
+diff --git a/man/Makefile b/man/Makefile
+index e01591a..48f06c4 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -63,12 +63,18 @@ MAN8	=	cupsaccept.8 \
+ 		lpmove.8 \
+ 		lpc.8
+ 
++LANGUAGES=de fr
+ 
+ #
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) translations
++
++translations:
++	# Update the translations and build the translated material
++	po4a --previous ../debian/manpage-po4a/cups.cfg
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang; done
+ 
+ 
+ #
+@@ -91,6 +97,12 @@ unittests:
+ 
+ clean:
+ 	$(RM) mantohtml mantohtml.o
++	$(RM) $(MAN1) $(MAN5) $(MAN7) $(MAN8)
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang clean; done
++	# Make sure the PO files are updated and remove generated
++	# translations.
++	po4a --previous --rm-translations ../debian/manpage-po4a/cups.cfg
++	$(RM) ../debian/manpage-po4a/po/cups.pot
+ 
+ 
+ #
+@@ -142,6 +154,7 @@ install-data: all
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
+ 	done
++	for lang in $(LANGUAGES); do $(MAKE) -C $$lang install; done
+ 
+ 
+ #
+@@ -189,7 +202,7 @@ uninstall:
+ 	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
+ 		$(RM) $(MANDIR)/man8/$$file; \
+ 	done
+-	-$(RMDIR) $(MANDIR)/man8
++	-$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+ 
+ 
+ #
+diff --git a/man/Makefile.l10n b/man/Makefile.l10n
+new file mode 100644
+index 0000000..08390f5
+--- /dev/null
++++ b/man/Makefile.l10n
+@@ -0,0 +1,235 @@
++#
++# Man page makefile for CUPS.
++#
++# Copyright © 2007-2019 by Apple Inc.
++# Copyright © 1993-2006 by Easy Software Products.
++#
++# Licensed under Apache License v2.0.  See the file "LICENSE" for more
++# information.
++#
++
++include ../../Makedefs
++
++
++#
++# Man pages...
++#
++
++MAN1	=	cancel.1 \
++		cups.1 \
++		cups-config.1 \
++		cupstestppd.1 \
++		ippeveprinter.1 \
++		$(IPPFIND_MAN) \
++		ipptool.1 \
++		lp.1 \
++		lpoptions.1 \
++		lpq.1 \
++		lprm.1 \
++		lpr.1 \
++		lpstat.1 \
++		ppdc.1 \
++		ppdhtml.1 \
++		ppdi.1 \
++		ppdmerge.1 \
++		ppdpo.1
++MAN5	=	classes.conf.5 \
++		client.conf.5 \
++		cups-files.conf.5 \
++		cups-snmp.conf.5 \
++		cupsd.conf.5 \
++		cupsd-logs.5 \
++		ipptoolfile.5 \
++		mailto.conf.5 \
++		mime.convs.5 \
++		mime.types.5 \
++		ppdcfile.5 \
++		printers.conf.5 \
++		subscriptions.conf.5
++MAN7	=	backend.7 \
++		filter.7 \
++		ippevepcl.7 \
++		notifier.7
++MAN8	=	cupsaccept.8 \
++		cupsctl.8 \
++		cupsfilter.8 \
++		cups-lpd.8 \
++		cups-snmp.8 \
++		cupsd.8 \
++		cupsd-helper.8 \
++		cupsenable.8 \
++		lpadmin.8 \
++		lpinfo.8 \
++		lpmove.8 \
++		lpc.8
++
++
++#
++# Make everything...
++#
++
++# Debian-specific patch: Just assume all files are here.
++all:
++
++
++#
++# Make library targets...
++#
++
++libs:
++
++
++#
++# Make unit tests...
++#
++
++unittests:
++
++
++#
++# Clean all config and object files...
++#
++
++clean:
++	$(RM) mantohtml mantohtml.o
++
++
++#
++# Dummy depend target...
++#
++
++depend:
++
++
++#
++# Install all targets...
++#
++
++# Debian-specific patch: directory-based language namespace
++MANDIR := $(MANDIR)/$(LANGUAGE)
++
++install:	all install-data install-headers install-libs install-exec
++
++
++#
++# Install data files...
++#
++
++# Debian-specific patch: skip if doesn't exist
++install-data: all
++	echo Installing man pages in $(MANDIR)/man1...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
++	for file in $(MAN1); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man1; \
++	done
++	echo Installing man pages in $(MANDIR)/man5...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man5
++	for file in $(MAN5); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man5; \
++	done
++	echo Installing man pages in $(MANDIR)/man7...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man7
++	for file in $(MAN7); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man7; \
++	done
++	$(RM) $(MANDIR)/man7/ippeveps.7
++	$(LN) ippevepcl.7 $(MANDIR)/man7/ippeveps.7
++	echo Installing man pages in $(MANDIR)/man8...
++	$(INSTALL_DIR) -m 755 $(MANDIR)/man8
++	for file in $(MAN8); do \
++		[ ! -r $$file ] || \
++		$(INSTALL_MAN) $$file $(MANDIR)/man8; \
++	done
++	$(RM) $(MANDIR)/man8/cupsdisable.8
++	$(LN) cupsenable.8 $(MANDIR)/man8/cupsdisable.8
++	$(RM) $(MANDIR)/man8/cupsreject.8
++	$(LN) cupsaccept.8 $(MANDIR)/man8/cupsreject.8
++	for file in cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++		$(LN) cupsd-helper.8 $(MANDIR)/man8/$$file; \
++	done
++
++
++#
++# Install programs...
++#
++
++install-exec:
++
++
++#
++# Install headers...
++#
++
++install-headers:
++
++
++#
++# Install libraries...
++#
++
++install-libs:
++
++
++#
++# Uninstall files...
++#
++
++uninstall:
++	echo Uninstalling man pages from $(MANDIR)/man1...
++	for file in $(MAN1); do \
++		$(RM) $(MANDIR)/man1/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man1
++	echo Uninstalling man pages from $(MANDIR)/man5...
++	for file in $(MAN5); do \
++		$(RM) $(MANDIR)/man5/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man5
++	echo Uninstalling man pages from $(MANDIR)/man7...
++	for file in $(MAN7) ippeveps.7; do \
++		$(RM) $(MANDIR)/man7/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man7
++	echo Uninstalling man pages from $(MANDIR)/man8...
++	for file in $(MAN8) cupsenable.8 cupsreject.8 cups-deviced.8 cups-driverd.8 cups-exec.8; do \
++		$(RM) $(MANDIR)/man8/$$file; \
++	done
++	-$(RMDIR) $(MANDIR)/man8
++
++
++#
++# Local programs (not built when cross-compiling...)
++#
++
++local:	html
++
++
++#
++# Make html versions of man pages...
++#
++
++html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
++	echo Converting man pages to HTML...
++	for file in $(MAN1); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .1`.html; \
++	done
++	for file in $(MAN5); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .5`.html; \
++	done
++	for file in $(MAN7); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .7`.html; \
++	done
++	for file in $(MAN8); do \
++		echo "    $$file..."; \
++		./mantohtml $$file >../doc/help/man-`basename $$file .8`.html; \
++	done
++
++mantohtml:	mantohtml.c
++	$(CC_FOR_BUILD) -o $@ $<
+diff --git a/man/de/Makefile b/man/de/Makefile
+new file mode 100644
+index 0000000..7c23784
+--- /dev/null
++++ b/man/de/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=de
++
++include ../Makefile.l10n
+diff --git a/man/fr/Makefile b/man/fr/Makefile
+new file mode 100644
+index 0000000..6a50e93
+--- /dev/null
++++ b/man/fr/Makefile
+@@ -0,0 +1,7 @@
++#
++#   Man page makefile for the Common UNIX Printing System (CUPS).
++#
++
++LANGUAGE=fr
++
++include ../Makefile.l10n
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..a718d15b1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,13 @@
+0001-Let-cups.1-point-to-client.conf.5-not-client.conf.7.patch
+0002-Apple-AirPrint-support.patch
+0003-Keep-foomatic-PPDs-recommended-stanzas-in-NickNames.patch
+0004-Debian-Set-LogFileGroup-to-adm.patch
+0005-Debian-Move-cupsd.conf.default-from-SERVERROOT-to-DA.patch
+0006-Debian-Do-not-alter-the-permissions-of-cupsd.conf-ev.patch
+0007-Debian-Show-compile-command-lines.patch
+0008-Debian-Use-dpkg-architecture-in-cups-config-to-make-.patch
+0009-Debian-Build-mantohtml-with-the-build-architecture-c.patch
+0010-Debian-Reproducibility-httpAddrGetHostname-test-fail.patch
+0011-Debian-Reproducibility-Do-not-run-stp-tests-as-root.patch
+0012-Debian-Reproducibility-Run-testlang-for-each-provide.patch
+0013-Debian-po4a-infrastructure-and-translations-for-manp.patch
-- 
cgit v1.2.3


From 98e77c44055b2829e9b5f2803893b7ba5f253a92 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Fri, 12 Feb 2021 14:09:29 +0100
Subject: cups 2.3.3op2-3 Debian release

---
 debian/changelog | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index daa60cc0b..8b536d177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-cups (2.3.3op2-3) UNRELEASED; urgency=medium
+cups (2.3.3op2-3) unstable; urgency=medium
 
   [ Helge Kreutzmann ]
   * Update German man page (2212t)
 
- -- Helge Kreutzmann <debian@helgefjell.de>  Wed, 03 Feb 2021 18:16:27 +0100
+  [ Didier Raboud ]
+  * Wrap-and-sort -baskt, keep comments
+  * Let cups.1 point to client.conf.5, not client.conf.7 (Closes: #982303)
+  * Make CUPS reproducible by patching it to;
+    - skip the httpAddrGetHostname() test (that fails under reprotest)
+    - skip the stp tests if ran as root, without aborting
+    - run testlang for each provided CUPS locale only
+
+ -- Didier Raboud <odyx@debian.org>  Fri, 12 Feb 2021 14:09:29 +0100
 
 cups (2.3.3op2-2) unstable; urgency=medium
 
-- 
cgit v1.2.3