From be5797a427042aa82f777516a80b5f7c90df453f Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Mon, 4 Oct 2010 15:22:53 +0200 Subject: [PATCH] 3.10.9. --- .gitignore | 1 + hplip-3.10.6.tar.gz.asc | 7 ------- hplip-3.10.9.tar.gz.asc | 7 +++++++ hplip-device-reconnected.patch | 36 --------------------------------- hplip-pstotiff-is-rubbish.patch | 2 +- hplip.spec | 11 +++++----- sources | 2 +- 7 files changed, 15 insertions(+), 51 deletions(-) delete mode 100644 hplip-3.10.6.tar.gz.asc create mode 100644 hplip-3.10.9.tar.gz.asc delete mode 100644 hplip-device-reconnected.patch diff --git a/.gitignore b/.gitignore index d9308e3..a18276c 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ hplip-3.10.2.tar.gz hpcups-update-ppds.sh hplip-3.10.5.tar.gz hplip-3.10.6.tar.gz +/hplip-3.10.9.tar.gz diff --git a/hplip-3.10.6.tar.gz.asc b/hplip-3.10.6.tar.gz.asc deleted file mode 100644 index f8f003c..0000000 --- a/hplip-3.10.6.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkxDtwQACgkQc9dwzaWQR7nApgCcC0cVr7w9rEJdir1Gyl71m9rB -PEsAoK+qjoBn/ksBmhTiNQRYdr/XCE19 -=MeCZ ------END PGP SIGNATURE----- diff --git a/hplip-3.10.9.tar.gz.asc b/hplip-3.10.9.tar.gz.asc new file mode 100644 index 0000000..df022c1 --- /dev/null +++ b/hplip-3.10.9.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkyffvYACgkQc9dwzaWQR7krCACfZOWCMEx9/9g7IubrCDDVLqPe +3f0AoND9552Tt/dWtE9P3Yf4czYEOK6h +=bHV4 +-----END PGP SIGNATURE----- diff --git a/hplip-device-reconnected.patch b/hplip-device-reconnected.patch deleted file mode 100644 index 40c5bf8..0000000 --- a/hplip-device-reconnected.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up hplip-3.9.10/prnt/backend/hp.c.device-reconnected hplip-3.9.10/prnt/backend/hp.c ---- hplip-3.9.10/prnt/backend/hp.c.device-reconnected 2009-11-03 21:45:10.000000000 +0000 -+++ hplip-3.9.10/prnt/backend/hp.c 2009-11-04 16:25:30.719129509 +0000 -@@ -645,6 +645,7 @@ int main(int argc, char *argv[]) - HPMUD_DEVICE hd=-1; - HPMUD_CHANNEL cd=-1; - int n, total=0, retry=0, size, pages; -+ int consecutive_failures=0; - enum HPMUD_RESULT stat; - char *printer = getenv("PRINTER"); - -@@ -809,11 +810,24 @@ int main(int argc, char *argv[]) - { - exit_stat = BACKEND_STOP; /* stop queue */ - goto bugout; -+ } -+ -+ if (++consecutive_failures == 5) -+ { -+ /* hpmud_write_channel has failed several times in -+ * succession but the Device ID-based status says -+ * the printer is happy. Time to face the fact that -+ * the device has probably reconnected, and our USB -+ * channel is invalidated. */ -+ -+ BUG("ERROR: device reconnected?"); -+ goto bugout; - } - } - else - { - /* Data was sent to device successfully. */ -+ consecutive_failures = 0; - if (pa.pjl_device) - { - /* Laserjets have a large data buffer, so manually check for operator intervention condition. */ diff --git a/hplip-pstotiff-is-rubbish.patch b/hplip-pstotiff-is-rubbish.patch index 7dbf5a0..6813823 100644 --- a/hplip-pstotiff-is-rubbish.patch +++ b/hplip-pstotiff-is-rubbish.patch @@ -21,7 +21,7 @@ diff -up hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.5/fax/ -temp_out_handle, temp_out_fname = tempfile.mkstemp() - -font = "-I/usr/share/cups/fonts" --device = "-sDEVICE=tiffg4 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file +-device = "-sDEVICE=tiffg4 -dMaxStripSize=0 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file - -gs_command = "/usr/bin/gs" + " " + font + " " + device - diff --git a/hplip.spec b/hplip.spec index 81118df..795379d 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.10.6 -Release: 3%{?dist} +Version: 3.10.9 +Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -24,7 +24,6 @@ Patch7: hplip-snmp-quirks.patch Patch8: hplip-retry-open.patch Patch9: hplip-fax-ppd.patch Patch10: hplip-discovery-method.patch -Patch11: hplip-device-reconnected.patch Patch12: hplip-clear-old-state-reasons.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch @@ -161,9 +160,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Fixed hp-setup traceback when discovery page is skipped (bug #523685). %patch10 -p1 -b .discovery-method -# Give up trying to print a job to a reconnected device (bug #515481). -%patch11 -p1 -b .device-reconnected - # Clear old printer-state-reasons we used to manage (bug #510926). %patch12 -p1 -b .clear-old-state-reasons @@ -420,6 +416,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Mon Oct 04 2010 Jiri Popelka - 3.10.9-1 +- 3.10.9. + * Wed Sep 22 2010 Tim Waugh - More fixes from package review: - Avoided another macro in comment. diff --git a/sources b/sources index 751bced..55c72e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96c36e3baf35e93cf9436a772f0c9ef4 hplip-3.10.6.tar.gz +609718830a26874fc0ea84a47b8132f3 hplip-3.10.9.tar.gz