From c7aa86b04236d07cb2fe703c29aac31a958e8265 Mon Sep 17 00:00:00 2001
From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 1 Oct 2014 12:08:02 +0000
Subject: [PATCH] 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
---
 CHANGES.txt                   |  4 ++--
 INSTALL.txt                   |  9 +++++++--
 README.txt                    | 17 ++---------------
 config-scripts/cups-common.m4 |  2 +-
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index fb334534e..84405df66 100644
--- 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 77b1628c1..d05de97ec 100644
--- 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 d9c0adb55..a2f12f2dc 100644
--- 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 ec98d4eb0..849e1b03b 100644
--- 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'`"
-- 
2.39.2