[Pkg-cups-devel] r282 - in cupsys/branches/cups-1.2/debian: .

[Kenshi Muto]

Author: kmuto
Date: Sun Jul  2 10:53:42 2006
New Revision: 282

Added:
   cupsys/branches/cups-1.2/debian/patches/58_status_eval_error.dpatch   (contents, props changed)
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list

Log:
fix logic error around parallel/usb

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Sun Jul  2 10:53:42 2006
@@ -6,6 +6,8 @@
   * 56_cupsaddsmb: avoid infinite loop when connect with Samba fails
     by something reasons. (closes: #376232)
     This patch fixes missing localized message.
+  * 57_status_logic_error: parallel/usb backends had a logic error around
+    verifying printer status code. This patch fixes it. (closes: #347522)
 
  -- Kenshi Muto <kmuto at debian.org>  Wed, 21 Jun 2006 15:06:02 +0000
 

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Sun Jul  2 10:53:42 2006
@@ -21,3 +21,4 @@
 55_ppd_okidata_name.dpatch
 #56_dirsvc.dpatch
 57_cupsaddsmb.dpatch
+58_status_eval_error.dpatch

Added: cupsys/branches/cups-1.2/debian/patches/58_status_eval_error.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2/debian/patches/58_status_eval_error.dpatch	Sun Jul  2 10:53:42 2006
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 58_status_eval_error.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.1~/backend/parallel.c cupsys-1.2.1/backend/parallel.c
+--- cupsys-1.2.1~/backend/parallel.c	2006-07-02 19:25:49.000000000 +0900
++++ cupsys-1.2.1/backend/parallel.c	2006-07-02 19:26:51.000000000 +0900
+@@ -271,9 +271,9 @@
+       paperout = 1;
+     }
+ 
+-    if (!(status & LP_PERRORP))
++    if (status & LP_PERRORP)
+       fputs("WARNING: Printer fault!\n", stderr);
+-    else if (!(status & LP_PSELECD))
++    else if (status & LP_PSELECD)
+       fputs("WARNING: Printer off-line.\n", stderr);
+     else
+       break;
+diff -urNad cupsys-1.2.1~/backend/usb-unix.c cupsys-1.2.1/backend/usb-unix.c
+--- cupsys-1.2.1~/backend/usb-unix.c	2006-07-02 19:25:49.000000000 +0900
++++ cupsys-1.2.1/backend/usb-unix.c	2006-07-02 19:25:50.000000000 +0900
+@@ -168,9 +168,9 @@
+       paperout = 1;
+     }
+ 
+-    if (!(status & LP_PERRORP))
++    if (status & LP_PERRORP)
+       fputs("WARNING: Printer fault!\n", stderr);
+-    else if (!(status & LP_PSELECD))
++    else if (status & LP_PSELECD)
+       fputs("WARNING: Printer off-line.\n", stderr);
+     else
+       break;