diff options
| -rw-r--r-- | CHANGES.md | 27 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | cups/cups.h | 4 | ||||
| -rw-r--r-- | vcnet/config.h | 4 | ||||
| -rw-r--r-- | xcode/config.h | 4 |
5 files changed, 24 insertions, 17 deletions
diff --git a/CHANGES.md b/CHANGES.md index 6cb8ef768..6749b1c6d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,14 @@ -CHANGES - 2.2.5 - 2017-10-12 +CHANGES - 2.2.6 - 2017-10-19 ============================ -CHANGES IN CUPS V2.2.5 + +Changes in CUPS v2.2.6 +---------------------- + +- Added USB quirks rules for Canon MP540 and Samsung ML-2160 (Issue #5148) + + +Changes in CUPS v2.2.5 ---------------------- - The scheduler's `-t` option did not force all errors to the standard error @@ -73,7 +80,7 @@ CHANGES IN CUPS V2.2.5 WITH-SCHEME predicates. -CHANGES IN CUPS V2.2.4 +Changes in CUPS v2.2.4 ---------------------- - The scheduler did not remove old job files (Issue #4987) @@ -111,7 +118,7 @@ CHANGES IN CUPS V2.2.4 `DenyCBC` and `DenyTLS1.0` options (Issue #5037) -CHANGES IN CUPS V2.2.3 +Changes in CUPS v2.2.3 ---------------------- - The IPP backend could get into an infinite loop for certain errors, causing a @@ -139,7 +146,7 @@ CHANGES IN CUPS V2.2.3 - Fixed some localization issues on macOS (<rdar://problem/27245567>) -CHANGES IN CUPS V2.2.2 +Changes in CUPS v2.2.2 ---------------------- - Fixed some issues with the Zebra ZPL printer driver (Issue #4898) @@ -169,7 +176,7 @@ CHANGES IN CUPS V2.2.2 - Updated packaging files (Issue #4940) -CHANGES IN CUPS V2.2.1 +Changes in CUPS v2.2.1 ---------------------- - Added "CreateSelfSignedCerts" directive for cups-files.conf to control whether @@ -183,7 +190,7 @@ CHANGES IN CUPS V2.2.1 - Updated localizations (PR #4877, PR #4886) -CHANGES IN CUPS V2.2.0 +Changes in CUPS v2.2.0 ---------------------- - Normalized the TLS certificate validation code and added additional error @@ -194,7 +201,7 @@ CHANGES IN CUPS V2.2.0 - http*Connect did not return early when all addresses failed (Issue #4870) -CHANGES IN CUPS V2.2rc1 +Changes in CUPS v2.2rc1 ----------------------- - Updated the list of supported IPP Everywhere media types. @@ -207,14 +214,14 @@ CHANGES IN CUPS V2.2rc1 - Updated localizations (Issue #4846, PR #4858) -CHANGES IN CUPS V2.2b2 +Changes in CUPS v2.2b2 ---------------------- - Added Upstart support (PR #4825) - CUPS now supports Let's Encrypt certificates on Linux. -CHANGES IN CUPS V2.2b1 +Changes in CUPS v2.2b1 ---------------------- - All CUPS commands now support POSIX options (Issue #4813) diff --git a/configure.ac b/configure.ac index 9b2177e12..ac78c48ad 100644 --- 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.5], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/]) +AC_INIT([CUPS], [2.2.6], [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 9525ffe99..8f5c818f5 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -47,10 +47,10 @@ extern "C" { * Constants... */ -# define CUPS_VERSION 2.0205 +# define CUPS_VERSION 2.0206 # define CUPS_VERSION_MAJOR 2 # define CUPS_VERSION_MINOR 2 -# define CUPS_VERSION_PATCH 5 +# define CUPS_VERSION_PATCH 6 # define CUPS_BC_FD 3 /* Back-channel file descriptor for diff --git a/vcnet/config.h b/vcnet/config.h index ef4258533..96ec5fafa 100644 --- 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.4" -#define CUPS_MINIMAL "CUPS/2.2.4" +#define CUPS_SVERSION "CUPS v2.2.6" +#define CUPS_MINIMAL "CUPS/2.2.6" /* diff --git a/xcode/config.h b/xcode/config.h index 6e28efd98..76d521c2c 100644 --- a/xcode/config.h +++ b/xcode/config.h @@ -22,8 +22,8 @@ * Version of software... */ -#define CUPS_SVERSION "CUPS v2.2.5" -#define CUPS_MINIMAL "CUPS/2.2.5" +#define CUPS_SVERSION "CUPS v2.2.6" +#define CUPS_MINIMAL "CUPS/2.2.6" /* |