Deprecate printer drivers (Issue #5270)

Cleanup man page updates.

diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html
index 3b04c876893d32c640d835a52b196ec44df5b7d9..a4563304ef327103fb8b56e2ca9e99f4359896fc 100644 (file)
--- a/doc/help/man-lpadmin.html
+++ b/doc/help/man-lpadmin.html
@@ -71,14 +71,13 @@ The following options are recognized when configuring a printer queue:
 <dt><b>-c </b><i>class</i>
 <dd style="margin-left: 5.0em">Adds the named <i>printer</i> to <i>class</i>.
 If <i>class</i> does not exist it is created automatically.
-<dt><b>-P </b><i>ppd-file</i>
-<dd style="margin-left: 5.0em">Specifies a PostScript Printer Description (PPD) file to use with the printer.
 <dt><b>-m </b><i>model</i>
 <dd style="margin-left: 5.0em">Sets a standard PPD file for the printer from the <i>model</i> directory or using one of the driver interfaces.
 Use the <i>-m</i> option with the
 <a href="man-lpinfo.html?TOPIC=Man+Pages"><b>lpinfo</b>(8)</a>
 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</i>.
+Note: Models other than "everywhere" are deprecated and will not be supported in a future version of CUPS.
 <dt><b>-o cupsIPPSupplies=true</b>
 <dd style="margin-left: 5.0em"><dt><b>-o cupsIPPSupplies=false</b>
 <dd style="margin-left: 5.0em">Specifies whether IPP supply level values should be reported.
@@ -157,7 +156,11 @@ The following <b>lpadmin</b> options are deprecated:
 <dl class="man">
 <dt><b>-i </b><i>filename</i>
 <dd style="margin-left: 5.0em">This option historically has been used to provide either a System V interface script or (as an implementation side-effect) a PPD file.
-Since interface scripts are no longer supported, the <i>-P</i> option is preferred for providing a PPD file for a printer.
+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.
+<dt><b>-P </b><i>ppd-file</i>
+<dd style="margin-left: 5.0em">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.
 </dl>
 <h2 class="title"><a name="CONFORMING_TO">Conforming To</a></h2>
 Unlike the System V printing system, CUPS allows printer names to contain any printable character except SPACE, TAB, "/", or "#".

diff --git a/man/lpadmin.man b/man/lpadmin.man
index ac0ed7ba156974aef7636ca884fc80bb90609ae2..63a5e7ded4d97947d8741871049018c844ec2321 100644 (file)
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -76,16 +76,13 @@ The following options are recognized when configuring a printer queue:
 Adds the named \fIprinter\fR to \fIclass\fR.
 If \fIclass\fR does not exist it is created automatically.
 .TP 5
-\fB\-P \fIppd-file\fR
-Specifies a PostScript Printer Description (PPD) file to use with the printer.
-.TP 5
 \fB\-m \fImodel\fR
 Sets a standard PPD file for the printer from the \fImodel\fR directory or using one of the driver interfaces.
 Use the \fI-m\fR option with the
 .BR 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 \fIdevice-uri\fR.
-The "raw" model is deprecated and will not be supported in a future version of CUPS.
+Note: Models other than "everywhere" are deprecated and will not be supported in a future version of CUPS.
 .TP 5
 \fB\-o cupsIPPSupplies=true\fR
 .TP 5
@@ -189,7 +186,12 @@ The following \fBlpadmin\fR options are deprecated:
 .TP 5
 \fB\-i \fIfilename\fR
 This option historically has been used to provide either a System V interface script or (as an implementation side-effect) a PPD file.
-Since interface scripts are no longer supported, the \fI-P\fR option is preferred for providing a PPD file for a printer.
+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.
+.TP 5
+\fB\-P \fIppd-file\fR
+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.
 .SH CONFORMING TO
 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 \fInot\fR case-sensitive.

diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index 93579c5c4814708c2f93b77dbd66ec7389ae6972..85d57d83dabc7a312286ba8562b5b7704fb72f01 100644 (file)
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -622,6 +622,10 @@ main(int  argc,                            /* I - Number of command-line arguments */
 
     num_options = cupsRemoveOption("ppd-name", num_options, &options);
   }
+  else if (ppd_name || file)
+  {
+    _cupsLangPuts(stderr, _("lpadmin: Printer drivers are deprecated and will stop working in a future version of CUPS."));
+  }
 
   if (num_options || file)
   {