Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3445 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index cee639098ca395b5a1a7e29fe535bba794c73cb4..78c3e5473dc3aff6cbdf4a29b0a74684683e204f 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,10 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.19
 
+       - When writing BSD printcap files, the scheduler now
+         includes the rm and rp attributes, allowing the file
+         to be exported to LPD clients. [Patch from Dominic
+         Kubla]
        - The scheduler optimization to reference IPP attribute
          data instead of performing a full copy caused problems
          when the referenced data was deleted before it was

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 14ea4bcbfc8837f5f5978aed68b7443d4420f223..42995c3b11faa1b3650511fe363afa41095f54b1 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.93.2.39 2003/03/10 21:05:31 mike Exp $"
+ * "$Id: printers.c,v 1.93.2.40 2003/03/10 21:22:23 mike Exp $"
  *
  *   Printer routines for the Common UNIX Printing System (CUPS).
  *
@@ -1871,11 +1871,13 @@ WritePrintcap(void)
        */
 
         if (DefaultPrinter)
-         fprintf(fp, "%s:\n", DefaultPrinter->name);
+         fprintf(fp, "%s|%s:rm=%s:rp=%s:\n", DefaultPrinter->name,
+                 DefaultPrinter->info, ServerName, DefaultPrinter->name);
 
        for (p = Printers; p != NULL; p = p->next)
          if (p != DefaultPrinter)
-           fprintf(fp, "%s:\n", p->name);
+           fprintf(fp, "%s|%s:rm=%s:rp=%s:\n", p->name, p->info,
+                   ServerName, p->name);
         break;
 
     case PRINTCAP_SOLARIS:
@@ -2178,5 +2180,5 @@ write_irix_state(printer_t *p)    /* I - Printer to update */
 
 
 /*
- * End of "$Id: printers.c,v 1.93.2.39 2003/03/10 21:05:31 mike Exp $".
+ * End of "$Id: printers.c,v 1.93.2.40 2003/03/10 21:22:23 mike Exp $".
  */