Trunk is now 2.1.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12187 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
new file mode 100644 (file)
index 0000000..84405df
--- /dev/null
+++ b/CHANGES-2.0.txt
@@ -0,0 +1,94 @@
+CHANGES.txt - 2.0.0 - 2014-10-01
+--------------------------------
+
+CHANGES IN CUPS V2.0.0
+
+       - The scheduler did not preserve listener sockets from launchd or
+         systemd after a restart (<rdar://problem/18112848>)
+       - Added some USB quirk rules for the libusb-based USB backend
+         (STR #4482)
+       - Spanish localization update (STR #4487)
+       - Updated documentation for 2.0.0 release.
+
+
+CHANGES IN CUPS V2.0rc1
+
+       - Documentation updates (STR #4464)
+       - The scheduler now monitors the AC power status on OS X, allowing for
+         "sleep printing" when sharing printers (<rdar://problem/17325852>)
+       - The scheduler incorrectly called launch_activate_socket multiple times
+         on OS X (<rdar://problem/17523218>)
+       - The ippserver test program now passes the IPP Everywhere self-
+         certification tests (STR #4101)
+       - Relaxed the new OS X filter sandbox slightly (STR #4471,
+         <rdar://problem/17483959>)
+       - Dropped the old Epson Stylus Color/Photo sample drivers since they
+         don't work with any current printers and there are free alternatives
+         that produce much better output (<rdar://problem/18036889>)
+       - Log and configuration files that are not world-readable are again
+         accessible via the web interface (STR #4461)
+       - PPD files are now created using the permissions specified by the
+         ConfigFilePerm directive.
+       - Fixed RPM build issues (STR #4459)
+       - Fixed the spinner image and restart page when reconfiguring the
+         scheduler through the web interface (STR #4475)
+
+
+CHANGES IN CUPS V2.0b1
+
+       - Added a "--list-filters" option to the cupsfilter command (STR #4325)
+        - Added systemd support (STR #3917)
+       - Added support for re-sending a job as a raster file if a higher-level
+         format such as PDF fails (<rdar://problem/15583721>)
+       - Added support for regular expression matching in the MIME type rules
+         (<rdar://problem/11131245>)
+       - Added support for TLS certificate validation and policy enforcement
+         (STR #1616)
+       - Added support for simultaneous XML and test output from ipptool.
+       - Added support for PAUSE directive in ipptool test files.
+       - Added support for auto-typing of TIFF files by ipptool (STR #4418)
+       - The scheduler now returns completed jobs in the correct newest-to-
+         oldest order (STR #4396)
+       - The configure script now supports target-specific tools for pkg-config
+         and others (STR #4423)
+       - The ipptool program now supports EXPECT statements for collection
+         member attributes (<rdar://problem/15355218>)
+       - The ipptool program now supports collection attributes with multiple
+         values (<rdar://problem/15355124>)
+       - The sample drivers now include all of the installed localizations by
+         default (<rdar://problem/14756625>)
+       - Adopted Linux man page conventions and updated all man pages
+         (STR #4372, STR #4329)
+       - The scheduler now supports the "first-index" operation attribute for
+         the Get-Jobs operation (STR #2913)
+       - Changed the default AccessLogLevel and PageLogFormat to disable the
+         access_log and page_log files by default (<rdar://problem/16495000>)
+       - cupsRasterInterpretPPD now supports the Orientation header in order to
+         support long-edge feed raster printers (<rdar://problem/15837926>)
+       - The scheduler now allows run-as-root backends to have group read and
+         execute permissions (STR #2935)
+       - The ippFindAttribute and ippFindNextAttribute functions now support
+         hierarchical searches (STR #4395)
+       - Dropped OpenSSL support in favor of GNU TLS.
+       - Dropped "dark wake" support on OS X, which was preventing portables
+         from going to sleep when there was a stuck job. We now use a variation
+         of the CUPS 1.4 sleep support to do a cleaner sleep
+         (<rdar://problem/14323704>)
+       - Dropped support for AIX, HP-UX, and OSF/1 (aka Digital UNIX)
+       - Dropped lppasswd and support for Digest authentication in in the
+         scheduler (STR #4321)
+       - The cupsGetClasses, cupsGetPrinters, and cupsTempFile functions are no
+         longer supported.
+       - The scheduler now caches more job history data and limits the number
+         of completed jobs returned by Get-Jobs as needed in order to prevent a
+         denial-of-service on busy servers (STR #2913)
+       - The filter/backend sandbox on OS X now defaults to a more strict
+         whitelist (<rdar://problem/15939788>)
+       - Increased the default idle exit timeout to 60 seconds on OS X
+         (<rdar://problem/16041820>)
+       - Printer classes were not accessible on OS X
+         (<rdar://problem/16385643>)
+       - The scheduler now uses </DefaultPrinter> to close the default printer
+         definition in printers.conf (STR #4153)
+       - Canceling all jobs in the web interface now just cancels the jobs
+         (STR #1914)

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 849e1b03baaa6466fa7c5f9bdd738b2e5ff940c2..18d4b360461eecf8491f487a5fb444f6f2282716 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -20,11 +20,11 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION="2.0.0"
+CUPS_VERSION="2.1svn"
 CUPS_REVISION=""
-#if test -z "$CUPS_REVISION" -a -d .svn; then
-#      CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
-#fi
+if test -z "$CUPS_REVISION" -a -d .svn; then
+       CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
+fi
 CUPS_BUILD="cups-$CUPS_VERSION"
 
 AC_ARG_WITH(cups_build, [  --with-cups-build       set "cups-config --build" string ],

diff --git a/cups/cups.h b/cups/cups.h
index 89558fcb26e71eaad6ba862b4ba99e87a4a3d943..4858a7f6b520c6c5a49e5d3343202dea3e76fe63 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -49,10 +49,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION                 2.0000
+#  define CUPS_VERSION                 2.0099
 #  define CUPS_VERSION_MAJOR           2
-#  define CUPS_VERSION_MINOR           0
-#  define CUPS_VERSION_PATCH           0
+#  define CUPS_VERSION_MINOR           1
+#  define CUPS_VERSION_PATCH           -1
 
 #  define CUPS_BC_FD                   3
                                        /* Back-channel file descriptor for

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 3fa831064141df92d01c65466ae11df04d0ac14d..3d721421260e9ee8d474385a90ca1d780259a733 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -694,7 +694,7 @@ done
 #
 
 date=`date "+%Y-%m-%d"`
-strfile=$BASE/cups-str-2.0-$date-$user.html
+strfile=$BASE/cups-str-2.1-$date-$user.html
 
 rm -f $strfile
 cat str-header.html >$strfile

diff --git a/tools/makesrcdist b/tools/makesrcdist
index 0eb4426f61c77cf5e78a84ff738b86cb1f0be6d7..460735da627ffeaebed805a5cae5fe83d2ad61ec 100755 (executable)
--- a/tools/makesrcdist
+++ b/tools/makesrcdist
@@ -26,9 +26,9 @@ if test $# = 0; then
 
        # Compute version for snapshot
        rev=`svn info . | grep Revision: | awk '{print $2}'`
-       version="2.0svn"
+       version="2.1svn"
        revision="-r$rev"
-       fileversion="2.0svn-r$rev"
+       fileversion="2.1svn-r$rev"
        fileurl="http://www.cups.org/software/test/cups-$fileversion-source.tar."
        url="."
 else
@@ -42,7 +42,7 @@ else
 
        echo Validating sources...
        cupsversionpatch=`echo $version | awk -F. '{if (NF == 3) { print $3 } else { print "0" } }'`
-       cupsversion=`printf "2.00%02d" $cupsversionpatch`
+       cupsversion=`printf "2.10%02d" $cupsversionpatch`
 
        temp=`grep CUPS_VERSION cups/cups.h | grep -v CUPS_VERSION_ | awk '{print $4}'`
        if test "$temp" != $cupsversion; then

diff --git a/vcnet/config.h b/vcnet/config.h
index 1c6145fb56fadacd4d773d3a495307eeea187d4d..a1c9bac0eccd1d9aec3f38ed511e437c4d0148ff 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.0.0"
-#define CUPS_MINIMAL "CUPS/2.0.0"
+#define CUPS_SVERSION "CUPS v2.1svn"
+#define CUPS_MINIMAL "CUPS/2.1svn"
 
 
 /*

diff --git a/xcode/config.h b/xcode/config.h
index 89e2b0b1040d4c011c2a66cbd1e14fc1c2e0c232..affa9bc9b28981bb4f81d05a5b2f3eff5bc66f2f 100644 (file)
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -20,8 +20,8 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.0.0"
-#define CUPS_MINIMAL "CUPS/2.0.0"
+#define CUPS_SVERSION "CUPS v2.1svn"
+#define CUPS_MINIMAL "CUPS/2.1svn"
 
 
 /*