Prep for CUPS 1.4b1 release.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@8052 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/INSTALL.txt b/INSTALL.txt
index 46104948d883b8200f3c9893554e197ba1bfe526..58a987c97f339c06ae51981af0ca8f6d6ef449ad 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,5 @@
-INSTALL - CUPS v1.4svn - 2008-04-23
------------------------------------
+INSTALL - CUPS v1.4b1 - 2008-10-10
+----------------------------------
 
 This file describes how to compile and install CUPS from source
 code. For more information on CUPS see the file called

diff --git a/README.txt b/README.txt
index 5fed8da52ff7a5045d8fe65b48f0fb772fc20c45..aad74fa7e42a3cc1f46f8b2b56790cbadd7e8ad0 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,18 @@
-*README - CUPS v1.4svn - 2008-01-02
-----------------------------------
+README - CUPS v1.4b1 - 2008-10-10
+---------------------------------
+
+**********************************************************************
+**********************************************************************
+**********                                                  **********
+**********  THIS IS BETA-RELEASE SOFTWARE.  DO NOT USE ON   **********
+**********  PRODUCTION SYSTEMS!  REPORT PROBLEMS TO THE     **********
+**********  CUPS FORUMS OR BUG REPORTING PAGES:             **********
+**********                                                  **********
+**********    http://www.cups.org/newsgroups.php (FORUMS)   **********
+**********    http://www.cups.org/str.php        (BUGS)     **********
+**********                                                  **********
+**********************************************************************
+**********************************************************************
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
 instead...
@@ -85,25 +98,29 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
     CUPS includes several sample PPD files you can use:
 
        Driver                         PPD File
-       -----------------------------  ------------
-       Dymo Label Printers            dymo.ppd
-       Intellitech Intellibar         intelbar.ppd
-       EPSON Stylus Color Series      stcolor.ppd
-       EPSON Stylus Photo Series      stphoto.ppd
-       EPSON Stylus New Color Series  stcolor2.ppd
-       EPSON Stylus New Photo Series  stphoto2.ppd
-       EPSON 9-pin Series             epson9.ppd
-       EPSON 24-pin Series            epson24.ppd
-       HP DeskJet Series              deskjet.ppd
-       HP LaserJet Series             laserjet.ppd
-       OKIDATA 9-Pin Series           okidata9.ppd
-       OKIDATA 24-Pin Series          okidat24.ppd
-       Zebra CPCL Label Printer       zebracpl.ppd
-       Zebra EPL1 Label Printer       zebraep1.ppd
-       Zebra EPL2 Label Printer       zebraep2.ppd
-       Zebra ZPL Label Printer        zebra.ppd
-
-    Run the "lpinfo" command to list the available printers:
+       -----------------------------  ------------------------------
+       Dymo Label Printers            drv:///sample.drv/dymo.ppd
+       Intellitech Intellibar         drv:///sample.drv/intelbar.ppd
+       EPSON Stylus Color Series      drv:///sample.drv/stcolor.ppd
+       EPSON Stylus Photo Series      drv:///sample.drv/stphoto.ppd
+       EPSON Stylus New Color Series  drv:///sample.drv/stcolor2.ppd
+       EPSON Stylus New Photo Series  drv:///sample.drv/stphoto2.ppd
+       EPSON 9-pin Series             drv:///sample.drv/epson9.ppd
+       EPSON 24-pin Series            drv:///sample.drv/epson24.ppd
+       HP DeskJet Series              drv:///sample.drv/deskjet.ppd
+       HP LaserJet Series             drv:///sample.drv/laserjet.ppd
+       OKIDATA 9-Pin Series           drv:///sample.drv/okidata9.ppd
+       OKIDATA 24-Pin Series          drv:///sample.drv/okidat24.ppd
+       Zebra CPCL Label Printer       drv:///sample.drv/zebracpl.ppd
+       Zebra EPL1 Label Printer       drv:///sample.drv/zebraep1.ppd
+       Zebra EPL2 Label Printer       drv:///sample.drv/zebraep2.ppd
+       Zebra ZPL Label Printer        drv:///sample.drv/zebra.ppd
+
+    Run the "lpinfo -m" command to list the available drivers:
+
+        lpinfo -m
+
+    Run the "lpinfo -v" command to list the available printers:
 
         lpinfo -v
 
@@ -154,18 +171,16 @@ PRINTING FILES
 LEGAL STUFF
 
     CUPS is Copyright 2007-2008 by Apple Inc.  CUPS, the CUPS logo,
-    and the Common UNIX Printing System are the trademark property
-    of Apple Inc.
+    and the Common UNIX Printing System are trademarks of Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
 
     This software is based in part on the work of the Independent
     JPEG Group.
 
-    CUPS is provided under the terms of the GNU General Public
-    License and GNU Library General Public License. This program
-    is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    "doc/help/license.html" or "LICENSE.txt" files for more
-    information.
+    CUPS is provided under the terms of version 2 of the GNU General
+    Public License and GNU Library General Public License. This program
+    is distributed in the hope that it will be useful, but WITHOUT ANY
+    WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the "doc/help/license.html"
+    or "LICENSE.txt" files for more information.

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 5eccc00107ba6f0ad8e1b71375b288418228491a..ab6b45d085d8e7d9f056a5666c22c6a8d7ef9461 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.4svn"
+CUPS_VERSION="1.4b1"
 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
 
 AC_SUBST(CUPS_VERSION)
 AC_SUBST(CUPS_REVISION)