Update files for 2.0.0 release.

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

diff --git a/CHANGES.txt b/CHANGES.txt
index fb334534eb409601d418ec1f711cdcc63caf78d0..84405df66d1e56b57804e79d83cfa84a92fc6602 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.0.0 - 2014-09-30
+CHANGES.txt - 2.0.0 - 2014-10-01
 --------------------------------
 
 CHANGES IN CUPS V2.0.0
@@ -8,7 +8,7 @@ CHANGES IN CUPS V2.0.0
        - Added some USB quirk rules for the libusb-based USB backend
          (STR #4482)
        - Spanish localization update (STR #4487)
-       - Updated documentation for 2.0 release.
+       - Updated documentation for 2.0.0 release.
 
 
 CHANGES IN CUPS V2.0rc1

diff --git a/INSTALL.txt b/INSTALL.txt
index 77b1628c14ab8354011111d6466f6177e533c0c7..d05de97ec57572e3af7413e26928c4c7a598e858 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,5 @@
-INSTALL - CUPS v2.0rc1 - 2014-09-02
------------------------------------
+INSTALL - CUPS v2.0.0 - 2014-10-01
+----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more
 information on CUPS see the file called "README.txt".  A complete change log can
@@ -98,6 +98,11 @@ CONFIGURATION
     and diagnose a variety of common problems - use the "--enable-unit-tests"
     configure option to run them at build time.
 
+    On OS X, use the "--with-archflags" option to build with the correct set of
+    architectures:
+
+        ./configure --with-archflags="-arch i386 -arch x86_64" ...
+
     Once you have configured things, just type:
 
        make ENTER

diff --git a/README.txt b/README.txt
index d9c0adb55aa9a226883643b00cde6498adfa1c8d..a2f12f2dcee9d3498ff45f065f7e4ac014805117 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,18 +1,5 @@
-README - CUPS v2.0rc1 - 2014-09-02
-----------------------------------
-
-********************************************************************************
-********************************************************************************
-********                                                                ********
-********                                                                ********
-********    THIS IS BETA-RELEASE SOFTWARE AND SHOULD NOT BE USED ON    ********
-********    PRODUCTION SYSTEMS.                                         ********
-********                                                                ********
-********                                                                ********
-********************************************************************************
-********************************************************************************
-
-
+README - CUPS v2.0.0 - 2014-10-01
+---------------------------------
 
 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 ec98d4eb09ad185f91e6eac4504572f9b4251778..849e1b03baaa6466fa7c5f9bdd738b2e5ff940c2 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION="2.0rc1"
+CUPS_VERSION="2.0.0"
 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'`"