diff options
| author | Didier Raboud <odyx@debian.org> | 2017-01-15 12:35:32 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2017-01-15 12:38:52 +0100 |
| commit | b8263b2e464e465f40ce7b6e548f48ca0ec58bc1 (patch) | |
| tree | 6b73541319642caca6e4eba5d14d66c3bf2cbf20 /debian/patches/cups-set-default-error-policy-retry-job.patch | |
| parent | 2e76defe6ca465a91c43bf59421f6f80d6a68f29 (diff) | |
| parent | 7ce65f2332eb3e8db55078f6f31486c8c09c6150 (diff) | |
merge patched-debian/experimental into debian/experimental
Diffstat (limited to 'debian/patches/cups-set-default-error-policy-retry-job.patch')
| -rw-r--r-- | debian/patches/cups-set-default-error-policy-retry-job.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/cups-set-default-error-policy-retry-job.patch b/debian/patches/cups-set-default-error-policy-retry-job.patch index ab1826583..07b128c30 100644 --- a/debian/patches/cups-set-default-error-policy-retry-job.patch +++ b/debian/patches/cups-set-default-error-policy-retry-job.patch @@ -1,4 +1,4 @@ -From de32370bdecef52eaf7c0f8c6d76d05e963b6ec4 Mon Sep 17 00:00:00 2001 +From bd5c052ba576e7427840768dae53455115ffc891 Mon Sep 17 00:00:00 2001 From: Martin Pitt <martin.pitt@ubuntu.com> Date: Tue, 9 Aug 2016 18:11:47 +0200 Subject: Set default job error policy to "retry-job", since it is less @@ -56,7 +56,7 @@ index 4cede48bd..92c97744c 100644 .TP 5 \fBFilterLimit \fIlimit\fR diff --git a/scheduler/conf.c b/scheduler/conf.c -index 01817f733..64016aa68 100644 +index 6870aff9a..7cc73de87 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -753,7 +753,7 @@ cupsdReadConfiguration(void) @@ -68,7 +68,7 @@ index 01817f733..64016aa68 100644 JobHistory = DEFAULT_HISTORY; JobFiles = DEFAULT_FILES; -@@ -1231,8 +1231,8 @@ cupsdReadConfiguration(void) +@@ -1233,8 +1233,8 @@ cupsdReadConfiguration(void) strcmp(ErrorPolicy, "retry-job") && strcmp(ErrorPolicy, "stop-printer")) { |