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 (file)
index 0000000..ab1574c
--- /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
+         (<rdar://problem/22086642>, <rdar://problem/22130168>)
+       - "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)
+       - <Limit All> in <Policy> 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
+         (<rdar://problem/15146999>)
+       - The IPP backend now stops sending print data if the printer indicates
+         the job has been aborted or canceled (<rdar://problem/17837631>)
+       - The IPP backend now sends the job-pages-per-set attribute when
+         printing multiple copy jobs with finishings
+         (<rdar://problem/16792757>)
+       - The IPP backend now updates the cupsMandatory values when the printer
+         configuration changes (<rdar://problem/18126570>)
+       - 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
+         (<rdar://problem/9136448>)
+       - Added a PPD generator for IPP Everywhere printers (STR #4258)
+       - Now install "default" versions of more configuration files
+         (<rdar://problem/19024491>)
+       - The cupstestppd program did not handle "maxsize(nnn)" entries in
+         cupsFilter/cupsFilter2 values (<rdar://problem/18974858>)
+       - 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 3b4704688dae1ab2725bbcf9086ef92eb703fba1..a69e21e877ec816d068d4df8ef45630734c986dc 100644 (file)
--- 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
-         (<rdar://problem/22086642>, <rdar://problem/22130168>)
-       - "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)
-       - <Limit All> in <Policy> 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
-         (<rdar://problem/15146999>)
-       - The IPP backend now stops sending print data if the printer indicates
-         the job has been aborted or canceled (<rdar://problem/17837631>)
-       - The IPP backend now sends the job-pages-per-set attribute when
-         printing multiple copy jobs with finishings
-         (<rdar://problem/16792757>)
-       - The IPP backend now updates the cupsMandatory values when the printer
-         configuration changes (<rdar://problem/18126570>)
-       - 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
-         (<rdar://problem/9136448>)
-       - Added a PPD generator for IPP Everywhere printers (STR #4258)
-       - Now install "default" versions of more configuration files
-         (<rdar://problem/19024491>)
-       - The cupstestppd program did not handle "maxsize(nnn)" entries in
-         cupsFilter/cupsFilter2 values (<rdar://problem/18974858>)
-       - 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 bdc219c47d0f176d3ffd36bb986ac27a6d9bbf25..5639213c284092cd2cd121cc5d79ad39076191a2 100644 (file)
--- 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 901e0c3d0150ebbe11d1433f78eafbebfcbbf3b1..eb8c64994c37277edbf2d1f24c77292cda84ba9a 100644 (file)
--- 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 ec148799718f703a8a5f7254fd933c5ac08d7f60..f55148f46cdd53045bd3ce72193bbab901197177 100644 (file)
--- 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 28b106d9d1552b201ae1ddd1b8f95028ec8a7b3e..0fc6c9b23a34896248bfcad38ba37a90abf1582b 100644 (file)
--- 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 2b4fb1e8bc8828b8cc91df493693a6f12f89e8e7..98f26d7bcda3b87d727fe3a8dcb81894eb39df75 100644 (file)
--- 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 dae0b8b141aac5890274ddf2effd3b4f077d3c94..704124360a85b4f164d8557eafba72484c5eaa67 100644 (file)
--- 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"
 
 
 /*