rpms/hplip/devel hplip-out-of-paper.patch, 1.1, 1.2 hplip.spec, 1.100, 1.101

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22271

Modified Files:
	hplip-out-of-paper.patch hplip.spec 
Log Message:
* Wed Dec  6 2006 Tim Waugh <twaugh at redhat.com>
- Minor state fixes for out-of-paper patch.


hplip-out-of-paper.patch:
 hp.c |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletion(-)

Index: hplip-out-of-paper.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip-out-of-paper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-out-of-paper.patch	23 Nov 2006 13:59:16 -0000	1.1
+++ hplip-out-of-paper.patch	6 Dec 2006 13:12:13 -0000	1.2
@@ -26,14 +26,14 @@
 +	       case VSTATUS_OOPA:
 +		  if (!paperout)
 +		  {
-+		     fputs("STATE: +media-tray-empty-error\n", stderr);
++		     fputs("STATE: +media-empty-error\n", stderr);
 +		     paperout = 1;
 +		  }
 +		  break;
 +	       default:
 +		  if (!offline)
 +		  {
-+		     fputs("STATE: +offline-error\n", stderr);
++		     fputs("STATE: +other\n", stderr);
 +		     offline = 1;
 +		  }
 +		  break;
@@ -52,12 +52,12 @@
 +	       if (paperout)
 +	       {
 +		  paperout = 0;
-+		  fputs("STATE: -media-tray-empty-error\n", stderr);
++		  fputs("STATE: -media-empty-error\n", stderr);
 +	       }
 +	       if (offline)
 +	       {
 +		  offline = 0;
-+		  fputs("STATE: -offline-error\n", stderr);
++		  fputs("STATE: -other\n", stderr);
 +	       }
 +	    }
              total+=n;


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- hplip.spec	28 Nov 2006 13:18:44 -0000	1.100
+++ hplip.spec	6 Dec 2006 13:12:13 -0000	1.101
@@ -201,6 +201,9 @@
 exit 0
 
 %changelog
+* Wed Dec  6 2006 Tim Waugh <twaugh at redhat.com>
+- Minor state fixes for out-of-paper patch.
+
 * Thu Nov 23 2006 Tim Waugh <twaugh at redhat.com> 1.6.10-6
 - Report out-of-paper and offline conditions in CUPS backend (bug #216477).