Trunk is now 2.0 development.

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

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
new file mode 100644 (file)
index 0000000..5edabe6
--- /dev/null
+++ b/CHANGES-1.7.txt
@@ -0,0 +1,91 @@
+CHANGES.txt - 1.7.0 - 2013-08-01
+--------------------------------
+
+CHANGES IN CUPS V1.7.0
+
+       - The scheduler did not respond using the hostname specified by the
+         client (<rdar://problem/14583574>)
+       - Fax queues did not work when shared via Bonjour
+         (<rdar://problem/14498310>)
+       - Error messages from the scheduler were not localized using the
+         language specified in the client's IPP request
+         (<rdar://problem/14128011>)
+       - Added an Italian localization (<rdar://problem/14481578>)
+       - Fixed a couple memory leaks in ippfind that were reported by Clang.
+       - Fixed a compile issue on 64-bit Linux with Clang - need to use the
+         -pie option instead of -Wl,-pie now (<rdar://problem/14480938>)
+       - The ippfind utility reported the wrong port numbers when compiled
+         against Avahi (<rdar://problem/14508324>)
+       - httpGetFd, httpGetFile, httpPutFd, and httpPutFile did not
+         automatically reconnect if the server closed the connecion after the
+         previous response.
+       - Fixed a compile error in libcups (<rdar://problem/14467141>)
+       - The scheduler incorrectly did not pass a FINAL_CONTENT_TYPE
+         environment variable to the filters or backend
+         (<rdar://problem/14355011>)
+       - The cups-exec helper program could fail randomly on OS X due to
+         sandbox violations when closing excess file descriptors
+         (<rdar://problem/14421943>)
+       - The scheduler incorrectly did not use the kqueue interface on OS X.
+
+
+CHANGES IN CUPS V1.7rc1
+
+       - Printer xxx-default values were not reported by Get-Printer-Attributes
+         or lpoptions (<rdar://problem/14401795>)
+       - Fixed deprecation warnings for many functions on OS X so they are tied
+         to the deployment version when building (<rdar://problem/14210079>)
+       - Fixed a build issue on ARM-based Linux systems - unable to validate
+         va_list arguments.
+       - Added a new ippfind tool for finding IPP printers and other Bonjour
+         services (<rdar://problem/13876199>)
+       - Fixed some issues with conversion of PWG media size names to
+         hundredths of millimeters (<rdar://problem/14065748>)
+       - The IPP backend could crash on OS X when printing to a Kerberized
+         printer (<rdar://problem/14040186>)
+       - The ipptool program now automatically extends timeouts when the
+         output buffer is filled (<rdar://problem/14016099>)
+       - The ipptool program now supports the --help and --version options.
+       - The ipptool program did not continue past include file errors by
+         default (<rdar://problem/13875803>)
+       - The ipptool program now supports FILE-ID and TEST-ID directives and
+         includes their values in its XML output (<rdar://problem/13876038>)
+       - The ipptool program now supports WITH-HOSTNAME, WITH-RESOURCE, and
+         WITH-SCHEME expect predicates to compare the corresponding URI
+         components (<rdar://problem/13876091>)
+
+
+CHANGES IN CUPS V1.7b1
+
+       - The configure script now supports a --with-rundir option to change
+         the transient run-time state directory from the default to other
+         locations like /run/cups (STR #4306)
+       - The scheduler now supports PPD lookups for classes (STR #4296)
+       - The cupsfilter program did not set the FINAL_CONTENT_TYPE
+         environment variable for filters.
+       - Added a new "-x" option to the cancel command (STR #4103)
+       - Made the PWG media handling APIs public (STR #4267)
+       - Implemented ready media support for the cupsGetDestMediaXxx APIs
+         (STR #4289)
+       - Added new cupsFindDestDefault, cupsFindDestReady, and
+         cupsFindDestSupported APIs (STR #4289)
+       - Added new cupsGetDestMediaByIndex, cupsGetDestMediaCount, and
+         cupsGetDestMediaDefault APIs (STR #4289)
+       - Added new ippGet/SetOctetString APIs for getting and setting an
+         octetString value (STR #4289)
+       - Added new ippCreateRequestedArray API for generating a array of
+         attributes from the requested-attributes attribute.
+       - The ipptool utility now supports compression, conditional tests based
+         on the presence of files, and new DEFINE predicates for STATUS.
+       - Added new IPP APIs for checking values (STR #4167)
+       - Added new IPP APis for adding and setting formatted strings.
+       - Added new HTTP APIs to support basic server functionality via libcups.
+       - The dnssd backend now generates a 1284 device ID as needed (STR #3702)
+       - CUPS now supports compressing and decompressing streamed data
+         (STR #4168)
+       - CUPS now supports higher-level PIN printing, external accounting
+         systems, and "print here" printing environments (STR #4169)
+       - IRIX is no longer a supported operating system (STR #4092)
+       - The PPD compiler now supports JCL options properly (STR #4115)
+       - The web interface now checks whether the web browser has cookies
+         enabled and displays a suitable error message (STR #4141)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5edabe67cac034b9df85a5788a6f3fd96027bc0a..cde9d92a4b60599d4294a034d3124eea2f82b9a6 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,91 +1,5 @@
-CHANGES.txt - 1.7.0 - 2013-08-01
+CHANGES.txt - 2.0b1 - 2013-08-06
 --------------------------------
 
-CHANGES IN CUPS V1.7.0
+CHANGES IN CUPS V2.0b1
 
-       - The scheduler did not respond using the hostname specified by the
-         client (<rdar://problem/14583574>)
-       - Fax queues did not work when shared via Bonjour
-         (<rdar://problem/14498310>)
-       - Error messages from the scheduler were not localized using the
-         language specified in the client's IPP request
-         (<rdar://problem/14128011>)
-       - Added an Italian localization (<rdar://problem/14481578>)
-       - Fixed a couple memory leaks in ippfind that were reported by Clang.
-       - Fixed a compile issue on 64-bit Linux with Clang - need to use the
-         -pie option instead of -Wl,-pie now (<rdar://problem/14480938>)
-       - The ippfind utility reported the wrong port numbers when compiled
-         against Avahi (<rdar://problem/14508324>)
-       - httpGetFd, httpGetFile, httpPutFd, and httpPutFile did not
-         automatically reconnect if the server closed the connecion after the
-         previous response.
-       - Fixed a compile error in libcups (<rdar://problem/14467141>)
-       - The scheduler incorrectly did not pass a FINAL_CONTENT_TYPE
-         environment variable to the filters or backend
-         (<rdar://problem/14355011>)
-       - The cups-exec helper program could fail randomly on OS X due to
-         sandbox violations when closing excess file descriptors
-         (<rdar://problem/14421943>)
-       - The scheduler incorrectly did not use the kqueue interface on OS X.
-
-
-CHANGES IN CUPS V1.7rc1
-
-       - Printer xxx-default values were not reported by Get-Printer-Attributes
-         or lpoptions (<rdar://problem/14401795>)
-       - Fixed deprecation warnings for many functions on OS X so they are tied
-         to the deployment version when building (<rdar://problem/14210079>)
-       - Fixed a build issue on ARM-based Linux systems - unable to validate
-         va_list arguments.
-       - Added a new ippfind tool for finding IPP printers and other Bonjour
-         services (<rdar://problem/13876199>)
-       - Fixed some issues with conversion of PWG media size names to
-         hundredths of millimeters (<rdar://problem/14065748>)
-       - The IPP backend could crash on OS X when printing to a Kerberized
-         printer (<rdar://problem/14040186>)
-       - The ipptool program now automatically extends timeouts when the
-         output buffer is filled (<rdar://problem/14016099>)
-       - The ipptool program now supports the --help and --version options.
-       - The ipptool program did not continue past include file errors by
-         default (<rdar://problem/13875803>)
-       - The ipptool program now supports FILE-ID and TEST-ID directives and
-         includes their values in its XML output (<rdar://problem/13876038>)
-       - The ipptool program now supports WITH-HOSTNAME, WITH-RESOURCE, and
-         WITH-SCHEME expect predicates to compare the corresponding URI
-         components (<rdar://problem/13876091>)
-
-
-CHANGES IN CUPS V1.7b1
-
-       - The configure script now supports a --with-rundir option to change
-         the transient run-time state directory from the default to other
-         locations like /run/cups (STR #4306)
-       - The scheduler now supports PPD lookups for classes (STR #4296)
-       - The cupsfilter program did not set the FINAL_CONTENT_TYPE
-         environment variable for filters.
-       - Added a new "-x" option to the cancel command (STR #4103)
-       - Made the PWG media handling APIs public (STR #4267)
-       - Implemented ready media support for the cupsGetDestMediaXxx APIs
-         (STR #4289)
-       - Added new cupsFindDestDefault, cupsFindDestReady, and
-         cupsFindDestSupported APIs (STR #4289)
-       - Added new cupsGetDestMediaByIndex, cupsGetDestMediaCount, and
-         cupsGetDestMediaDefault APIs (STR #4289)
-       - Added new ippGet/SetOctetString APIs for getting and setting an
-         octetString value (STR #4289)
-       - Added new ippCreateRequestedArray API for generating a array of
-         attributes from the requested-attributes attribute.
-       - The ipptool utility now supports compression, conditional tests based
-         on the presence of files, and new DEFINE predicates for STATUS.
-       - Added new IPP APIs for checking values (STR #4167)
-       - Added new IPP APis for adding and setting formatted strings.
-       - Added new HTTP APIs to support basic server functionality via libcups.
-       - The dnssd backend now generates a 1284 device ID as needed (STR #3702)
-       - CUPS now supports compressing and decompressing streamed data
-         (STR #4168)
-       - CUPS now supports higher-level PIN printing, external accounting
-         systems, and "print here" printing environments (STR #4169)
-       - IRIX is no longer a supported operating system (STR #4092)
-       - The PPD compiler now supports JCL options properly (STR #4115)
-       - The web interface now checks whether the web browser has cookies
-         enabled and displays a suitable error message (STR #4141)

diff --git a/INSTALL.txt b/INSTALL.txt
index 090b17fba87d06b9a363d1f467d52760d1ae49eb..558716c1da4f1a42daa1fbbf9571ce49e9dc05bf 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.7.0 - 2013-07-16
+INSTALL - CUPS v2.0.0 - 2013-08-06
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more

diff --git a/README.txt b/README.txt
index 9ec52474ce595ceeb35940ac4cce6c41c540c50f..fa8c6570a0d8096e318c66b9d33afd65bfeb94c7 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,19 @@
-README - CUPS v1.7.0 - 2013-07-16
+README - CUPS v2.0.0 - 2013-08-06
 ---------------------------------
 
+********************************************************************************
+********************************************************************************
+********                                                                ********
+********                                                                ********
+********    THIS IS ALPHA-RELEASE SOFTWARE AND SHOULD NOT BE USED ON    ********
+********    PRODUCTION SYSTEMS.                                         ********
+********                                                                ********
+********                                                                ********
+********************************************************************************
+********************************************************************************
+
+
+
 Looking for compile instructions?  Read the file "INSTALL.txt" instead...
 
 

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index af1b8f1052d29b534258c725f520bc71f3cb67c7..27be08f0da63db0a5e50a0fb620131129b50525c 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="1.7.0"
+CUPS_VERSION="2.0svn"
 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 b9f52eaf28ced4fcd914db6efafd36bf74693c1b..3330d7cbf5a5456b96059048dd903741e3991714 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -53,9 +53,9 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION                 1.0700
-#  define CUPS_VERSION_MAJOR           1
-#  define CUPS_VERSION_MINOR           7
+#  define CUPS_VERSION                 2.0000
+#  define CUPS_VERSION_MAJOR           2
+#  define CUPS_VERSION_MINOR           0
 #  define CUPS_VERSION_PATCH           0
 
 #  define CUPS_BC_FD                   3