From: msweet Date: Mon, 14 Sep 2015 19:00:47 +0000 (+0000) Subject: Move trunk to v2.2. X-Git-Tag: v2.2b1~192 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=d0e96b4a7929828567c78ba03b5f2ab9877b0a27 Move trunk to v2.2. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12875 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/CHANGES-2.1.txt b/CHANGES-2.1.txt new file mode 100644 index 000000000..ab1574c1f --- /dev/null +++ b/CHANGES-2.1.txt @@ -0,0 +1,73 @@ +CHANGES.txt - 2.1.0 - 2015-08-31 +-------------------------------- + +CHANGES IN CUPS V2.1.0 + + - Fixed more scheduler crash bugs in the new logging code (STR #4687, + STR #4690) + - The scheduler did not use the ConfigFilePerm setting when copying PPD + files or interface scripts attached to a request (STR #4703) + - Now support new Chinese locale IDs and their correct fallback locales + (, ) + - "make check" incorrectly reported an expectation of 18 warning + messages when 8 were expected (STR #4684) + - The new PDF file type rule did not work (STR #4692) + - The scheduler did not update the jobs.cache file when job files were + expired (STR #4706) + - Fixed some configure script issues (STR #4694, STR #4695, STR #4698) + - Documentation updates (STR #4691, STR #4693) + + +CHANGES IN CUPS V2.1rc1 + + - Added support for 3D printers (basic types only, no built-in filters) + based on PWG white paper. + - Fixed bugs in the new journald support (STR #4655, STR #4658, + STR #4661) + - Fixed domain socket support on Linux (STR #4679) + - Fixed signal handlers in the dnssd and usb backends (STR #4671) + - in sections now applies to all operations when + used by itself (STR #4659) + - Configure script changes for systemd support (STR #4669) + - Updated autoconf sources to use newer form of AC_INIT (STR #4664) + + +CHANGES IN CUPS V2.1b1 + + - Improved speed of ppdMarkDefaults for complex/large PPDs + () + - The IPP backend now stops sending print data if the printer indicates + the job has been aborted or canceled () + - The IPP backend now sends the job-pages-per-set attribute when + printing multiple copy jobs with finishings + () + - The IPP backend now updates the cupsMandatory values when the printer + configuration changes () + - No longer install banner files since third-party banner filters now + supply their own (STR #4518) + - Added support for EXPECT-ALL directive in ipptool test files + (STR #4469) + - Added support for WITH-VALUE-FROM predicate in ipptool test files + (STR #4470) + - The scheduler no longer listens on the loopback interface unless the + web interface or printer sharing are enabled + () + - Added a PPD generator for IPP Everywhere printers (STR #4258) + - Now install "default" versions of more configuration files + () + - The cupstestppd program did not handle "maxsize(nnn)" entries in + cupsFilter/cupsFilter2 values () + - The scheduler now checks the return value of rename() calls + (STR #4589) + - The scheduler now validates ErrorPolicy values in config files + (STR #4591) + - Long cookies caused the web interface to stop working (STR #4619) + - Added SSLOptions values to allow Diffie-Hellman key exchange and + disable TLS/1.0 support. + - Updated the scheduler to support more IPP Everywhere attributes + (STR #4630) + - The scheduler now supports advanced ASL and journald logging when + "syslog" output is configured (STR #4474) + - The scheduler now supports logging to stderr when running in the + foreground (STR #4505) + diff --git a/CHANGES.txt b/CHANGES.txt index 3b4704688..a69e21e87 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,83 +1,4 @@ -CHANGES.txt - 2.1.1 - 2015-09-13 +CHANGES.txt - 2.2b1 - 2015-09-14 -------------------------------- -CHANGES IN CUPS V2.1.1 - - - The libusb-based USB backend did not unload the kernel usblp module - if it was preventing the backend from accessing the printer - (STR #4707) - - Current Primera printers were incorrectly reported as Fargo printers - (STR #4708) - - Updated localizations (STR #4709) - - -CHANGES IN CUPS V2.1.0 - - - Fixed more scheduler crash bugs in the new logging code (STR #4687, - STR #4690) - - The scheduler did not use the ConfigFilePerm setting when copying PPD - files or interface scripts attached to a request (STR #4703) - - Now support new Chinese locale IDs and their correct fallback locales - (, ) - - "make check" incorrectly reported an expectation of 18 warning - messages when 8 were expected (STR #4684) - - The new PDF file type rule did not work (STR #4692) - - The scheduler did not update the jobs.cache file when job files were - expired (STR #4706) - - Fixed some configure script issues (STR #4694, STR #4695, STR #4698) - - Documentation updates (STR #4691, STR #4693) - - -CHANGES IN CUPS V2.1rc1 - - - Added support for 3D printers (basic types only, no built-in filters) - based on PWG white paper. - - Fixed bugs in the new journald support (STR #4655, STR #4658, - STR #4661) - - Fixed domain socket support on Linux (STR #4679) - - Fixed signal handlers in the dnssd and usb backends (STR #4671) - - in sections now applies to all operations when - used by itself (STR #4659) - - Configure script changes for systemd support (STR #4669) - - Updated autoconf sources to use newer form of AC_INIT (STR #4664) - - -CHANGES IN CUPS V2.1b1 - - - Improved speed of ppdMarkDefaults for complex/large PPDs - () - - The IPP backend now stops sending print data if the printer indicates - the job has been aborted or canceled () - - The IPP backend now sends the job-pages-per-set attribute when - printing multiple copy jobs with finishings - () - - The IPP backend now updates the cupsMandatory values when the printer - configuration changes () - - No longer install banner files since third-party banner filters now - supply their own (STR #4518) - - Added support for EXPECT-ALL directive in ipptool test files - (STR #4469) - - Added support for WITH-VALUE-FROM predicate in ipptool test files - (STR #4470) - - The scheduler no longer listens on the loopback interface unless the - web interface or printer sharing are enabled - () - - Added a PPD generator for IPP Everywhere printers (STR #4258) - - Now install "default" versions of more configuration files - () - - The cupstestppd program did not handle "maxsize(nnn)" entries in - cupsFilter/cupsFilter2 values () - - The scheduler now checks the return value of rename() calls - (STR #4589) - - The scheduler now validates ErrorPolicy values in config files - (STR #4591) - - Long cookies caused the web interface to stop working (STR #4619) - - Added SSLOptions values to allow Diffie-Hellman key exchange and - disable TLS/1.0 support. - - Updated the scheduler to support more IPP Everywhere attributes - (STR #4630) - - The scheduler now supports advanced ASL and journald logging when - "syslog" output is configured (STR #4474) - - The scheduler now supports logging to stderr when running in the - foreground (STR #4505) - +CHANGES IN CUPS V2.2b1 diff --git a/INSTALL.txt b/INSTALL.txt index bdc219c47..5639213c2 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,4 +1,4 @@ -INSTALL - CUPS v2.1.0 - 2015-08-31 +INSTALL - CUPS v2.2b1 - 2015-09-14 ---------------------------------- This file describes how to compile and install CUPS from source code. For more diff --git a/README.txt b/README.txt index 901e0c3d0..eb8c64994 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README - CUPS v2.1.0 - 2015-08-31 +README - CUPS v2.2b1 - 2015-09-14 --------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" instead... diff --git a/configure.ac b/configure.ac index ec1487997..f55148f46 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ dnl We need at least autoconf 2.60... AC_PREREQ(2.60) dnl Package name and version... -AC_INIT([CUPS], [2.1.1], [https://www.cups.org/str.php], [cups], [https://www.cups.org/]) +AC_INIT([CUPS], [2.2svn], [https://www.cups.org/str.php], [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 28b106d9d..0fc6c9b23 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -58,10 +58,10 @@ extern "C" { * Constants... */ -# define CUPS_VERSION 2.0101 +# define CUPS_VERSION 2.0200 # define CUPS_VERSION_MAJOR 2 -# define CUPS_VERSION_MINOR 1 -# define CUPS_VERSION_PATCH 1 +# define CUPS_VERSION_MINOR 2 +# define CUPS_VERSION_PATCH 0 # define CUPS_BC_FD 3 /* Back-channel file descriptor for diff --git a/vcnet/config.h b/vcnet/config.h index 2b4fb1e8b..98f26d7bc 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -96,8 +96,8 @@ typedef unsigned long useconds_t; * Version of software... */ -#define CUPS_SVERSION "CUPS v2.1.1" -#define CUPS_MINIMAL "CUPS/2.1.1" +#define CUPS_SVERSION "CUPS v2.2svn" +#define CUPS_MINIMAL "CUPS/2.2svn" /* diff --git a/xcode/config.h b/xcode/config.h index dae0b8b14..704124360 100644 --- a/xcode/config.h +++ b/xcode/config.h @@ -22,8 +22,8 @@ * Version of software... */ -#define CUPS_SVERSION "CUPS v2.1.1" -#define CUPS_MINIMAL "CUPS/2.1.1" +#define CUPS_SVERSION "CUPS v2.2svn" +#define CUPS_MINIMAL "CUPS/2.2svn" /*