Merge branch 'f14'
This commit is contained in:
commit
e0e3336cd2
@ -24,7 +24,7 @@ diff -up hplip-3.10.9/prnt/hpijs/hpijs.cpp.hpijs-marker-supply hplip-3.10.9/prnt
|
||||
}
|
||||
|
||||
+ fprintf(stderr, "STATE: %cmarker-supply-low-warning\n",
|
||||
+ low_marker ? "+" : "-");
|
||||
+ low_marker ? '+' : '-');
|
||||
+
|
||||
#if 0
|
||||
BUG("device model=%s\n", pSS->pPC->PrinterModel());
|
||||
|
@ -1,7 +1,7 @@
|
||||
Summary: HP Linux Imaging and Printing Project
|
||||
Name: hplip
|
||||
Version: 3.11.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2+ and MIT
|
||||
Group: System Environment/Daemons
|
||||
Conflicts: system-config-printer < 0.6.132
|
||||
@ -513,6 +513,10 @@ fi
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Fri Feb 4 2011 Tim Waugh <twaugh@redhat.com> - 3.11.1-2
|
||||
- Fixed typo causing ";marker-supply-low-warning" state reason to be
|
||||
reported by hpijs (bug #675151).
|
||||
|
||||
* Mon Jan 24 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.1-1
|
||||
- 3.11.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user