[Pkg-cups-devel] r393 - in cupsys/branches/cups-1.2-ubuntu/debian: . patches

[Martin Pitt]

Author: mpitt
Date: Mon Oct  2 14:23:56 2006
New Revision: 393

Added:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-default-error-policy-retry-job.dpatch
Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/patches/00list

Log:
* Add debian/patches/ubuntu-default-error-policy-retry-job.dpatch:
  - Do not stop the printer if a job failed, just reattempt it. The default
    policy might be suitable for large offices with an admin, but it
    puts home users at loss. Thanks to Till Kamppeter for the patch! 
    Closes: LP#41313

Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Mon Oct  2 14:23:56 2006
@@ -18,8 +18,13 @@
     - Remove transitional PPD symlink which is not necessary any more and just
       causes loops. Closes: LP#62198
     - Fix CPU hogging of gnome-cups-manager. Closes: LP#44196
+  * Add debian/patches/ubuntu-default-error-policy-retry-job.dpatch:
+    - Do not stop the printer if a job failed, just reattempt it. The default
+      policy might be suitable for large offices with an admin, but it
+      puts home users at loss. Thanks to Till Kamppeter for the patch! 
+      Closes: LP#41313
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Mon,  2 Oct 2006 15:35:57 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon,  2 Oct 2006 16:08:27 +0200
 
 cupsys (1.2.4-2) unstable; urgency=low
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list	Mon Oct  2 14:23:56 2006
@@ -32,3 +32,4 @@
 65_detect_http_shutdown.dpatch
 ubuntu-disable-browsing.dpatch
 ubuntu-external-pam-helper.dpatch
+ubuntu-default-error-policy-retry-job.dpatch

Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-default-error-policy-retry-job.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-default-error-policy-retry-job.dpatch	Mon Oct  2 14:23:56 2006
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ubuntu-default-error-policy-retry-job.dpatch by  <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cups-1.2-ubuntu~/scheduler/printers.c cups-1.2-ubuntu/scheduler/printers.c
+--- cups-1.2-ubuntu~/scheduler/printers.c	2006-09-19 22:11:08.000000000 +0200
++++ cups-1.2-ubuntu/scheduler/printers.c	2006-10-02 16:16:11.000000000 +0200
+@@ -123,7 +123,7 @@
+   cupsdSetString(&p->job_sheets[0], "none");
+   cupsdSetString(&p->job_sheets[1], "none");
+ 
+-  cupsdSetString(&p->error_policy, "stop-printer");
++  cupsdSetString(&p->error_policy, "retry-job");
+   cupsdSetString(&p->op_policy, DefaultPolicy);
+ 
+   p->op_policy_ptr = DefaultPolicyPtr;