Fix regression in job file preservation (Issue #4987)

diff --git a/CHANGES.txt b/CHANGES.txt
index 769a61a8e39208df0cacbfad94fe5d022daba5c7..7e3afb26fc34b6ecdc1b5b32619a32d60f10803e 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
-CHANGES.txt - 2.2.3 - 2017-03-28
+CHANGES.txt - 2.2.4 - 2017-04-18
 --------------------------------
 
+CHANGES IN CUPS V2.2.4
+
+       - The scheduler did not remote old job files (Issue #4987)
+
+
 CHANGES IN CUPS V2.2.3
 
        - The IPP backend could get into an infinite loop for certain errors,

diff --git a/INSTALL.txt b/INSTALL.txt
index b2996cd80d72e21436e4ab53b02142944cf706bd..198937d64213a986c19045e3720e9e1b346b1331 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,4 +1,4 @@
-INSTALL - CUPS v2.2.3 - 2017-03-28
+INSTALL - CUPS v2.2.4 - 2017-04-18
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more

diff --git a/README.txt b/README.txt
index a6a6079ac09cc5966c6de40199545778e33de0c4..f4ecdfa870a4c2fceba03908b244c84d34fb9ec7 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README - CUPS v2.2.3 - 2017-03-28
+README - CUPS v2.2.4 - 2017-04-18
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt" instead...

diff --git a/configure.ac b/configure.ac
index ad3ec8e36f5a31d4779bc6fcee2ccaae905e91d5..b79a738f685aaa70487aa26b205a6f2e6b7f00f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl We need at least autoconf 2.60...
 AC_PREREQ(2.60)
 
 dnl Package name and version...
-AC_INIT([CUPS], [2.2.3], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.2.4], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
 
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)

diff --git a/cups/cups.h b/cups/cups.h
index 3205dd82f2cb60e2029483b0716b3aaa8374766e..7e117bae6d85d007dec13b60b767cd1f5161521e 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -47,10 +47,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION                 2.0203
+#  define CUPS_VERSION                 2.0204
 #  define CUPS_VERSION_MAJOR           2
 #  define CUPS_VERSION_MINOR           2
-#  define CUPS_VERSION_PATCH           3
+#  define CUPS_VERSION_PATCH           4
 
 #  define CUPS_BC_FD                   3
                                        /* Back-channel file descriptor for

diff --git a/scheduler/job.c b/scheduler/job.c
index 78240155525eb5b9ae9e615b592f82ce3bc81e39..a8ba54c33c477e89536fae8ce81af079a390f255 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2745,7 +2745,7 @@ cupsdSetJobState(
          job->dirty = 1;
          cupsdMarkDirty(CUPSD_DIRTY_JOBS);
        }
-       else if (!JobHistory && !job->printer)
+       else if (!job->printer)
        {
         /*
          * Delete the job immediately if not actively printing...

diff --git a/vcnet/config.h b/vcnet/config.h
index 05fe9b2a0bb7ff9f9fe6538d2dbc920830399d8c..ef4258533e3ce3437001e495e24e243b5a8eda31 100644 (file)
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -94,8 +94,8 @@ typedef unsigned long useconds_t;
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.2.3"
-#define CUPS_MINIMAL "CUPS/2.2.3"
+#define CUPS_SVERSION "CUPS v2.2.4"
+#define CUPS_MINIMAL "CUPS/2.2.4"
 
 
 /*

diff --git a/xcode/config.h b/xcode/config.h
index 26b12a71b1fcdee02806a0cb9fff8e7ea0a39b7b..61593a9ac31af930d5eb25d0ed68843f427b2c39 100644 (file)
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -22,8 +22,8 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.2.3"
-#define CUPS_MINIMAL "CUPS/2.2.3"
+#define CUPS_SVERSION "CUPS v2.2.4"
+#define CUPS_MINIMAL "CUPS/2.2.4"
 
 
 /*